update ctrlalloc airframe location

2026-05-21 01:12:11 +00:00 · 2021-01-10 21:54:23 -05:00
parent 3e5e5ab1d5
commit 311a2bd3e8
7 changed files with 13 additions and 8 deletions
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/10017_iris_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/10017_iris_ctrlalloc
@@ -7,8 +7,8 @@
 # @maintainer Julian Oes <julian@oes.ch>
 #

-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc

 if [ $AUTOCNF = yes ]
 then
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc
@@ -5,8 +5,8 @@
 # @type Hexarotor x
 #

-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc

 if [ $AUTOCNF = yes ]
 then
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc.post
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc.post
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
@@ -33,6 +33,7 @@

 px4_add_romfs_files(
 	10016_iris
+	10017_iris_ctrlalloc
 	10020_if750a
 	10030_px4vision
 	1010_iris_opt_flow
@@ -73,4 +74,6 @@ px4_add_romfs_files(
 	2507_cloudship
 	6011_typhoon_h480
 	6011_typhoon_h480.post
+	6012_typhoon_ctrlalloc
+	6012_typhoon_ctrlalloc.post
 )
--- a/ROMFS/px4fmu_common/init.d/airframes/4018_s500_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d/airframes/4018_s500_ctrlalloc
@@ -8,8 +8,8 @@
 # @maintainer Silvan Fuhrer
 #

-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etcinit.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc

 if [ $AUTOCNF = yes ]
 then
--- a/ROMFS/px4fmu_common/init.d/airframes/6003_hexa_x_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d/airframes/6003_hexa_x_ctrlalloc
@@ -8,8 +8,8 @@
 # @maintainer Silvan Fuhrer
 #

-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc

 if [ $AUTOCNF = yes ]
 then
--- a/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
@@ -70,6 +70,7 @@ px4_add_romfs_files(
 	4015_holybro_s500
 	4016_holybro_px4vision
 	4017_nxp_hovergames
+	4018_s500_ctrlalloc
 	4020_hk_micro_pcb
 	4030_3dr_solo
 	4031_3dr_quad
@@ -97,6 +98,7 @@ px4_add_romfs_files(
 	# [6000, 6999] Hexarotor x"
 	6001_hexa_x
 	6002_draco_r
+	6003_hexa_x_ctrlalloc

 	# [7000, 7999] Hexarotor +"
 	7001_hexa_+