From 3e9e5ed37217f3cd42d29d97543a69e2c685d440 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 30 Nov 2018 15:36:24 -0500 Subject: [PATCH] ROMFS move airframes to subdirectory --- ROMFS/px4fmu_common/init.d/CMakeLists.txt | 71 +-------- .../{ => airframes}/1000_rc_fw_easystar.hil | 0 .../{ => airframes}/10015_tbs_discovery | 0 .../init.d/{ => airframes}/10016_3dr_iris | 0 .../{ => airframes}/10017_steadidrone_qu4d | 0 .../{ => airframes}/10018_tbs_endurance | 0 .../init.d/{ => airframes}/1001_rc_quad_x.hil | 0 .../{ => airframes}/1002_standard_vtol.hil | 0 .../init.d/{ => airframes}/11001_hexa_cox | 0 .../init.d/{ => airframes}/12001_octo_cox | 0 .../{ => airframes}/12002_steadidrone_mavrik | 0 .../13000_generic_vtol_standard | 0 .../{ => airframes}/13001_caipirinha_vtol | 0 .../init.d/{ => airframes}/13002_firefly6 | 0 .../{ => airframes}/13003_quad_tailsitter | 0 .../{ => airframes}/13004_quad+_tailsitter | 0 .../{ => airframes}/13005_vtol_AAERT_quad | 0 .../{ => airframes}/13006_vtol_standard_delta | 0 .../{ => airframes}/13007_vtol_AAVVT_quad | 0 .../init.d/{ => airframes}/13008_QuadRanger | 0 .../{ => airframes}/13009_vtol_spt_ranger | 0 .../init.d/{ => airframes}/13010_claire | 0 .../init.d/{ => airframes}/13012_convergence | 0 .../init.d/{ => airframes}/13013_deltaquad | 0 .../init.d/{ => airframes}/14001_tri_y_yaw+ | 0 .../init.d/{ => airframes}/14002_tri_y_yaw- | 0 .../init.d/{ => airframes}/15001_coax_heli | 0 .../init.d/{ => airframes}/16001_helicopter | 0 .../{ => airframes}/2100_standard_plane | 0 .../init.d/{ => airframes}/2105_maja | 0 .../init.d/{ => airframes}/2106_albatross | 0 .../init.d/{ => airframes}/2200_mini_talon | 0 .../init.d/{ => airframes}/24001_dodeca_cox | 0 .../init.d/{ => airframes}/3000_generic_wing | 0 .../init.d/{ => airframes}/3030_io_camflyer | 0 .../init.d/{ => airframes}/3031_phantom | 0 .../init.d/{ => airframes}/3032_skywalker_x5 | 0 .../init.d/{ => airframes}/3033_wingwing | 0 .../init.d/{ => airframes}/3034_fx79 | 0 .../init.d/{ => airframes}/3035_viper | 0 .../init.d/{ => airframes}/3036_pigeon | 0 .../{ => airframes}/3037_parrot_disco_mod | 0 .../{ => airframes}/3100_tbs_caipirinha | 0 .../init.d/{ => airframes}/4001_quad_x | 0 .../init.d/{ => airframes}/4002_quad_x_mount | 0 .../init.d/{ => airframes}/4003_qavr5 | 0 .../init.d/{ => airframes}/4004_H4_680mm | 0 .../init.d/{ => airframes}/4009_qav250 | 0 .../init.d/{ => airframes}/4010_dji_f330 | 0 .../init.d/{ => airframes}/4011_dji_f450 | 0 .../init.d/{ => airframes}/4012_quad_x_can | 0 .../init.d/{ => airframes}/4013_bebop | 0 .../init.d/{ => airframes}/4014_s500 | 0 .../init.d/{ => airframes}/4020_hk_micro_pcb | 0 .../init.d/{ => airframes}/4030_3dr_solo | 0 .../init.d/{ => airframes}/4031_3dr_quad | 0 .../init.d/{ => airframes}/4040_reaper | 0 .../init.d/{ => airframes}/4050_generic_250 | 0 .../init.d/{ => airframes}/4051_s250aq | 0 .../{ => airframes}/4060_dji_matrice_100 | 0 .../init.d/{ => airframes}/4070_aerofc | 0 .../init.d/{ => airframes}/4080_zmr250 | 0 .../init.d/{ => airframes}/4090_nanomind | 0 .../init.d/{ => airframes}/4100_tiltquadrotor | 0 .../init.d/{ => airframes}/4250_teal | 0 .../init.d/{ => airframes}/4900_crazyflie | 0 .../50000_generic_ground_vehicle | 0 .../{ => airframes}/50001_axialracing_ax10 | 0 .../50002_traxxas_stampede_2wd | 0 .../init.d/{ => airframes}/5001_quad_+ | 0 .../init.d/{ => airframes}/6001_hexa_x | 0 .../init.d/{ => airframes}/7001_hexa_+ | 0 .../init.d/{ => airframes}/8001_octo_x | 0 .../init.d/{ => airframes}/9001_octo_+ | 0 .../init.d/airframes/CMakeLists.txt | 141 ++++++++++++++++++ Tools/px4airframes/rcout.py | 5 +- 76 files changed, 146 insertions(+), 71 deletions(-) rename ROMFS/px4fmu_common/init.d/{ => airframes}/1000_rc_fw_easystar.hil (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/10015_tbs_discovery (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/10016_3dr_iris (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/10017_steadidrone_qu4d (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/10018_tbs_endurance (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/1001_rc_quad_x.hil (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/1002_standard_vtol.hil (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/11001_hexa_cox (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/12001_octo_cox (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/12002_steadidrone_mavrik (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13000_generic_vtol_standard (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13001_caipirinha_vtol (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13002_firefly6 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13003_quad_tailsitter (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13004_quad+_tailsitter (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13005_vtol_AAERT_quad (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13006_vtol_standard_delta (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13007_vtol_AAVVT_quad (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13008_QuadRanger (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13009_vtol_spt_ranger (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13010_claire (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13012_convergence (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/13013_deltaquad (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/14001_tri_y_yaw+ (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/14002_tri_y_yaw- (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/15001_coax_heli (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/16001_helicopter (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/2100_standard_plane (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/2105_maja (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/2106_albatross (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/2200_mini_talon (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/24001_dodeca_cox (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3000_generic_wing (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3030_io_camflyer (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3031_phantom (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3032_skywalker_x5 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3033_wingwing (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3034_fx79 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3035_viper (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3036_pigeon (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3037_parrot_disco_mod (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/3100_tbs_caipirinha (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4001_quad_x (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4002_quad_x_mount (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4003_qavr5 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4004_H4_680mm (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4009_qav250 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4010_dji_f330 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4011_dji_f450 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4012_quad_x_can (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4013_bebop (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4014_s500 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4020_hk_micro_pcb (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4030_3dr_solo (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4031_3dr_quad (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4040_reaper (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4050_generic_250 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4051_s250aq (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4060_dji_matrice_100 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4070_aerofc (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4080_zmr250 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4090_nanomind (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4100_tiltquadrotor (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4250_teal (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/4900_crazyflie (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/50000_generic_ground_vehicle (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/50001_axialracing_ax10 (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/50002_traxxas_stampede_2wd (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/5001_quad_+ (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/6001_hexa_x (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/7001_hexa_+ (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/8001_octo_x (100%) rename ROMFS/px4fmu_common/init.d/{ => airframes}/9001_octo_+ (100%) create mode 100644 ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt diff --git a/ROMFS/px4fmu_common/init.d/CMakeLists.txt b/ROMFS/px4fmu_common/init.d/CMakeLists.txt index 76ee6f2e0c..773c71eb0a 100644 --- a/ROMFS/px4fmu_common/init.d/CMakeLists.txt +++ b/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 ) diff --git a/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil b/ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil similarity index 100% rename from ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil rename to ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil diff --git a/ROMFS/px4fmu_common/init.d/10015_tbs_discovery b/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery similarity index 100% rename from ROMFS/px4fmu_common/init.d/10015_tbs_discovery rename to ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery diff --git a/ROMFS/px4fmu_common/init.d/10016_3dr_iris b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris similarity index 100% rename from ROMFS/px4fmu_common/init.d/10016_3dr_iris rename to ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris diff --git a/ROMFS/px4fmu_common/init.d/10017_steadidrone_qu4d b/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d similarity index 100% rename from ROMFS/px4fmu_common/init.d/10017_steadidrone_qu4d rename to ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d diff --git a/ROMFS/px4fmu_common/init.d/10018_tbs_endurance b/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance similarity index 100% rename from ROMFS/px4fmu_common/init.d/10018_tbs_endurance rename to ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance diff --git a/ROMFS/px4fmu_common/init.d/1001_rc_quad_x.hil b/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil similarity index 100% rename from ROMFS/px4fmu_common/init.d/1001_rc_quad_x.hil rename to ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil diff --git a/ROMFS/px4fmu_common/init.d/1002_standard_vtol.hil b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil similarity index 100% rename from ROMFS/px4fmu_common/init.d/1002_standard_vtol.hil rename to ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil diff --git a/ROMFS/px4fmu_common/init.d/11001_hexa_cox b/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox similarity index 100% rename from ROMFS/px4fmu_common/init.d/11001_hexa_cox rename to ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox diff --git a/ROMFS/px4fmu_common/init.d/12001_octo_cox b/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox similarity index 100% rename from ROMFS/px4fmu_common/init.d/12001_octo_cox rename to ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox diff --git a/ROMFS/px4fmu_common/init.d/12002_steadidrone_mavrik b/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik similarity index 100% rename from ROMFS/px4fmu_common/init.d/12002_steadidrone_mavrik rename to ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik diff --git a/ROMFS/px4fmu_common/init.d/13000_generic_vtol_standard b/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard similarity index 100% rename from ROMFS/px4fmu_common/init.d/13000_generic_vtol_standard rename to ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard diff --git a/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol similarity index 100% rename from ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol rename to ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol diff --git a/ROMFS/px4fmu_common/init.d/13002_firefly6 b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 similarity index 100% rename from ROMFS/px4fmu_common/init.d/13002_firefly6 rename to ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 diff --git a/ROMFS/px4fmu_common/init.d/13003_quad_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter similarity index 100% rename from ROMFS/px4fmu_common/init.d/13003_quad_tailsitter rename to ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter diff --git a/ROMFS/px4fmu_common/init.d/13004_quad+_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter similarity index 100% rename from ROMFS/px4fmu_common/init.d/13004_quad+_tailsitter rename to ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter diff --git a/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad b/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad similarity index 100% rename from ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad rename to ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad diff --git a/ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta b/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta similarity index 100% rename from ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta rename to ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta diff --git a/ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad b/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad similarity index 100% rename from ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad rename to ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad diff --git a/ROMFS/px4fmu_common/init.d/13008_QuadRanger b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger similarity index 100% rename from ROMFS/px4fmu_common/init.d/13008_QuadRanger rename to ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger diff --git a/ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger b/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger similarity index 100% rename from ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger rename to ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger diff --git a/ROMFS/px4fmu_common/init.d/13010_claire b/ROMFS/px4fmu_common/init.d/airframes/13010_claire similarity index 100% rename from ROMFS/px4fmu_common/init.d/13010_claire rename to ROMFS/px4fmu_common/init.d/airframes/13010_claire diff --git a/ROMFS/px4fmu_common/init.d/13012_convergence b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence similarity index 100% rename from ROMFS/px4fmu_common/init.d/13012_convergence rename to ROMFS/px4fmu_common/init.d/airframes/13012_convergence diff --git a/ROMFS/px4fmu_common/init.d/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad similarity index 100% rename from ROMFS/px4fmu_common/init.d/13013_deltaquad rename to ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad diff --git a/ROMFS/px4fmu_common/init.d/14001_tri_y_yaw+ b/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ similarity index 100% rename from ROMFS/px4fmu_common/init.d/14001_tri_y_yaw+ rename to ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ diff --git a/ROMFS/px4fmu_common/init.d/14002_tri_y_yaw- b/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- similarity index 100% rename from ROMFS/px4fmu_common/init.d/14002_tri_y_yaw- rename to ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- diff --git a/ROMFS/px4fmu_common/init.d/15001_coax_heli b/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli similarity index 100% rename from ROMFS/px4fmu_common/init.d/15001_coax_heli rename to ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli diff --git a/ROMFS/px4fmu_common/init.d/16001_helicopter b/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter similarity index 100% rename from ROMFS/px4fmu_common/init.d/16001_helicopter rename to ROMFS/px4fmu_common/init.d/airframes/16001_helicopter diff --git a/ROMFS/px4fmu_common/init.d/2100_standard_plane b/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane similarity index 100% rename from ROMFS/px4fmu_common/init.d/2100_standard_plane rename to ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane diff --git a/ROMFS/px4fmu_common/init.d/2105_maja b/ROMFS/px4fmu_common/init.d/airframes/2105_maja similarity index 100% rename from ROMFS/px4fmu_common/init.d/2105_maja rename to ROMFS/px4fmu_common/init.d/airframes/2105_maja diff --git a/ROMFS/px4fmu_common/init.d/2106_albatross b/ROMFS/px4fmu_common/init.d/airframes/2106_albatross similarity index 100% rename from ROMFS/px4fmu_common/init.d/2106_albatross rename to ROMFS/px4fmu_common/init.d/airframes/2106_albatross diff --git a/ROMFS/px4fmu_common/init.d/2200_mini_talon b/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon similarity index 100% rename from ROMFS/px4fmu_common/init.d/2200_mini_talon rename to ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon diff --git a/ROMFS/px4fmu_common/init.d/24001_dodeca_cox b/ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox similarity index 100% rename from ROMFS/px4fmu_common/init.d/24001_dodeca_cox rename to ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox diff --git a/ROMFS/px4fmu_common/init.d/3000_generic_wing b/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing similarity index 100% rename from ROMFS/px4fmu_common/init.d/3000_generic_wing rename to ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing diff --git a/ROMFS/px4fmu_common/init.d/3030_io_camflyer b/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer similarity index 100% rename from ROMFS/px4fmu_common/init.d/3030_io_camflyer rename to ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer diff --git a/ROMFS/px4fmu_common/init.d/3031_phantom b/ROMFS/px4fmu_common/init.d/airframes/3031_phantom similarity index 100% rename from ROMFS/px4fmu_common/init.d/3031_phantom rename to ROMFS/px4fmu_common/init.d/airframes/3031_phantom diff --git a/ROMFS/px4fmu_common/init.d/3032_skywalker_x5 b/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 similarity index 100% rename from ROMFS/px4fmu_common/init.d/3032_skywalker_x5 rename to ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 diff --git a/ROMFS/px4fmu_common/init.d/3033_wingwing b/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing similarity index 100% rename from ROMFS/px4fmu_common/init.d/3033_wingwing rename to ROMFS/px4fmu_common/init.d/airframes/3033_wingwing diff --git a/ROMFS/px4fmu_common/init.d/3034_fx79 b/ROMFS/px4fmu_common/init.d/airframes/3034_fx79 similarity index 100% rename from ROMFS/px4fmu_common/init.d/3034_fx79 rename to ROMFS/px4fmu_common/init.d/airframes/3034_fx79 diff --git a/ROMFS/px4fmu_common/init.d/3035_viper b/ROMFS/px4fmu_common/init.d/airframes/3035_viper similarity index 100% rename from ROMFS/px4fmu_common/init.d/3035_viper rename to ROMFS/px4fmu_common/init.d/airframes/3035_viper diff --git a/ROMFS/px4fmu_common/init.d/3036_pigeon b/ROMFS/px4fmu_common/init.d/airframes/3036_pigeon similarity index 100% rename from ROMFS/px4fmu_common/init.d/3036_pigeon rename to ROMFS/px4fmu_common/init.d/airframes/3036_pigeon diff --git a/ROMFS/px4fmu_common/init.d/3037_parrot_disco_mod b/ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod similarity index 100% rename from ROMFS/px4fmu_common/init.d/3037_parrot_disco_mod rename to ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod diff --git a/ROMFS/px4fmu_common/init.d/3100_tbs_caipirinha b/ROMFS/px4fmu_common/init.d/airframes/3100_tbs_caipirinha similarity index 100% rename from ROMFS/px4fmu_common/init.d/3100_tbs_caipirinha rename to ROMFS/px4fmu_common/init.d/airframes/3100_tbs_caipirinha diff --git a/ROMFS/px4fmu_common/init.d/4001_quad_x b/ROMFS/px4fmu_common/init.d/airframes/4001_quad_x similarity index 100% rename from ROMFS/px4fmu_common/init.d/4001_quad_x rename to ROMFS/px4fmu_common/init.d/airframes/4001_quad_x diff --git a/ROMFS/px4fmu_common/init.d/4002_quad_x_mount b/ROMFS/px4fmu_common/init.d/airframes/4002_quad_x_mount similarity index 100% rename from ROMFS/px4fmu_common/init.d/4002_quad_x_mount rename to ROMFS/px4fmu_common/init.d/airframes/4002_quad_x_mount diff --git a/ROMFS/px4fmu_common/init.d/4003_qavr5 b/ROMFS/px4fmu_common/init.d/airframes/4003_qavr5 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4003_qavr5 rename to ROMFS/px4fmu_common/init.d/airframes/4003_qavr5 diff --git a/ROMFS/px4fmu_common/init.d/4004_H4_680mm b/ROMFS/px4fmu_common/init.d/airframes/4004_H4_680mm similarity index 100% rename from ROMFS/px4fmu_common/init.d/4004_H4_680mm rename to ROMFS/px4fmu_common/init.d/airframes/4004_H4_680mm diff --git a/ROMFS/px4fmu_common/init.d/4009_qav250 b/ROMFS/px4fmu_common/init.d/airframes/4009_qav250 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4009_qav250 rename to ROMFS/px4fmu_common/init.d/airframes/4009_qav250 diff --git a/ROMFS/px4fmu_common/init.d/4010_dji_f330 b/ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4010_dji_f330 rename to ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330 diff --git a/ROMFS/px4fmu_common/init.d/4011_dji_f450 b/ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4011_dji_f450 rename to ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450 diff --git a/ROMFS/px4fmu_common/init.d/4012_quad_x_can b/ROMFS/px4fmu_common/init.d/airframes/4012_quad_x_can similarity index 100% rename from ROMFS/px4fmu_common/init.d/4012_quad_x_can rename to ROMFS/px4fmu_common/init.d/airframes/4012_quad_x_can diff --git a/ROMFS/px4fmu_common/init.d/4013_bebop b/ROMFS/px4fmu_common/init.d/airframes/4013_bebop similarity index 100% rename from ROMFS/px4fmu_common/init.d/4013_bebop rename to ROMFS/px4fmu_common/init.d/airframes/4013_bebop diff --git a/ROMFS/px4fmu_common/init.d/4014_s500 b/ROMFS/px4fmu_common/init.d/airframes/4014_s500 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4014_s500 rename to ROMFS/px4fmu_common/init.d/airframes/4014_s500 diff --git a/ROMFS/px4fmu_common/init.d/4020_hk_micro_pcb b/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb similarity index 100% rename from ROMFS/px4fmu_common/init.d/4020_hk_micro_pcb rename to ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb diff --git a/ROMFS/px4fmu_common/init.d/4030_3dr_solo b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo similarity index 100% rename from ROMFS/px4fmu_common/init.d/4030_3dr_solo rename to ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo diff --git a/ROMFS/px4fmu_common/init.d/4031_3dr_quad b/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad similarity index 100% rename from ROMFS/px4fmu_common/init.d/4031_3dr_quad rename to ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad diff --git a/ROMFS/px4fmu_common/init.d/4040_reaper b/ROMFS/px4fmu_common/init.d/airframes/4040_reaper similarity index 100% rename from ROMFS/px4fmu_common/init.d/4040_reaper rename to ROMFS/px4fmu_common/init.d/airframes/4040_reaper diff --git a/ROMFS/px4fmu_common/init.d/4050_generic_250 b/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4050_generic_250 rename to ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 diff --git a/ROMFS/px4fmu_common/init.d/4051_s250aq b/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq similarity index 100% rename from ROMFS/px4fmu_common/init.d/4051_s250aq rename to ROMFS/px4fmu_common/init.d/airframes/4051_s250aq diff --git a/ROMFS/px4fmu_common/init.d/4060_dji_matrice_100 b/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4060_dji_matrice_100 rename to ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 diff --git a/ROMFS/px4fmu_common/init.d/4070_aerofc b/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc similarity index 100% rename from ROMFS/px4fmu_common/init.d/4070_aerofc rename to ROMFS/px4fmu_common/init.d/airframes/4070_aerofc diff --git a/ROMFS/px4fmu_common/init.d/4080_zmr250 b/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 similarity index 100% rename from ROMFS/px4fmu_common/init.d/4080_zmr250 rename to ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 diff --git a/ROMFS/px4fmu_common/init.d/4090_nanomind b/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind similarity index 100% rename from ROMFS/px4fmu_common/init.d/4090_nanomind rename to ROMFS/px4fmu_common/init.d/airframes/4090_nanomind diff --git a/ROMFS/px4fmu_common/init.d/4100_tiltquadrotor b/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor similarity index 100% rename from ROMFS/px4fmu_common/init.d/4100_tiltquadrotor rename to ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor diff --git a/ROMFS/px4fmu_common/init.d/4250_teal b/ROMFS/px4fmu_common/init.d/airframes/4250_teal similarity index 100% rename from ROMFS/px4fmu_common/init.d/4250_teal rename to ROMFS/px4fmu_common/init.d/airframes/4250_teal diff --git a/ROMFS/px4fmu_common/init.d/4900_crazyflie b/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie similarity index 100% rename from ROMFS/px4fmu_common/init.d/4900_crazyflie rename to ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie diff --git a/ROMFS/px4fmu_common/init.d/50000_generic_ground_vehicle b/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle similarity index 100% rename from ROMFS/px4fmu_common/init.d/50000_generic_ground_vehicle rename to ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle diff --git a/ROMFS/px4fmu_common/init.d/50001_axialracing_ax10 b/ROMFS/px4fmu_common/init.d/airframes/50001_axialracing_ax10 similarity index 100% rename from ROMFS/px4fmu_common/init.d/50001_axialracing_ax10 rename to ROMFS/px4fmu_common/init.d/airframes/50001_axialracing_ax10 diff --git a/ROMFS/px4fmu_common/init.d/50002_traxxas_stampede_2wd b/ROMFS/px4fmu_common/init.d/airframes/50002_traxxas_stampede_2wd similarity index 100% rename from ROMFS/px4fmu_common/init.d/50002_traxxas_stampede_2wd rename to ROMFS/px4fmu_common/init.d/airframes/50002_traxxas_stampede_2wd diff --git a/ROMFS/px4fmu_common/init.d/5001_quad_+ b/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ similarity index 100% rename from ROMFS/px4fmu_common/init.d/5001_quad_+ rename to ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ diff --git a/ROMFS/px4fmu_common/init.d/6001_hexa_x b/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x similarity index 100% rename from ROMFS/px4fmu_common/init.d/6001_hexa_x rename to ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x diff --git a/ROMFS/px4fmu_common/init.d/7001_hexa_+ b/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ similarity index 100% rename from ROMFS/px4fmu_common/init.d/7001_hexa_+ rename to ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ diff --git a/ROMFS/px4fmu_common/init.d/8001_octo_x b/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x similarity index 100% rename from ROMFS/px4fmu_common/init.d/8001_octo_x rename to ROMFS/px4fmu_common/init.d/airframes/8001_octo_x diff --git a/ROMFS/px4fmu_common/init.d/9001_octo_+ b/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ similarity index 100% rename from ROMFS/px4fmu_common/init.d/9001_octo_+ rename to ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ diff --git a/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt new file mode 100644 index 0000000000..c7b4b8e295 --- /dev/null +++ b/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 +) diff --git a/Tools/px4airframes/rcout.py b/Tools/px4airframes/rcout.py index 3dfd2720d1..4b0db3c405 100644 --- a/Tools/px4airframes/rcout.py +++ b/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: