From b2a223eaabf6527018a89dfa8cbf81b84b2d7afc Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 14 May 2016 17:21:46 +0200 Subject: [PATCH] Move logging to main rcS to save RAM --- ROMFS/px4fmu_common/init.d/rc.logging | 40 --------------------------- ROMFS/px4fmu_common/init.d/rcS | 33 +++++++++++++++++++++- 2 files changed, 32 insertions(+), 41 deletions(-) delete mode 100644 ROMFS/px4fmu_common/init.d/rc.logging diff --git a/ROMFS/px4fmu_common/init.d/rc.logging b/ROMFS/px4fmu_common/init.d/rc.logging deleted file mode 100644 index b88f46ae86..0000000000 --- a/ROMFS/px4fmu_common/init.d/rc.logging +++ /dev/null @@ -1,40 +0,0 @@ -#!nsh -# -# Initialize logging services. -# - -if [ -d /fs/microsd ] -then - if ver hwcmp PX4FMU_V1 - then - if sdlog2 start -r 30 -a -b 2 -t - then - fi - else - # check if we should increase logging rate for ekf2 replay message logging - if param greater EKF2_REC_RPL 0 - then - if param compare SYS_LOGGER 0 - then - if sdlog2 start -r 500 -e -b 20 -t - then - fi - else - if logger start -r 500 - then - fi - fi - else - if param compare SYS_LOGGER 0 - then - if sdlog2 start -r 100 -a -b 12 -t - then - fi - else - if logger start -b 24 - then - fi - fi - fi - fi -fi diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index cfcdfa5397..98f9e688a3 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -840,7 +840,38 @@ then # # Logging # - sh /etc/init.d/rc.logging + if ver hwcmp PX4FMU_V1 + then + if sdlog2 start -r 30 -a -b 2 -t + then + fi + else + # check if we should increase logging rate for ekf2 replay message logging + if param greater EKF2_REC_RPL 0 + then + if param compare SYS_LOGGER 0 + then + if sdlog2 start -r 500 -e -b 20 -t + then + fi + else + if logger start -r 500 + then + fi + fi + else + if param compare SYS_LOGGER 0 + then + if sdlog2 start -r 100 -a -b 12 -t + then + fi + else + if logger start -b 24 + then + fi + fi + fi + fi # Start any custom addons set FEXTRAS /fs/microsd/etc/extras.txt