diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-30 13:40:06 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-30 13:40:06 +0200 |
| commit | 5d3660b6a929f33ae18dfcb617c6879847637dac (patch) | |
| tree | 16eca446b5299d69eb46a9b7d266b88c5c65bd3a /ROMFS | |
| parent | 1d75f3eb8a1dba5b919c417b27a44e16ddcb0d32 (diff) | |
| parent | 60728bb6a6211407a1db12e7c015272cf998d928 (diff) | |
| download | px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.tar.gz px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.tar.bz2 px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.zip | |
Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_drop_paul
Conflicts:
src/modules/uORB/topics/vehicle_command.h
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.fw_apps | 9 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.usb | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil b/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil index 36194ad68..d114fe21a 100644 --- a/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil +++ b/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil @@ -7,7 +7,7 @@ sh /etc/init.d/rc.fw_defaults -echo "HIL Rascal 110 starting.." +echo "X Plane HIL starting.." set HIL yes diff --git a/ROMFS/px4fmu_common/init.d/rc.fw_apps b/ROMFS/px4fmu_common/init.d/rc.fw_apps index 72327c554..429abc5ec 100644 --- a/ROMFS/px4fmu_common/init.d/rc.fw_apps +++ b/ROMFS/px4fmu_common/init.d/rc.fw_apps @@ -3,6 +3,13 @@ # Standard apps for fixed wing # -att_pos_estimator_ekf start +# +# Start the attitude and position estimator +# +fw_att_pos_estimator start + +# +# Start attitude controller +# fw_att_control start fw_pos_control_l1 start diff --git a/ROMFS/px4fmu_common/init.d/rc.usb b/ROMFS/px4fmu_common/init.d/rc.usb index 9f80219b1..b7b556945 100644 --- a/ROMFS/px4fmu_common/init.d/rc.usb +++ b/ROMFS/px4fmu_common/init.d/rc.usb @@ -9,6 +9,8 @@ mavlink start -r 10000 -d /dev/ttyACM0 # Enable a number of interesting streams we want via USB mavlink stream -d /dev/ttyACM0 -s NAMED_VALUE_FLOAT -r 10 mavlink stream -d /dev/ttyACM0 -s OPTICAL_FLOW -r 10 +mavlink stream -d /dev/ttyACM0 -s VFR_HUD -r 20 +mavlink stream -d /dev/ttyACM0 -s ATTITUDE -r 20 mavlink stream -d /dev/ttyACM0 -s ATTITUDE_CONTROLS -r 30 mavlink stream -d /dev/ttyACM0 -s SERVO_OUTPUT_RAW_0 -r 10 |