posix: add support for ROMFSROOT

- add missing ROMFS files to CMakeLists.txt
- rename genromfs to etc, so that it's clearer for SITL use

ROMFS/px4fmu_common/CMakeLists.txt

@@ -33,3 +33,8 @@
 
 add_subdirectory(init.d)
 add_subdirectory(mixers)
+# TODO: make this configurable from the board config, or better combine
+if("${PX4_BOARD}" MATCHES "sitl")
+	add_subdirectory(mixers-sitl)
+	add_subdirectory(init.d-posix)
+endif()

ROMFS/px4fmu_common/init.d-posix/CMakeLists.txt

@@ -0,0 +1,73 @@
+############################################################################
+#
+#   Copyright (c) 2020 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(
+	10016_iris
+	10020_if750a
+	10030_px4vision
+	1010_iris_opt_flow
+	1010_iris_opt_flow.post
+	1011_iris_irlock
+	1012_iris_rplidar
+	1013_iris_vision
+	1013_iris_vision.post
+	1014_solo
+	1015_iris_obs_avoid
+	1015_iris_obs_avoid.post
+	1016_iris_rtps
+	1016_iris_rtps.post
+	1017_iris_opt_flow_mockup
+	1018_iris_vision_velocity
+	1019_iris_dual_gps
+	1020_uuv_generic
+	1021_uuv_hippocampus
+	1030_plane
+	1031_plane_cam
+	1032_plane_catapult
+	1033_plane_lidar
+	1033_rascal
+	1034_rascal-electric
+	1040_standard_vtol
+	1041_tailsitter
+	1042_tiltrotor
+	1060_rover
+	1061_r1_rover
+	1062_tf-r1
+	1070_boat
+	17001_tf-g1
+	2507_cloudship
+	6011_typhoon_h480
+	6011_typhoon_h480.post
+	rc.replay
+	rcS
+)

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -34,6 +34,8 @@
 add_subdirectory(airframes)
 
 px4_add_romfs_files(
+	rc.airship_apps
+	rc.airship_defaults
 	rc.fw_apps
 	rc.fw_defaults
 	rc.interface

ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo

@@ -5,8 +5,6 @@
 # @type VTOL Octoplane
 # @class VTOL
 #
-# @maintainer
-#
 # @output MAIN1 motor 1
 # @output MAIN2 motor 2
 # @output MAIN3 motor 3
@@ -21,6 +19,7 @@
 # @output AUX4 Rudder
 # @output AUX5 Throttle
 #
+# @board px4_fmu-v2 exclude
 # @board intel_aerofc-v1 exclude
 # @board bitcraze_crazyflie exclude
 #

ROMFS/px4fmu_common/init.d/airframes/2507_cloudship

@@ -8,6 +8,11 @@
 # @output MAIN2 port thruster
 # @output MAIN3 thrust tilt
 # @output MAIN4 tail thruster
+#
+# @board px4_fmu-v2 exclude
+# @board intel_aerofc-v1 exclude
+# @board bitcraze_crazyflie exclude
+#
 
 sh /etc/init.d/rc.airship_defaults
 

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

@@ -46,6 +46,8 @@ px4_add_romfs_files(
 	2106_albatross
 	2200_mini_talon
 
+	2507_cloudship
+
 	# [3000, 3999] Flying wing"
 	3000_generic_wing
 	3030_io_camflyer
@@ -131,6 +133,8 @@ px4_add_romfs_files(
 	13010_claire
 	13012_convergence
 	13013_deltaquad
+	13014_vtol_babyshark
+	13050_generic_vtol_octo
 	13200_generic_vtol_tailsitter
 
 	# [14000, 14999] Tri Y
@@ -141,6 +145,8 @@ px4_add_romfs_files(
 
 	16001_helicopter
 
+	17002_TF-AutoG2
+
 	24001_dodeca_cox
 
 	50000_generic_ground_vehicle

ROMFS/px4fmu_common/mixers-sitl/CMakeLists.txt

@@ -32,8 +32,11 @@
 ############################################################################
 
 px4_add_romfs_files(
+	autogyro_sitl.main.mix
+	boat_sitl.main.mix
 	delta_wing_sitl.main.mix
 	plane_sitl.main.mix
+	quad_x_vtol.main.mix
 	rover_ackermann_sitl.main.mix
 	rover_diff_sitl.main.mix
 	standard_vtol_sitl.main.mix

ROMFS/px4fmu_common/mixers/CMakeLists.txt

@@ -34,13 +34,16 @@
 px4_add_romfs_files(
 	AAERTWF.main.mix
 	AAVVTWFF.main.mix
+	AAVVTWFF_vtail.main.mix
 	AERT.main.mix
 	AETRFG.main.mix
+	babyshark.main.mix
 	blade130.main.mix
 	caipi.main.mix
 	CCPM.main.mix
 	claire.aux.mix
 	claire.main.mix
+	cloudship.main.mix
 	coax.main.mix
 	delta.main.mix
 	deltaquad.main.mix
@@ -69,20 +72,24 @@ px4_add_romfs_files(
 	quad_s250aq.main.mix
 	quad_+_vtol.main.mix
 	quad_w.main.mix
-	quad_x.main.mix
 	quad_x_cw.main.mix
+	quad_x.main.mix
 	quad_x_vtol.main.mix
-	stampede.main.mix
-	tri_y_yaw-.main.mix
-	tri_y_yaw+.main.mix
-	rover_generic.main.mix
 	rover_diff_and_servo.main.mix
+	rover_generic.main.mix
+	stampede.main.mix
+	standard_vtol_hitl.main.mix
+	TF-AutoG2.main.mix
+	tilt_quad.aux.mix
+	tilt_quad.main.mix
+	tri_y_yaw+.main.mix
+	tri_y_yaw-.main.mix
+	uuv_x.main.mix
 	Viper.main.mix
 	vtol_AAERT.aux.mix
 	vtol_AAVVT.aux.mix
 	vtol_convergence.main.mix
 	vtol_delta.aux.mix
+	vtol_tailsitter_duo.main.mix
 	wingwing.main.mix
-	TF-AutoG2.main.mix
-	uuv_x.main.mix
 )