Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge FMUv3 into FMUv2 #8343

Merged
merged 3 commits into from
Nov 24, 2017
Merged

Merge FMUv3 into FMUv2 #8343

merged 3 commits into from
Nov 24, 2017

Conversation

dagar
Copy link
Member

@dagar dagar commented Nov 23, 2017

This is a fix for the pixhawk mini which needs to use the px4fmu-v2_default binary due to lacking bootloader versioning.

FMUv3 was a superset of FMUv2 that used the full 2MB flash and added runtime version detection to handle various board differences in the pixhawk 2 cube and pixhawk mini.

This PR combines FMUv3 into FMUv2 with the only difference being the linker script used by FMUv3 and PX4 module list.

@dagar dagar added this to the Release v1.7.0 milestone Nov 23, 2017
@dagar dagar requested a review from LorenzMeier November 23, 2017 05:01
@dagar
Copy link
Member Author

dagar commented Nov 23, 2017

I've done some simple bench testing with an original pixhawk (px4fmu-v2) and pixhawk cube 2.1 (px4fmu-v3). The version is correctly detected and all sensors are present with correct external detection.

@PX4TestFlights @LorenzMeier @bkueng could someone thoroughly checkout a pixhawk mini with this branch? Flash px4fmu-v2, reset all params, and recalibrate. From that ulog we can verify everything.

@r0gelion
Copy link
Contributor

@dagar

I'm getting this error when trying to compile px4fmu-v2

running cmake 3.7.1 in mac os sierra 10.12.6

@dagar dagar force-pushed the pr-fmuv2_fmuv3_merge branch from a4ac735 to a0b37f1 Compare November 23, 2017 17:20
@dagar dagar force-pushed the pr-fmuv2_fmuv3_merge branch from a0b37f1 to 55947e5 Compare November 23, 2017 17:41
@dagar dagar force-pushed the pr-fmuv2_fmuv3_merge branch from 55947e5 to 05a8ef5 Compare November 23, 2017 17:43
Copy link
Member

@bkueng bkueng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on a pixhawk mini: compared master with v3 against this branch with v2 target: I don't have boot output, but bench testing checks out.
I looked at top, ls /dev, sensors status (it does not seem to have an internal mag), then attached a gps, and the mag got detected. Did a param reset & full calibration.

ver all:

nsh> ver all
HW arch: PX4FMU_V2
HW type: V2M
HW version: 0x0009000A
HW revision: 0x00000000
FW git-hash: a4ac735791cfa03b15c4bec016b7165734d8e37e
FW version: 1.7.0 0 (17235968)
OS: NuttX
OS version: Release 7.21.0 (118817023)
OS git-hash: 85a88c073130c0f9dd83af0a67e61c445ab0b3fa
Build datetime: Nov 23 2017 18:00:22
Build uri: localhost
Toolchain: GNU GCC, 5.4.1 20160919 (release) [ARM/embedded-5-branch revision 240496]
MFGUID: 333735383335510800480042
MCU: STM32F42x, rev. 3
UID: 480042:33355108:33373538

@santiago3dr
Copy link

pixhawk mini bench test after flash and full reset; all sensor calibrations went through without errors
https://logs.px4.io/plot_app?log=728eb1e2-7e1c-4f2b-9f34-6c97ef2f579e

@santiago3dr
Copy link

ran full setup on a different pixhawk mini
calibrations:
https://logs.px4.io/plot_app?log=8511764b-6b29-49c0-8b2e-62312963789d
indoor flight test:
https://logs.px4.io/plot_app?log=074589a2-6696-49c8-9287-114ffbced108
full outdoor flight test:
https://logs.px4.io/plot_app?log=ac5c287a-d7d6-46da-8d85-bc7ef268128c

no errors, flew well; all tested modes worked as expected

@hamishwillee
Copy link
Contributor

@dagar

Removed ground vehicle controllers from px4fmu-v2 to make room.

Saw above in email. Does that mean you can't do rover type vehicle on Pixhawk etc any more? Do we need to communicate somehow to users either how they add them back (ideally) or what FMU versions will work?

@dagar
Copy link
Member Author

dagar commented Nov 23, 2017

@hamishwillee good catch, but I backed that out after freeing up some extra space here. #8344

@LorenzMeier LorenzMeier merged commit ec27865 into master Nov 24, 2017
@LorenzMeier LorenzMeier deleted the pr-fmuv2_fmuv3_merge branch November 24, 2017 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants