ROMFS move airframes to subdirectory

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -32,75 +32,6 @@
 ############################################################################
 
 px4_add_romfs_files(
-	1000_rc_fw_easystar.hil
-	1001_rc_quad_x.hil
-	2100_standard_plane
-	2105_maja
-	2106_albatross
-	2200_mini_talon
-	24001_dodeca_cox
-	3000_generic_wing
-	3030_io_camflyer
-	3031_phantom
-	3032_skywalker_x5
-	3033_wingwing
-	3034_fx79
-	3035_viper
-	3036_pigeon
-	3037_parrot_disco_mod
-	3100_tbs_caipirinha
-	4001_quad_x
-	4002_quad_x_mount
-	4003_qavr5
-	4004_H4_680mm
-	4009_qav250
-	4010_dji_f330
-	4011_dji_f450
-	4012_quad_x_can
-	4013_bebop
-	4020_hk_micro_pcb
-	4030_3dr_solo
-	4031_3dr_quad
-	4040_reaper
-	4050_generic_250
-	4051_s250aq
-	4060_dji_matrice_100
-	4070_aerofc
-	4080_zmr250
-	4090_nanomind
-	4900_crazyflie
-	5001_quad_+
-	6001_hexa_x
-	7001_hexa_+
-	8001_octo_x
-	9001_octo_+
-	10015_tbs_discovery
-	10016_3dr_iris
-	10017_steadidrone_qu4d
-	10018_tbs_endurance
-	11001_hexa_cox
-	12001_octo_cox
-	12002_steadidrone_mavrik
-	13000_generic_vtol_standard
-	13001_caipirinha_vtol
-	13002_firefly6
-	13003_quad_tailsitter
-	13004_quad+_tailsitter
-	13005_vtol_AAERT_quad
-	13006_vtol_standard_delta
-	13007_vtol_AAVVT_quad
-	13008_QuadRanger
-	13009_vtol_spt_ranger
-	13010_claire
-	13012_convergence
-	13013_deltaquad
-	14001_tri_y_yaw+
-	14002_tri_y_yaw-
-	15001_coax_heli
-	16001_helicopter
-	50000_generic_ground_vehicle
-	50001_axialracing_ax10
-	50002_traxxas_stampede_2wd
 	rc.fw_apps
 	rc.fw_defaults
 	rc.interface
@@ -109,6 +40,7 @@ px4_add_romfs_files(
 	rc.mavlink
 	rc.mc_apps
 	rc.mc_defaults
+	rcS
 	rc.sensors
 	rc.thermal_cal
 	rc.ugv_apps
@@ -116,5 +48,4 @@ px4_add_romfs_files(
 	rc.vehicle_setup
 	rc.vtol_apps
 	rc.vtol_defaults
-	rcS
 )

ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt

@@ -0,0 +1,141 @@
+############################################################################
+#
+#   Copyright (c) 2018 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+px4_add_romfs_files(
+	# [0-999] Reserved (historical)"
+
+	# [1000, 1999] Simulation setups"
+	1000_rc_fw_easystar.hil
+	1001_rc_quad_x.hil
+	1002_standard_vtol.hil
+	
+	# [2000, 2999] Standard planes"
+	2100_standard_plane
+	2105_maja
+	2106_albatross
+	2200_mini_talon
+
+	# [3000, 3999] Flying wing"
+	3000_generic_wing
+	3030_io_camflyer
+	3031_phantom
+	3032_skywalker_x5
+	3033_wingwing
+	3034_fx79
+	3035_viper
+	3036_pigeon
+	3037_parrot_disco_mod
+	3100_tbs_caipirinha
+
+	# [4000, 4999] Quadrotor x"
+	4001_quad_x
+	4002_quad_x_mount
+	4003_qavr5
+	4004_H4_680mm
+	4009_qav250
+	4010_dji_f330
+	4011_dji_f450
+	4012_quad_x_can
+	4013_bebop
+	4014_s500
+	4020_hk_micro_pcb
+	4030_3dr_solo
+	4031_3dr_quad
+	4040_reaper
+	4050_generic_250
+	4051_s250aq
+	4060_dji_matrice_100
+	4070_aerofc
+	4080_zmr250
+	4090_nanomind
+	4100_tiltquadrotor
+	4250_teal
+	4900_crazyflie
+
+	# [5000, 5999] Quadrotor +"
+	5001_quad_+
+
+	# [6000, 6999] Hexarotor x"
+	6001_hexa_x
+
+	# [7000, 7999] Hexarotor +"
+	7001_hexa_+
+
+	# [8000, 8999] Octorotor +"
+	8001_octo_x
+
+	# [9000, 9999] Octorotor +"
+	9001_octo_+
+
+	# [10000, 10999] Quadrotor Wide arm / H frame"
+	10015_tbs_discovery
+	10016_3dr_iris
+	10017_steadidrone_qu4d
+	10018_tbs_endurance
+
+	# [11000, 11999] Hexa Cox
+	11001_hexa_cox
+
+	# [12000, 12999] Octo Cox
+	12001_octo_cox
+	12002_steadidrone_mavrik
+
+	# [13000, 13999] VTOL
+	13000_generic_vtol_standard
+	13001_caipirinha_vtol
+	13002_firefly6
+	13003_quad_tailsitter
+	13004_quad+_tailsitter
+	13005_vtol_AAERT_quad
+	13006_vtol_standard_delta
+	13007_vtol_AAVVT_quad
+	13008_QuadRanger
+	13009_vtol_spt_ranger
+	13010_claire
+	13012_convergence
+	13013_deltaquad
+
+	# [14000, 14999] Tri Y
+	14001_tri_y_yaw+
+	14002_tri_y_yaw-
+
+	15001_coax_heli
+
+	16001_helicopter
+	
+	24001_dodeca_cox
+
+	50000_generic_ground_vehicle
+	50001_axialracing_ax10
+	50002_traxxas_stampede_2wd
+)

Tools/px4airframes/rcout.py

@@ -28,6 +28,9 @@ class RCOutput():
                     "# 12000 ..  12999       Octo Cox\n"
                     "# 13000 ..  13999       VTOL\n"
                     "# 14000 ..  14999       Tri Y\n"
+                    ""
+                    ""
+                    "cd /etc/init.d/airframes\n"
                     "\n")
         for group in groups:
             result += "# GROUP: %s\n\n" % group.GetName()
@@ -47,7 +50,7 @@ class RCOutput():
                 result +=   "# %s\n" % param.GetName()
                 result +=   "if param compare SYS_AUTOSTART %s\n" % id_val
                 result +=   "then\n"
-                result +=   "\tsh /etc/init.d/%s\n" % path
+                result +=   "\tsh %s\n" % path
                 result +=   "fi\n"
 
                 #if long_desc is not None: