aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Matosov <anton.matosov@gmail.com>2015-01-08 13:35:02 +0200
committerAnton Matosov <anton.matosov@gmail.com>2015-01-08 13:35:02 +0200
commite405fafe882c95345ccf88ea5f372f353aa4c21f (patch)
tree7da2908995507b4dd102f82462a96c68bfacc75a
parent25054d389a0d860664e2c3a67c180f8518876cbe (diff)
downloadpx4-firmware-e405fafe882c95345ccf88ea5f372f353aa4c21f.tar.gz
px4-firmware-e405fafe882c95345ccf88ea5f372f353aa4c21f.tar.bz2
px4-firmware-e405fafe882c95345ccf88ea5f372f353aa4c21f.zip
Applied code review comments (newline at end of file, whitespaces in empty lines)
-rw-r--r--ROMFS/px4fmu_common/init.d/1003_rc_quad_+.hil2
-rw-r--r--ROMFS/px4fmu_common/init.d/2101_hk_bixler2
-rw-r--r--ROMFS/px4fmu_common/init.d/rc.interface26
3 files changed, 15 insertions, 15 deletions
diff --git a/ROMFS/px4fmu_common/init.d/1003_rc_quad_+.hil b/ROMFS/px4fmu_common/init.d/1003_rc_quad_+.hil
index 2b418dfc5..7e651216d 100644
--- a/ROMFS/px4fmu_common/init.d/1003_rc_quad_+.hil
+++ b/ROMFS/px4fmu_common/init.d/1003_rc_quad_+.hil
@@ -9,4 +9,4 @@ sh /etc/init.d/rc.mc_defaults
set MIXER quad_+
-set HIL yes \ No newline at end of file
+set HIL yes
diff --git a/ROMFS/px4fmu_common/init.d/2101_hk_bixler b/ROMFS/px4fmu_common/init.d/2101_hk_bixler
index 0e6d2481c..05ee57ffa 100644
--- a/ROMFS/px4fmu_common/init.d/2101_hk_bixler
+++ b/ROMFS/px4fmu_common/init.d/2101_hk_bixler
@@ -2,4 +2,4 @@
sh /etc/init.d/rc.fw_defaults
-set MIXER AERT \ No newline at end of file
+set MIXER AERT
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface
index 1a2d8c016..4015a911b 100644
--- a/ROMFS/px4fmu_common/init.d/rc.interface
+++ b/ROMFS/px4fmu_common/init.d/rc.interface
@@ -4,25 +4,25 @@
#
set SDCARD_MIXERS_PATH /fs/microsd/etc/mixers
-
+
if [ $MIXER != none -a $MIXER != skip ]
then
#
# Load main mixer
#
-
+
if [ $MIXER_AUX == none ]
then
set MIXER_AUX $MIXER.aux
fi
-
+
# Use the mixer file from the SD-card if it exists
if [ -f $SDCARD_MIXERS_PATH/$MIXER.main.mix ]
then
set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.main.mix
# Try out the old convention, for backward compatibility
else
-
+
if [ -f $SDCARD_MIXERS_PATH/$MIXER.mix ]
then
set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.mix
@@ -30,19 +30,19 @@ then
set MIXER_FILE /etc/mixers/$MIXER.main.mix
fi
fi
-
+
if [ $OUTPUT_MODE == mkblctrl ]
then
set OUTPUT_DEV /dev/mkblctrl
else
set OUTPUT_DEV /dev/pwm_output
fi
-
+
if [ $OUTPUT_MODE == uavcan_esc ]
then
set OUTPUT_DEV /dev/uavcan/esc
fi
-
+
if mixer load $OUTPUT_DEV $MIXER_FILE
then
echo "[i] Mixer: $MIXER_FILE"
@@ -71,7 +71,7 @@ then
then
pwm rate -c $PWM_OUT -r $PWM_RATE
fi
-
+
#
# Set disarmed, min and max PWM values
#
@@ -101,20 +101,20 @@ then
#
# Load aux mixer
#
-
+
set MIXER_AUX_FILE none
-
+
if [ -f $SDCARD_MIXERS_PATH/$MIXER_AUX.mix ]
then
set MIXER_AUX_FILE $SDCARD_MIXERS_PATH/$MIXER_AUX.mix
else
-
+
if [ -f /etc/mixers/$MIXER_AUX.mix ]
then
set MIXER_AUX_FILE /etc/mixers/$MIXER_AUX.mix
fi
fi
-
+
if [ $MIXER_AUX_FILE != none -a $FMU_MODE == pwm ]
then
if fmu mode_pwm
@@ -124,4 +124,4 @@ then
tone_alarm $TUNE_ERR
fi
fi
-fi \ No newline at end of file
+fi