From d3e6cc714184b9c9ea4458be52879dd1c3e06585 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 30 Jul 2018 13:11:57 +1000 Subject: [PATCH] PX4: don't use tone_alarm in init and removed use of binfs --- mk/PX4/ROMFS/init.d/rc.APM | 20 -------------------- mk/PX4/ROMFS/init.d/rc.error | 2 -- mk/PX4/ROMFS/init.d/rcS | 4 ---- 3 files changed, 26 deletions(-) diff --git a/mk/PX4/ROMFS/init.d/rc.APM b/mk/PX4/ROMFS/init.d/rc.APM index 63f9fdd1c4..c7bc5f3e76 100755 --- a/mk/PX4/ROMFS/init.d/rc.APM +++ b/mk/PX4/ROMFS/init.d/rc.APM @@ -18,20 +18,6 @@ then sh /etc/init.d/rc.error fi -# mount binfs so we can find the built-in apps -if [ -f /bin/reboot ] -then - echo "binfs already mounted" -else - echo "Mounting binfs" - if mount -t binfs /dev/null /bin - then - echo "binfs mounted OK" - else - sh /etc/init.d/rc.error - fi -fi - set sketch NONE if rm /fs/microsd/APM/boot.log then @@ -39,12 +25,6 @@ then fi set logfile /fs/microsd/APM/BOOT.LOG -if [ ! -f /bin/ArduPilot ] -then - echo "/bin/ardupilot not found" - sh /etc/init.d/rc.error -fi - if mkdir /fs/microsd/APM > /dev/null then echo "Created APM directory" diff --git a/mk/PX4/ROMFS/init.d/rc.error b/mk/PX4/ROMFS/init.d/rc.error index 8c82168ba5..92ba8b13a2 100644 --- a/mk/PX4/ROMFS/init.d/rc.error +++ b/mk/PX4/ROMFS/init.d/rc.error @@ -1,7 +1,5 @@ echo "Error in startup" -tone_alarm MNCC - if [ $HAVE_RGBLED == 1 ] then rgbled rgb 16 0 0 diff --git a/mk/PX4/ROMFS/init.d/rcS b/mk/PX4/ROMFS/init.d/rcS index d9adae2492..44d99c5816 100755 --- a/mk/PX4/ROMFS/init.d/rcS +++ b/mk/PX4/ROMFS/init.d/rcS @@ -24,10 +24,6 @@ echo "[init] looking for microSD..." if mount -t vfat /dev/mmcsd0 /fs/microsd then echo "[init] card mounted at /fs/microsd" - set HAVE_MICROSD 1 -else - set HAVE_MICROSD 0 - tone_alarm MNBGG fi # Look for an additional init script that allows changing the default