Skip to content

Commit

Permalink
Make ROMFS less chatty
Browse files Browse the repository at this point in the history
  • Loading branch information
LorenzMeier committed Nov 15, 2014
1 parent 2a37d27 commit 6d59df1
Show file tree
Hide file tree
Showing 30 changed files with 39 additions and 83 deletions.
8 changes: 2 additions & 6 deletions ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#!nsh
#
# HILStar / X-Plane
#
# Lorenz Meier <[email protected]>
# HILStar
# <[email protected]>
#

sh /etc/init.d/rc.fw_defaults

echo "X Plane HIL starting.."

set HIL yes

set MIXER FMU_AERT
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/10015_tbs_discovery
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Team Blacksheep Discovery Quadcopter
#
# Anton Babushkin <anton[email protected]>, Simon Wilks <[email protected]>, Thomas Gubler <[email protected]>
# Anton Babushkin <anton@px4.io>, Simon Wilks <[email protected]>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/10016_3dr_iris
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# 3DR Iris Quadcopter
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
3 changes: 1 addition & 2 deletions ROMFS/px4fmu_common/init.d/10017_steadidrone_qu4d
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
#
# Steadidrone QU4D
#
# Thomas Gubler <[email protected]>
# Lorenz Meier <[email protected]>
# Thomas Gubler <[email protected]>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/1001_rc_quad_x.hil
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# HIL Quadcopter X
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/1003_rc_quad_+.hil
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# HIL Quadcopter +
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
4 changes: 1 addition & 3 deletions ROMFS/px4fmu_common/init.d/1004_rc_fw_Rascal110.hil
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
#
# HIL Rascal 110 (Flightgear)
#
# Thomas Gubler <[email protected]>
# Thomas Gubler <[email protected]>
#

sh /etc/init.d/rc.fw_defaults

echo "HIL Rascal 110 starting.."

set HIL yes

set MIXER FMU_AERT
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/1005_rc_fw_Malolo1.hil
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# HIL Malolo 1 (Flightgear)
#
# Thomas Gubler <[email protected]>
# Thomas Gubler <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand Down
4 changes: 2 additions & 2 deletions ROMFS/px4fmu_common/init.d/11001_hexa_cox
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# Generic 10" Hexa coaxial geometry
#
# Lorenz Meier <[email protected]>
# Lorenz Meier <[email protected]>
#

sh /etc/init.d/rc.mc_defaults

set MIXER FMU_hexa_cox

# We only can run one channel group with one rate, so set all 8 channels
# Need to set all 8 channels
set PWM_OUTPUTS 12345678
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/12001_octo_cox
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Generic 10" Octo coaxial geometry
#
# Lorenz Meier <[email protected]>
# Lorenz Meier <[email protected]>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
4 changes: 1 addition & 3 deletions ROMFS/px4fmu_common/init.d/3031_phantom
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Phantom FPV Flying Wing
#
# Simon Wilks <[email protected]>, Thomas Gubler <[email protected]>
# Simon Wilks <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand All @@ -21,8 +21,6 @@ then
param set FW_PR_P 0.03
param set FW_P_LIM_MAX 50
param set FW_P_LIM_MIN -50
param set FW_P_RMAX_NEG 0
param set FW_P_RMAX_POS 0
param set FW_P_ROLLFF 1
param set FW_RR_FF 0.5
param set FW_RR_I 0.02
Expand Down
6 changes: 1 addition & 5 deletions ROMFS/px4fmu_common/init.d/3032_skywalker_x5
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Skywalker X5 Flying Wing
#
# Thomas Gubler <[email protected]>, Julian Oes <[email protected]>
# Thomas Gubler <[email protected]>, Julian Oes <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand All @@ -19,10 +19,6 @@ then
param set FW_PR_I 0
param set FW_PR_IMAX 0.2
param set FW_PR_P 0.03
param set FW_P_LIM_MAX 45
param set FW_P_LIM_MIN -45
param set FW_P_RMAX_NEG 0
param set FW_P_RMAX_POS 0
param set FW_P_ROLLFF 1
param set FW_RR_FF 0.3
param set FW_RR_I 0
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/3033_wingwing
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Wing Wing (aka Z-84) Flying Wing
#
# Simon Wilks <[email protected]>
# Simon Wilks <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/3034_fx79
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# FX-79 Buffalo Flying Wing
#
# Simon Wilks <[email protected]>
# Simon Wilks <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/3035_viper
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Viper
#
# Simon Wilks <[email protected]>
# Simon Wilks <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand Down
8 changes: 2 additions & 6 deletions ROMFS/px4fmu_common/init.d/3100_tbs_caipirinha
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!nsh
#
# TBS Caipirinha Flying Wing
# TBS Caipirinha
#
# Thomas Gubler <[email protected]>
# Thomas Gubler <[email protected]>
#

