From 938f6f2c479093d6c9bfafed721c721f678094c8 Mon Sep 17 00:00:00 2001 From: Emile Castelnuovo Date: Sun, 24 Aug 2014 13:55:31 +0200 Subject: [PATCH] Build: VRBRAIN corrected order of MAG startup for 4.5 board --- mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM | 29 ++++++++++--------- .../ROMFS_VRBRAIN45_APM/init.d/rc.APMNS | 28 +++++++++--------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM index 9dbbfbde82..0643f63aa8 100644 --- a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM +++ b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM @@ -76,20 +76,7 @@ else sh /etc/init.d/rc.error fi -echo "[APM] Starting HMC5883 Internal" -if hmc5883 -I start -then - echo "[APM] HMC5883 onboard started OK" - if hmc5883 calibrate - then - echo "[APM] HMC5883 onboard calibrate OK" - else - echo "[APM] HMC5883 onboard calibrate failed" - fi -else - echo "[APM] HMC5883 onboard start failed" -# sh /etc/init.d/rc.error -fi + echo "[APM] Starting HMC5883 External GPS" if hmc5883 -X start @@ -106,6 +93,20 @@ else # sh /etc/init.d/rc.error fi +echo "[APM] Starting HMC5883 Internal" +if hmc5883 -I start +then + echo "[APM] HMC5883 onboard started OK" + if hmc5883 -I calibrate + then + echo "[APM] HMC5883 onboard calibrate OK" + else + echo "[APM] HMC5883 onboard calibrate failed" + fi +else + echo "[APM] HMC5883 onboard start failed" +# sh /etc/init.d/rc.error +fi echo "[APM] Starting MPU6000 Internal" if mpu6000 -I start then diff --git a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS index 9989eeac76..716842f92a 100644 --- a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS +++ b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS @@ -49,20 +49,6 @@ else sh /etc/init.d/rc.error fi -echo "[APMNS] Starting HMC5883 Internal" -if hmc5883 -I start -then - echo "[APMNS] HMC5883 onboard started OK" - if hmc5883 calibrate - then - echo "[APMNS] HMC5883 onboard calibrate OK" - else - echo "[APMNS] HMC5883 onboard calibrate failed" - fi -else - echo "[APMNS] HMC5883 onboard start failed" -# sh /etc/init.d/rc.error -fi echo "[APMNS] Starting HMC5883 External GPS" if hmc5883 -X start @@ -79,6 +65,20 @@ else # sh /etc/init.d/rc.error fi +echo "[APMNS] Starting HMC5883 Internal" +if hmc5883 -I start +then + echo "[APMNS] HMC5883 onboard started OK" + if hmc5883 -I calibrate + then + echo "[APMNS] HMC5883 onboard calibrate OK" + else + echo "[APMNS] HMC5883 onboard calibrate failed" + fi +else + echo "[APMNS] HMC5883 onboard start failed" +# sh /etc/init.d/rc.error +fi echo "[APMNS] Starting MPU6000 Internal" if mpu6000 -I start then