Lorenz Meier
7a3873cdf2
Merge branch 'adc_fix' into paul_estimator_mavlink2
2014-03-17 17:02:24 +01:00
Lorenz Meier
d940bdf7f6
Consistently making space for a maximum of 12 channels, 10 channels (including reference / temperature) are used / available right now
2014-03-17 17:02:10 +01:00
Lorenz Meier
541e8362cf
Merge branch 'adc_fix' into paul_estimator_mavlink2
2014-03-17 16:55:02 +01:00
Lorenz Meier
4e6e40e5d8
Fix up ADC tests command to read all channels at once
2014-03-17 16:54:39 +01:00
Lorenz Meier
fd8cae19bd
ADC channel mapping fix in sensors app
2014-03-17 16:53:30 +01:00
Lorenz Meier
295f87f22c
Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into beta_mavlink2
2014-03-17 16:52:07 +01:00
Lorenz Meier
c4ce5b9286
Merge pull request #726 from PX4/mavlink2_hil
...
mavlink HIL with normal autostart scripts
2014-03-17 16:44:51 +01:00
Lorenz Meier
46e588e26f
Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2
2014-03-17 15:34:26 +01:00
Lorenz Meier
45cc0262eb
Merge branch 'paul_estimator' into paul_estimator_mavlink2
2014-03-17 15:28:21 +01:00
Lorenz Meier
4038d3e04e
Write out yaw into position topics
2014-03-17 15:28:08 +01:00
kroimon
7be1c400f9
Merge pull request #750 from PX4/hotfix_rc_romfs_pruner
...
startup scripts: replace ” by "
2014-03-17 15:22:41 +01:00
Julian Oes
7718bbebee
startup scripts: romfs_pruner doesn't know the inch symbols when used in eclipse, therefore replace these
2014-03-17 15:20:00 +01:00
Lorenz Meier
3160f2b545
Merge branch 'mavlink2_hil' into paul_estimator_mavlink2
2014-03-17 15:09:35 +01:00
Lorenz Meier
67298d47c1
Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into mavlink2_hil
2014-03-17 15:09:15 +01:00
Lorenz Meier
44bc5db0e3
Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into paul_estimator_mavlink2
2014-03-17 15:08:18 +01:00
Lorenz Meier
3c7df42001
Merge branch 'mavlink2_hil' into paul_estimator_mavlink2
2014-03-17 14:37:44 +01:00
Lorenz Meier
51658ac857
Compile fix
2014-03-17 14:37:32 +01:00
Lorenz Meier
d56566661a
Merge branch 'mavlink2_hil' into paul_estimator_mavlink2
2014-03-17 14:35:28 +01:00
Lorenz Meier
75ad1c4a13
Completely and properly populate battery status message in HIL
2014-03-17 14:35:07 +01:00
Lorenz Meier
e672f87b5c
Merge branch 'mavlink2_hil' into paul_estimator_mavlink2
2014-03-17 14:32:56 +01:00
Lorenz Meier
9cdb416d3a
Teach RGB led driver to forward unknown IOCTLs
2014-03-17 14:32:36 +01:00
Lorenz Meier
533e3172dc
Make PX4IO driver obey HIL as it should
2014-03-17 14:32:27 +01:00
Lorenz Meier
f7bd31b6fd
Teach RGB led driver to forward unknown IOCTLs
2014-03-17 14:32:02 +01:00
Lorenz Meier
0581c7f712
Make PX4IO driver obey HIL as it should
2014-03-17 14:31:38 +01:00
Lorenz Meier
199936b1c5
Merged mavlink2_hil into paul_estimator_mavlink2
2014-03-17 13:35:03 +01:00
Lorenz Meier
dbd467fe1f
sensors: Remove effect-less writing of timestamp - was anyway correctly written by gyro update
2014-03-17 13:33:49 +01:00
Lorenz Meier
8cb5a12cc7
Remove now unused hil_counter
2014-03-17 13:33:23 +01:00
Lorenz Meier
8f6ac64e8c
Merge branch 'mavlink2_hil' into paul_estimator_mavlink2
2014-03-17 13:26:42 +01:00
Lorenz Meier
ffd0d10320
Fix usage of right time stamps
2014-03-17 13:25:22 +01:00
Lorenz Meier
d2feafaac9
Merged mavlink2_hil
2014-03-17 13:22:06 +01:00
Don Gagne
4b980b508c
arming_state_transition now outputs error messages
...
If mavlink fd is passed in method will output reason for arming failure
to mavlink.
2014-03-16 21:39:06 -07:00
Don Gagne
dec13e7f21
Use single set of arm/disarm code
...
Set mode and arm/disarm commands now call a single method to arm
disarm, thus removing code duplication. Also calls updated
arming_state_transition method such that the arming state logic does
not need to be duplicated outside of arming_state_transition.
2014-03-16 21:38:23 -07:00
Lorenz Meier
ae35733381
Merge pull request #745 from thomasgubler/caipirinha
...
introduce TBS caipirinha autostart script
2014-03-16 21:52:27 +01:00
Lorenz Meier
1c0d7988e2
Defaults for Wing Wing
2014-03-16 21:38:37 +01:00
Lorenz Meier
2db7d30400
Do not work on USB UARTs
2014-03-16 19:43:09 +01:00
Lorenz Meier
2fe9f65c45
commander: Fixed compile error and some stupidity in usage of path names
2014-03-16 19:16:18 +01:00
Lorenz Meier
ab7f07da75
Merge pull request #742 from thomasgubler/phantom
...
set phantom autoconfig parameters as provided by Andreas Antener
2014-03-16 19:15:10 +01:00
Lorenz Meier
6db2191a71
commander: Skip devices we do not want to touch in HIL
2014-03-16 18:50:20 +01:00
Thomas Gubler
4466dbf0b3
add SYS_USE_IO param which allows using standard startup scripts for FMU only mode
2014-03-16 18:47:21 +01:00
Lorenz Meier
c52969639f
Merged upstream mavlink2_hil branch
2014-03-16 18:42:07 +01:00
Lorenz Meier
8383603f76
commander: Linting: Reduce scope of variable
2014-03-16 18:41:03 +01:00
Lorenz Meier
772fce9f82
commander: Improve HIL publication blocking call handling
2014-03-16 18:38:55 +01:00
Lorenz Meier
bb7962936e
CDev: Fixed printf format specifier
2014-03-16 18:37:16 +01:00
Anton Babushkin
8818425e58
commander: fixed message formatting when disabling sensors publishing in HIL mode
2014-03-16 18:25:09 +04:00
Thomas Gubler
c1ee1abf27
introduce TBS caipirinha autostart script
2014-03-16 15:18:50 +01:00
Lorenz Meier
85b7670b44
compile fix
2014-03-16 15:15:31 +01:00
Lorenz Meier
15c079921b
Fixed missing parent ioctl call
2014-03-16 15:12:03 +01:00
Anton Babushkin
762e8f5289
mavlink_orb_subscription: minor optimization and comment fix
2014-03-16 17:28:34 +04:00
Anton Babushkin
df5d702bae
mavlink: MavlinkOrbSubscription.update() result fixed
2014-03-16 17:10:56 +04:00
Lorenz Meier
7a4efc81b9
Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into mavlink2_hil
2014-03-16 13:50:50 +01:00