Skip to content

Commit

Permalink
rcS move logger startup to rc.logging and end of init
Browse files Browse the repository at this point in the history
 - fixes #8903
  • Loading branch information
dagar authored and LorenzMeier committed Feb 17, 2018
1 parent f932217 commit 4aeb70f
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 30 deletions.
33 changes: 33 additions & 0 deletions ROMFS/px4fmu_common/init.d/rc.logging
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!nsh
# Logging
#
# Standard startup script for logging
#

if param compare SYS_LOGGER 0
then
sdlog2 start -r 100 -a -b 9 -t
else
set LOGGER_ARGS ""

if param compare SDLOG_MODE 1
then
set LOGGER_ARGS "-e"
fi

if param compare SDLOG_MODE 2
then
set LOGGER_ARGS "-f"
fi

if ver hwcmp AEROFC_V1
then
set LOGGER_ARGS "-m mavlink"
fi

logger start -b ${LOGGER_BUF} -t ${LOGGER_ARGS}

unset LOGGER_ARGS
fi

unset LOGGER_BUF
32 changes: 2 additions & 30 deletions ROMFS/px4fmu_common/init.d/rcS
Original file line number Diff line number Diff line change
Expand Up @@ -693,36 +693,6 @@ then
mavlink start -r 800000 -d /dev/ttyACM0 -m config -x
fi

#
# Logging
#
if param compare SYS_LOGGER 0
then
sdlog2 start -r 100 -a -b 9 -t
else
set LOGGER_ARGS ""

if param compare SDLOG_MODE 1
then
set LOGGER_ARGS "-e"
fi

if param compare SDLOG_MODE 2
then
set LOGGER_ARGS "-f"
fi

if ver hwcmp AEROFC_V1
then
set LOGGER_ARGS "-m mavlink"
fi

logger start -b ${LOGGER_BUF} -t ${LOGGER_ARGS}

unset LOGGER_BUF
unset LOGGER_ARGS
fi

#
# Fixed wing setup
#
Expand Down Expand Up @@ -967,6 +937,8 @@ then
fi
fi

sh /etc/init.d/rc.logging

# End of autostart
fi

Expand Down

0 comments on commit 4aeb70f

Please sign in to comment.