diff options
| author | tnaegeli <naegelit@student.ethz.ch> | 2012-10-10 09:52:37 +0200 |
|---|---|---|
| committer | tnaegeli <naegelit@student.ethz.ch> | 2012-10-10 09:52:37 +0200 |
| commit | ec018e7b6468553eacb0e23af1fd7dac39749ef7 (patch) | |
| tree | 56e8fc7269d03d1824457db9270efa83877f9392 /ROMFS | |
| parent | 613e12fcac07a17e6b9d25b05f58c8a1b9587f5e (diff) | |
| parent | 1e59a592a6a41a65e9e69814ae3d8cb62a061367 (diff) | |
| download | px4-firmware-ec018e7b6468553eacb0e23af1fd7dac39749ef7.tar.gz px4-firmware-ec018e7b6468553eacb0e23af1fd7dac39749ef7.tar.bz2 px4-firmware-ec018e7b6468553eacb0e23af1fd7dac39749ef7.zip | |
Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
apps/commander/state_machine_helper.c
apps/multirotor_att_control/multirotor_att_control_main.c
apps/multirotor_att_control/multirotor_rate_control.c
solved
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/scripts/rc.FMU_quad_x | 2 | ||||
| -rw-r--r-- | ROMFS/scripts/rc.PX4IOAR | 2 | ||||
| -rw-r--r-- | ROMFS/scripts/rc.standalone | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ROMFS/scripts/rc.FMU_quad_x b/ROMFS/scripts/rc.FMU_quad_x index 94ed2be18..e9f07b4a2 100644 --- a/ROMFS/scripts/rc.FMU_quad_x +++ b/ROMFS/scripts/rc.FMU_quad_x @@ -9,7 +9,7 @@ echo "[init] eeprom" eeprom start if [ -f /eeprom/parameters ] then - eeprom load_param /eeprom/parameters + param load fi echo "[init] sensors" diff --git a/ROMFS/scripts/rc.PX4IOAR b/ROMFS/scripts/rc.PX4IOAR index 532dd6a25..382d8e25c 100644 --- a/ROMFS/scripts/rc.PX4IOAR +++ b/ROMFS/scripts/rc.PX4IOAR @@ -19,7 +19,7 @@ echo "[init] eeprom" eeprom start if [ -f /eeprom/parameters ] then - eeprom load_param /eeprom/parameters + param load fi # diff --git a/ROMFS/scripts/rc.standalone b/ROMFS/scripts/rc.standalone index 7dfd98a16..8ccdb577b 100644 --- a/ROMFS/scripts/rc.standalone +++ b/ROMFS/scripts/rc.standalone @@ -11,6 +11,16 @@ echo "[init] doing standalone PX4FMU startup..." uorb start # +# Init the EEPROM +# +echo "[init] eeprom" +eeprom start +if [ -f /eeprom/parameters ] +then + param load +fi + +# # Start the sensors. # #sh /etc/init.d/rc.sensors |