sh /etc/init.d/rc.fw_defaults
Expand All @@ -22,10 +22,6 @@ then
param set FW_PR_I 0
param set FW_PR_IMAX 0.2
param set FW_PR_P 0.03
param set FW_P_LIM_MAX 45
param set FW_P_LIM_MIN -45
param set FW_P_RMAX_NEG 0
param set FW_P_RMAX_POS 0
param set FW_P_ROLLFF 0
param set FW_RR_FF 0.3
param set FW_RR_I 0
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/4001_quad_x
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Generic 10" Quad X geometry
#
# Lorenz Meier <[email protected]>
# Lorenz Meier <[email protected]>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
3 changes: 0 additions & 3 deletions ROMFS/px4fmu_common/init.d/4008_ardrone
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# ARDrone
#

echo "[init] 4008_ardrone: PX4FMU on PX4IOAR carrier board"

# Just use the default multicopter settings.
sh /etc/init.d/rc.mc_defaults

#
Expand Down
4 changes: 2 additions & 2 deletions ROMFS/px4fmu_common/init.d/4010_dji_f330
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!nsh
#
# DJI Flame Wheel F330 Quadcopter
# DJI Flame Wheel F330
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/4001_quad_x
Expand Down
4 changes: 2 additions & 2 deletions ROMFS/px4fmu_common/init.d/4011_dji_f450
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!nsh
#
# DJI Flame Wheel F450 Quadcopter
# DJI Flame Wheel F450
#
# Lorenz Meier <[email protected]>
# Lorenz Meier <[email protected]>
#

sh /etc/init.d/4001_quad_x
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/4012_quad_x_can
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# F450-sized quadrotor with CAN
#
# Lorenz Meier <[email protected]>
# Pavel Kirienko <[email protected]>
#

sh /etc/init.d/4001_quad_x
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/4020_hk_micro_pcb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Hobbyking Micro Integrated PCB Quadcopter
# with SimonK ESC firmware and Mystery A1510 motors
#
# Thomas Gubler <[email protected]>
# Thomas Gubler <[email protected]>
#
echo "HK Micro PCB Quad"

Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/5001_quad_+
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Generic 10" Quad + geometry
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
4 changes: 2 additions & 2 deletions ROMFS/px4fmu_common/init.d/6001_hexa_x
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# Generic 10" Hexa X geometry
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults

set MIXER FMU_hexa_x

# We only can run one channel group with one rate, so set all 8 channels
# Need to set all 8 channels
set PWM_OUTPUTS 12345678
4 changes: 2 additions & 2 deletions ROMFS/px4fmu_common/init.d/7001_hexa_+
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# Generic 10" Hexa + geometry
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults

set MIXER FMU_hexa_+

# We only can run one channel group with one rate, so set all 8 channels
# Need to set all 8 channels
set PWM_OUTPUTS 12345678
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/8001_octo_x
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Generic 10" Octo X geometry
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/9001_octo_+
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Generic 10" Octo + geometry
#
# Anton Babushkin <anton[email protected]>
# Anton Babushkin <anton@px4.io>
#

sh /etc/init.d/rc.mc_defaults
Expand Down
5 changes: 2 additions & 3 deletions ROMFS/px4fmu_common/init.d/rc.autostart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#
# Check if auto-setup from one of the standard scripts is wanted
# SYS_AUTOSTART = 0 means no autostart (default)
#
# AUTOSTART PARTITION:
Expand All @@ -18,7 +17,7 @@
# 12000 .. 12999 Octo Cox

#
# Simulation setups
# Simulation
#

if param compare SYS_AUTOSTART 901
Expand Down Expand Up @@ -53,7 +52,7 @@ then
fi

#
# Standard plane
# Plane
#

if param compare SYS_AUTOSTART 2100 100
Expand Down
7 changes: 1 addition & 6 deletions ROMFS/px4fmu_common/init.d/rc.sensors
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ then
fi
fi

# Start airspeed sensors
if meas_airspeed start
then
echo "[init] Using MEAS airspeed sensor"
Expand All @@ -68,16 +67,12 @@ else
fi
fi

# Check for flow sensor
if px4flow start
then
fi

#
# Start the sensor collection task.
# IMPORTANT: this also loads param offsets
# ALWAYS start this task before the
# preflight_check.
# Start sensors -> preflight_check
#
if sensors start
then
Expand Down
Loading

0 comments on commit 6d59df1

Please sign in to comment.