diff options
| author | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
| commit | 88389ea2554c6f56a4fdd86cdd86a1e7b6affc21 (patch) | |
| tree | 3ef98ded43e5f3a2cdc30a836a3a7329fe5757bb /ROMFS/px4fmu_common | |
| parent | 76346bfe19c816491a6982abfa10f48cd9d258f6 (diff) | |
| parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
| download | px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.gz px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.bz2 px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.zip | |
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'ROMFS/px4fmu_common')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.hil | 4 | ||||
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 23 |
2 files changed, 8 insertions, 19 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.hil b/ROMFS/px4fmu_common/init.d/rc.hil index 7614ac0fe..3517a5bd8 100644 --- a/ROMFS/px4fmu_common/init.d/rc.hil +++ b/ROMFS/px4fmu_common/init.d/rc.hil @@ -54,13 +54,13 @@ sh /etc/init.d/rc.sensors # # Start the attitude estimator (depends on orb) # -kalman_demo start +att_pos_estimator_ekf start # # Load mixer and start controllers (depends on px4io) # mixer load /dev/pwm_output /etc/mixers/FMU_AET.mix -control_demo start +fixedwing_backside start echo "[HIL] setup done, running" diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index c0a70f7dd..22dec87cb 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -1,17 +1,6 @@ #!nsh # # PX4FMU startup script. -# -# This script is responsible for: -# -# - mounting the microSD card (if present) -# - running the user startup script from the microSD card (if present) -# - detecting the configuration of the system and picking a suitable -# startup script to continue with -# -# Note: DO NOT add configuration-specific commands to this script; -# add them to the per-configuration scripts instead. -# # # Default to auto-start mode. An init script on the microSD card @@ -21,11 +10,6 @@ set MODE autostart set USB autoconnect # - -# - - -# # Try to mount the microSD card. # echo "[init] looking for microSD..." @@ -69,7 +53,12 @@ else then echo "[init] USB interface connected" else - echo "[init] No USB connected" + if [ -f /dev/ttyACM0 ] + echo "[init] NSH via USB" + then + else + echo "[init] No USB connected" + fi fi fi |