From 185ffe9e13d3b661a4210041cce5bfd22ee1d695 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Mon, 22 Jun 2020 13:53:01 -0700 Subject: [PATCH] nsh scripting:source (.) cmd supported --- ROMFS/cannode/init.d/rcS | 6 ++-- .../init.d/airframes/1000_rc_fw_easystar.hil | 2 +- .../init.d/airframes/10015_tbs_discovery | 2 +- .../init.d/airframes/10016_3dr_iris | 2 +- .../init.d/airframes/10017_steadidrone_qu4d | 2 +- .../init.d/airframes/10018_tbs_endurance | 2 +- .../init.d/airframes/1001_rc_quad_x.hil | 2 +- .../init.d/airframes/1002_standard_vtol.hil | 2 +- .../init.d/airframes/11001_hexa_cox | 2 +- .../init.d/airframes/1100_rc_quad_x_sih.hil | 2 +- .../init.d/airframes/12001_octo_cox | 2 +- .../init.d/airframes/12002_steadidrone_mavrik | 2 +- .../airframes/13000_generic_vtol_standard | 2 +- .../init.d/airframes/13001_caipirinha_vtol | 2 +- .../init.d/airframes/13002_firefly6 | 2 +- .../init.d/airframes/13003_quad_tailsitter | 2 +- .../init.d/airframes/13004_quad+_tailsitter | 2 +- .../init.d/airframes/13005_vtol_AAERT_quad | 2 +- .../airframes/13006_vtol_standard_delta | 2 +- .../init.d/airframes/13007_vtol_AAVVT_quad | 2 +- .../init.d/airframes/13008_QuadRanger | 2 +- .../init.d/airframes/13009_vtol_spt_ranger | 2 +- .../init.d/airframes/13010_claire | 2 +- .../init.d/airframes/13012_convergence | 2 +- .../init.d/airframes/13013_deltaquad | 2 +- .../init.d/airframes/13014_vtol_babyshark | 2 +- .../init.d/airframes/13050_generic_vtol_octo | 2 +- .../airframes/13200_generic_vtol_tailsitter | 2 +- .../init.d/airframes/14001_tri_y_yaw+ | 2 +- .../init.d/airframes/14002_tri_y_yaw- | 2 +- .../init.d/airframes/15001_coax_heli | 2 +- .../init.d/airframes/16001_helicopter | 2 +- .../init.d/airframes/17002_TF-AutoG2 | 2 +- .../init.d/airframes/2100_standard_plane | 2 +- .../px4fmu_common/init.d/airframes/2105_maja | 2 +- .../init.d/airframes/2106_albatross | 2 +- .../init.d/airframes/2200_mini_talon | 2 +- .../init.d/airframes/2507_cloudship | 2 +- .../init.d/airframes/3000_generic_wing | 2 +- .../init.d/airframes/3030_io_camflyer | 2 +- .../init.d/airframes/3031_phantom | 2 +- .../init.d/airframes/3032_skywalker_x5 | 2 +- .../init.d/airframes/3033_wingwing | 2 +- .../px4fmu_common/init.d/airframes/3034_fx79 | 2 +- .../px4fmu_common/init.d/airframes/3035_viper | 2 +- .../init.d/airframes/3036_pigeon | 2 +- .../init.d/airframes/3037_parrot_disco_mod | 2 +- .../init.d/airframes/3100_tbs_caipirinha | 2 +- .../init.d/airframes/4001_quad_x | 2 +- .../px4fmu_common/init.d/airframes/4003_qavr5 | 2 +- .../init.d/airframes/4009_qav250 | 2 +- .../init.d/airframes/4010_dji_f330 | 2 +- .../init.d/airframes/4011_dji_f450 | 2 +- .../px4fmu_common/init.d/airframes/4014_s500 | 2 +- .../init.d/airframes/4015_holybro_s500 | 2 +- .../init.d/airframes/4016_holybro_px4vision | 2 +- .../init.d/airframes/4020_hk_micro_pcb | 2 +- .../init.d/airframes/4030_3dr_solo | 2 +- .../init.d/airframes/4031_3dr_quad | 2 +- .../init.d/airframes/4040_reaper | 2 +- .../init.d/airframes/4041_beta75x | 2 +- .../init.d/airframes/4050_generic_250 | 2 +- .../init.d/airframes/4051_s250aq | 2 +- .../init.d/airframes/4052_holybro_qav250 | 2 +- .../init.d/airframes/4053_holybro_kopis2 | 2 +- .../init.d/airframes/4060_dji_matrice_100 | 2 +- .../init.d/airframes/4070_aerofc | 2 +- .../px4fmu_common/init.d/airframes/4072_draco | 2 +- .../init.d/airframes/4080_zmr250 | 2 +- .../init.d/airframes/4090_nanomind | 2 +- .../init.d/airframes/4100_tiltquadrotor | 2 +- .../px4fmu_common/init.d/airframes/4250_teal | 2 +- .../init.d/airframes/4500_clover4 | 2 +- .../init.d/airframes/4900_crazyflie | 2 +- .../airframes/50000_generic_ground_vehicle | 2 +- .../init.d/airframes/50001_axialracing_ax10 | 2 +- .../airframes/50002_traxxas_stampede_2wd | 2 +- .../airframes/50003_aion_robotics_r1_rover | 2 +- .../airframes/50004_nxpcup_car_dfrobot_gpx | 2 +- .../init.d/airframes/5001_quad_+ | 2 +- .../init.d/airframes/60000_uuv_generic | 2 +- .../init.d/airframes/60001_uuv_hippocampus | 2 +- .../init.d/airframes/6001_hexa_x | 2 +- .../init.d/airframes/6002_draco_r | 2 +- .../init.d/airframes/7001_hexa_+ | 2 +- .../init.d/airframes/8001_octo_x | 2 +- .../init.d/airframes/9001_octo_+ | 2 +- ROMFS/px4fmu_common/init.d/rc.interface | 4 +-- ROMFS/px4fmu_common/init.d/rc.vehicle_setup | 24 ++++++++-------- ROMFS/px4fmu_common/init.d/rcS | 28 +++++++++---------- ROMFS/px4fmu_test/init.d/rcS | 4 +-- Tools/px4airframes/rcout.py | 2 +- Tools/serial/rc.serial.jinja | 2 +- 93 files changed, 121 insertions(+), 121 deletions(-) diff --git a/ROMFS/cannode/init.d/rcS b/ROMFS/cannode/init.d/rcS index 2ae7a14288..d688c2acea 100644 --- a/ROMFS/cannode/init.d/rcS +++ b/ROMFS/cannode/init.d/rcS @@ -61,7 +61,7 @@ set BOARD_RC_DEFAULTS /etc/init.d/rc.board_defaults if [ -f $BOARD_RC_DEFAULTS ] then echo "Board defaults: ${BOARD_RC_DEFAULTS}" - sh $BOARD_RC_DEFAULTS + . $BOARD_RC_DEFAULTS fi unset BOARD_RC_DEFAULTS @@ -87,7 +87,7 @@ set BOARD_RC_SENSORS /etc/init.d/rc.board_sensors if [ -f $BOARD_RC_SENSORS ] then echo "Board sensors: ${BOARD_RC_SENSORS}" - sh $BOARD_RC_SENSORS + . $BOARD_RC_SENSORS fi unset BOARD_RC_SENSORS @@ -95,7 +95,7 @@ unset BOARD_RC_SENSORS # Start UART/Serial device drivers. # Note: rc.serial is auto-generated from Tools/serial/generate_config.py # -sh /etc/init.d/rc.serial +. /etc/init.d/rc.serial # Check for flow sensor if param compare SENS_EN_PX4FLOW 1 diff --git a/ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil b/ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil index eea12980c1..bff8ee2e91 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil +++ b/ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil @@ -15,7 +15,7 @@ # @maintainer Lorenz Meier # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery b/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery index 838c882f27..3d51b01b85 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery +++ b/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery @@ -23,7 +23,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris index 7eab1772a8..0fd00f5574 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris +++ b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d b/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d index 640203d4db..6252bd5923 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d +++ b/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d @@ -23,7 +23,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance b/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance index 0e0be4ef0f..5b8f80ffa5 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance +++ b/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance @@ -23,7 +23,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil b/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil index 707a3a9349..5a918daf24 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil +++ b/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil @@ -8,7 +8,7 @@ # @maintainer Lorenz Meier # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil index 97076c12d0..9de90b05e1 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil +++ b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil @@ -8,7 +8,7 @@ # @maintainer Roman Bapst # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox b/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox index c4e57d4cab..82e00d061b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox +++ b/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox @@ -22,7 +22,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER hexa_cox diff --git a/ROMFS/px4fmu_common/init.d/airframes/1100_rc_quad_x_sih.hil b/ROMFS/px4fmu_common/init.d/airframes/1100_rc_quad_x_sih.hil index 1d2d295954..549e5caa2b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/1100_rc_quad_x_sih.hil +++ b/ROMFS/px4fmu_common/init.d/airframes/1100_rc_quad_x_sih.hil @@ -8,7 +8,7 @@ # @maintainer Romain Chiappinelli # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox b/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox index 2a29f5fd04..3c3cce3a8e 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox +++ b/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox @@ -20,7 +20,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER octo_cox diff --git a/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik b/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik index 5dbd56ca97..703a0b541d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik +++ b/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik @@ -20,7 +20,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard b/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard index e249af8d0c..5e1dea9c17 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard +++ b/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard @@ -18,7 +18,7 @@ # @output AUX5 Throttle # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol index 0a83c12d97..91a001dfe0 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol +++ b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol @@ -13,7 +13,7 @@ # @maintainer Roman Bapst # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 index b39b8f1efe..c882ec02ab 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 +++ b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 @@ -22,7 +22,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter index 47268f3104..575f09aa67 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter @@ -8,7 +8,7 @@ # @maintainer Roman Bapst # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter index 5141d3b8fd..d8472dcebe 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad b/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad index 152360f415..3507503ee7 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta b/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta index f627854683..f2f0e911b4 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta +++ b/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad b/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad index a707c6305b..c82e272b55 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger index d926d34a21..2087c0814b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger +++ b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger b/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger index 5edd067634..d2e0cff85a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger +++ b/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13010_claire b/ROMFS/px4fmu_common/init.d/airframes/13010_claire index 1bdc0c5483..430e71812f 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13010_claire +++ b/ROMFS/px4fmu_common/init.d/airframes/13010_claire @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13012_convergence b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence index 0ba1dba6dd..27d532aab5 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13012_convergence +++ b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence @@ -20,7 +20,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad index 2be9230154..d1591c0299 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad +++ b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad @@ -17,7 +17,7 @@ # @output MAIN8 Pusher reverse channel # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark index 18b5bbd0de..4fc04e10f0 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark +++ b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo b/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo index 8f89945dd4..8d72d8903c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo +++ b/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo @@ -24,7 +24,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter index fd74aca96c..f299c10198 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter @@ -16,7 +16,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.vtol_defaults +. /etc/init.d/rc.vtol_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ b/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ index c869b663dd..e5464f2cfc 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ +++ b/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ @@ -16,7 +16,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER tri_y_yaw+ diff --git a/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- b/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- index 3e2326b93e..41e784cc62 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- +++ b/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- @@ -16,7 +16,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER tri_y_yaw- diff --git a/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli b/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli index 897e7e6080..81f27fa011 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli +++ b/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli @@ -17,7 +17,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER coax if [ $AUTOCNF = yes ] diff --git a/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter b/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter index a909ac9bbb..b609024b4c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter +++ b/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter @@ -18,7 +18,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults # Configure as helicopter (number 4 defined in commander_helper.cpp) set MAV_TYPE 4 diff --git a/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 b/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 index caabe57143..2eb1ceadc4 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 +++ b/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 @@ -24,7 +24,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane b/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane index 758d532788..6c00f4e058 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane +++ b/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane @@ -22,7 +22,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/2105_maja b/ROMFS/px4fmu_common/init.d/airframes/2105_maja index df6cea04a1..95287e031d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2105_maja +++ b/ROMFS/px4fmu_common/init.d/airframes/2105_maja @@ -24,7 +24,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/2106_albatross b/ROMFS/px4fmu_common/init.d/airframes/2106_albatross index a85cd829d2..87fcef4004 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2106_albatross +++ b/ROMFS/px4fmu_common/init.d/airframes/2106_albatross @@ -24,7 +24,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon b/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon index c0bfbce9fa..d4b73ec71c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon +++ b/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon @@ -25,7 +25,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship b/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship index 42a6696edc..8767ac178b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship +++ b/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship @@ -14,7 +14,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.airship_defaults +. /etc/init.d/rc.airship_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing b/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing index 3a03ad9d11..c09882f0ef 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing +++ b/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing @@ -19,6 +19,6 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults set MIXER fw_generic_wing diff --git a/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer b/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer index bf5faa5210..f9a003abc9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer +++ b/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer @@ -20,7 +20,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3031_phantom b/ROMFS/px4fmu_common/init.d/airframes/3031_phantom index 0ee7d347a7..526f68051e 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3031_phantom +++ b/ROMFS/px4fmu_common/init.d/airframes/3031_phantom @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 b/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 index 57ad5fa655..7c2e998da1 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 +++ b/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing b/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing index 4579284912..e10391357f 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing +++ b/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3034_fx79 b/ROMFS/px4fmu_common/init.d/airframes/3034_fx79 index acdc15a5cc..7157598a4a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3034_fx79 +++ b/ROMFS/px4fmu_common/init.d/airframes/3034_fx79 @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3035_viper b/ROMFS/px4fmu_common/init.d/airframes/3035_viper index fdc6812e39..dcf444c6da 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3035_viper +++ b/ROMFS/px4fmu_common/init.d/airframes/3035_viper @@ -17,6 +17,6 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults set MIXER Viper diff --git a/ROMFS/px4fmu_common/init.d/airframes/3036_pigeon b/ROMFS/px4fmu_common/init.d/airframes/3036_pigeon index 71b5f69adf..66297a974c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3036_pigeon +++ b/ROMFS/px4fmu_common/init.d/airframes/3036_pigeon @@ -20,7 +20,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod b/ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod index d94e81636c..fff1051bd3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod +++ b/ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/3100_tbs_caipirinha b/ROMFS/px4fmu_common/init.d/airframes/3100_tbs_caipirinha index 9e0fffa86c..0f766b3ebe 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3100_tbs_caipirinha +++ b/ROMFS/px4fmu_common/init.d/airframes/3100_tbs_caipirinha @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.fw_defaults +. /etc/init.d/rc.fw_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/4001_quad_x b/ROMFS/px4fmu_common/init.d/airframes/4001_quad_x index 709e8197ef..5d6e509a56 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4001_quad_x +++ b/ROMFS/px4fmu_common/init.d/airframes/4001_quad_x @@ -20,7 +20,7 @@ # @maintainer Lorenz Meier # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x diff --git a/ROMFS/px4fmu_common/init.d/airframes/4003_qavr5 b/ROMFS/px4fmu_common/init.d/airframes/4003_qavr5 index c15c0516f2..dd4327bbcb 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4003_qavr5 +++ b/ROMFS/px4fmu_common/init.d/airframes/4003_qavr5 @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4009_qav250 b/ROMFS/px4fmu_common/init.d/airframes/4009_qav250 index c0c20a1618..881390fbe8 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4009_qav250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4009_qav250 @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330 b/ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330 index d85c26f036..ff47b65ad1 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330 +++ b/ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330 @@ -8,7 +8,7 @@ # @maintainer Lorenz Meier # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450 b/ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450 index 4863f1b664..d3e95103bf 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450 +++ b/ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450 @@ -8,7 +8,7 @@ # @maintainer Lorenz Meier # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4014_s500 b/ROMFS/px4fmu_common/init.d/airframes/4014_s500 index e5552a9325..5730550f1a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4014_s500 +++ b/ROMFS/px4fmu_common/init.d/airframes/4014_s500 @@ -10,7 +10,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4015_holybro_s500 b/ROMFS/px4fmu_common/init.d/airframes/4015_holybro_s500 index e6fdf82445..35f1147414 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4015_holybro_s500 +++ b/ROMFS/px4fmu_common/init.d/airframes/4015_holybro_s500 @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4016_holybro_px4vision b/ROMFS/px4fmu_common/init.d/airframes/4016_holybro_px4vision index ce5306d6b8..3fc793a43d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4016_holybro_px4vision +++ b/ROMFS/px4fmu_common/init.d/airframes/4016_holybro_px4vision @@ -14,7 +14,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb b/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb index 91ead4b4a4..4b60f2cac6 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb +++ b/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb @@ -17,7 +17,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo index 7ecfbc2c22..9e8acf38f3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo +++ b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo @@ -17,7 +17,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad b/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad index 307c5400f1..a842115390 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4040_reaper b/ROMFS/px4fmu_common/init.d/airframes/4040_reaper index ea7a039ddc..422f6309e3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4040_reaper +++ b/ROMFS/px4fmu_common/init.d/airframes/4040_reaper @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x b/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x index d5ef138b56..400825466e 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x +++ b/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x @@ -22,7 +22,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 b/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 index b22b4f72d9..a9e1870952 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 @@ -11,7 +11,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq b/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq index 4ef8408ec7..4b1ef0757b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq +++ b/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_s250aq set MAV_TYPE 2 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 b/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 index 4a240efa2c..68fbf6ff8b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 @@ -14,7 +14,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 b/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 index f2f1068298..87d58752ee 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 +++ b/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 b/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 index 46c3a3dd3f..1fa21770db 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 +++ b/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc b/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc index 7ca8a0dfb9..3a1cefc549 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc +++ b/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc @@ -16,7 +16,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults # # Load default params for this platform diff --git a/ROMFS/px4fmu_common/init.d/airframes/4072_draco b/ROMFS/px4fmu_common/init.d/airframes/4072_draco index 6cf727bae5..5fec9562fb 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4072_draco +++ b/ROMFS/px4fmu_common/init.d/airframes/4072_draco @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 b/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 index 90325a69b0..e51698a1bc 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind b/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind index 09e14ad962..5eb36e2f9a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind +++ b/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind @@ -16,7 +16,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor b/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor index d407d33c09..b9822efeff 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor +++ b/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor @@ -23,7 +23,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults #Parameters here: param set LED_RGB_MAXBRT 8 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4250_teal b/ROMFS/px4fmu_common/init.d/airframes/4250_teal index c0d2cb3272..e9b98f7a1d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4250_teal +++ b/ROMFS/px4fmu_common/init.d/airframes/4250_teal @@ -23,7 +23,7 @@ echo "Executing 4250_teal script." -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 b/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 index 7a289ba184..57864308ae 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 +++ b/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie b/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie index 228ceb170e..fc59f1cf3a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie +++ b/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie @@ -15,7 +15,7 @@ # @board px4_fmu-v5x exclude # @board intel_aerofc-v1 exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_x_cw set PWM_OUT 1234 diff --git a/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle b/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle index 1f87157466..939b3852c2 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle +++ b/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle @@ -17,7 +17,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.rover_defaults +. /etc/init.d/rc.rover_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/50001_axialracing_ax10 b/ROMFS/px4fmu_common/init.d/airframes/50001_axialracing_ax10 index 31adf0a836..498815e7bb 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50001_axialracing_ax10 +++ b/ROMFS/px4fmu_common/init.d/airframes/50001_axialracing_ax10 @@ -21,7 +21,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.rover_defaults +. /etc/init.d/rc.rover_defaults # # This section can be enabled once tuning parameters for this particular diff --git a/ROMFS/px4fmu_common/init.d/airframes/50002_traxxas_stampede_2wd b/ROMFS/px4fmu_common/init.d/airframes/50002_traxxas_stampede_2wd index b4b553c897..546529e6d9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50002_traxxas_stampede_2wd +++ b/ROMFS/px4fmu_common/init.d/airframes/50002_traxxas_stampede_2wd @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.rover_defaults +. /etc/init.d/rc.rover_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover b/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover index 88dec85025..3149cb368b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover +++ b/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.rover_defaults +. /etc/init.d/rc.rover_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx b/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx index ff0ce0cb43..22d94363c2 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx +++ b/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx @@ -19,7 +19,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.rover_defaults +. /etc/init.d/rc.rover_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ b/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ index c52e746b7d..a683d6e733 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ +++ b/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ @@ -23,7 +23,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER quad_+ diff --git a/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic b/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic index 926c77b708..4967eba781 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic +++ b/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.uuv_defaults +. /etc/init.d/rc.uuv_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus b/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus index b2c02d4b50..0e52438b19 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus +++ b/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus @@ -12,7 +12,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.uuv_defaults +. /etc/init.d/rc.uuv_defaults if [ $AUTOCNF = yes ] then diff --git a/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x b/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x index 19b3ff58b9..756184c776 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x +++ b/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x @@ -22,7 +22,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER hexa_x diff --git a/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r b/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r index 7f6181fcd3..07b53f8e8b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r +++ b/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r @@ -26,7 +26,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER hexa_x set PWM_OUT 12345678 diff --git a/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ b/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ index 3410f579d2..286e8ba42d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ +++ b/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ @@ -22,7 +22,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER hexa_+ diff --git a/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x b/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x index f4aa1d5340..615940506a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x +++ b/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x @@ -24,7 +24,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER octo_x diff --git a/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ b/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ index 2ddf964dc4..6e18f2faac 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ +++ b/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ @@ -24,7 +24,7 @@ # @board bitcraze_crazyflie exclude # -sh /etc/init.d/rc.mc_defaults +. /etc/init.d/rc.mc_defaults set MIXER octo_+ diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 3143b2c034..e4b36a7c78 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -111,7 +111,7 @@ then if [ $OUTPUT_MODE = io ] then - sh /etc/init.d/rc.io + . /etc/init.d/rc.io fi # @@ -121,7 +121,7 @@ then then if [ $OUTPUT_MODE != io ] then - sh /etc/init.d/rc.io + . /etc/init.d/rc.io fi fi fi diff --git a/ROMFS/px4fmu_common/init.d/rc.vehicle_setup b/ROMFS/px4fmu_common/init.d/rc.vehicle_setup index c493402bab..0f676668d3 100644 --- a/ROMFS/px4fmu_common/init.d/rc.vehicle_setup +++ b/ROMFS/px4fmu_common/init.d/rc.vehicle_setup @@ -26,10 +26,10 @@ then param set MAV_TYPE ${MAV_TYPE} # Load mixer and configure outputs. - sh /etc/init.d/rc.interface + . /etc/init.d/rc.interface # Start standard fixedwing apps. - sh /etc/init.d/rc.fw_apps + . /etc/init.d/rc.fw_apps fi # @@ -78,10 +78,10 @@ then param set MAV_TYPE ${MAV_TYPE} # Load mixer and configure outputs. - sh /etc/init.d/rc.interface + . /etc/init.d/rc.interface # Start standard multicopter apps. - sh /etc/init.d/rc.mc_apps + . /etc/init.d/rc.mc_apps fi # @@ -105,10 +105,10 @@ then param set MAV_TYPE ${MAV_TYPE} # Load mixer and configure outputs. - sh /etc/init.d/rc.interface + . /etc/init.d/rc.interface # Start standard UGV apps. - sh /etc/init.d/rc.rover_apps + . /etc/init.d/rc.rover_apps fi # @@ -141,10 +141,10 @@ then param set MAV_TYPE ${MAV_TYPE} # Load mixer and configure outputs. - sh /etc/init.d/rc.interface + . /etc/init.d/rc.interface # Start standard vtol apps. - sh /etc/init.d/rc.vtol_apps + . /etc/init.d/rc.vtol_apps fi # @@ -167,10 +167,10 @@ then param set MAV_TYPE ${MAV_TYPE} # Load mixer and configure outputs. - sh /etc/init.d/rc.interface + . /etc/init.d/rc.interface # Start airship apps. - sh /etc/init.d/rc.airship_apps + . /etc/init.d/rc.airship_apps fi # @@ -184,10 +184,10 @@ then fi # Load mixer and configure outputs. - sh /etc/init.d/rc.interface + . /etc/init.d/rc.interface # Start standard vtol apps. - sh /etc/init.d/rc.uuv_apps + . /etc/init.d/rc.uuv_apps fi diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 3e176ef157..6ce1350fd6 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -152,7 +152,7 @@ fi # if [ -f $FRC ] then - sh $FRC + . $FRC else # @@ -202,7 +202,7 @@ else if [ -f $BOARD_RC_DEFAULTS ] then echo "Board defaults: ${BOARD_RC_DEFAULTS}" - sh $BOARD_RC_DEFAULTS + . $BOARD_RC_DEFAULTS fi unset BOARD_RC_DEFAULTS @@ -248,7 +248,7 @@ else # if ! param compare SYS_AUTOSTART 0 then - sh /etc/init.d/rc.autostart + . /etc/init.d/rc.autostart fi # @@ -257,7 +257,7 @@ else if [ -f $FCONFIG ] then echo "Custom: ${FCONFIG}" - sh $FCONFIG + . $FCONFIG fi # @@ -368,11 +368,11 @@ else if [ -f $BOARD_RC_SENSORS ] then echo "Board sensors: ${BOARD_RC_SENSORS}" - sh $BOARD_RC_SENSORS + . $BOARD_RC_SENSORS fi unset BOARD_RC_SENSORS - sh /etc/init.d/rc.sensors + . /etc/init.d/rc.sensors if param compare -s BAT1_SOURCE 2 then @@ -459,7 +459,7 @@ else if [ -f $BOARD_RC_MAVLINK ] then echo "Board extras: ${BOARD_RC_MAVLINK}" - sh $BOARD_RC_MAVLINK + . $BOARD_RC_MAVLINK fi unset BOARD_RC_MAVLINK @@ -467,7 +467,7 @@ else # Start UART/Serial device drivers. # Note: rc.serial is auto-generated from Tools/serial/generate_config.py # - sh /etc/init.d/rc.serial + . /etc/init.d/rc.serial if [ $IO_PRESENT = no ] then @@ -480,7 +480,7 @@ else # Note: rc.vehicle_setup is the entry point for rc.interface, # rc.fw_apps, rc.mc_apps, rc.rover_apps, and rc.vtol_apps. # - sh /etc/init.d/rc.vehicle_setup + . /etc/init.d/rc.vehicle_setup # Camera capture driver if param greater -s CAM_CAP_FBACK 0 @@ -499,7 +499,7 @@ else # # Start a thermal calibration if required. # - sh /etc/init.d/rc.thermal_cal + . /etc/init.d/rc.thermal_cal # # Start vmount to control mounts such as gimbals, disabled by default. @@ -528,7 +528,7 @@ else if [ -f $BOARD_RC_EXTRAS ] then echo "Board extras: ${BOARD_RC_EXTRAS}" - sh $BOARD_RC_EXTRAS + . $BOARD_RC_EXTRAS fi unset BOARD_RC_EXTRAS @@ -538,20 +538,20 @@ else if [ -f $FEXTRAS ] then echo "Addons script: ${FEXTRAS}" - sh $FEXTRAS + . $FEXTRAS fi # # Start the logger. # - sh /etc/init.d/rc.logging + . /etc/init.d/rc.logging # # Set additional parameters and env variables for selected AUTOSTART. # if ! param compare SYS_AUTOSTART 0 then - sh /etc/init.d/rc.autostart.post + . /etc/init.d/rc.autostart.post fi if ! param compare SYS_PARAM_VER ${PARAM_DEFAULTS_VER} diff --git a/ROMFS/px4fmu_test/init.d/rcS b/ROMFS/px4fmu_test/init.d/rcS index e8d7d70670..e9c132c7df 100644 --- a/ROMFS/px4fmu_test/init.d/rcS +++ b/ROMFS/px4fmu_test/init.d/rcS @@ -69,7 +69,7 @@ fi if [ -f $BOARD_RC ] then echo "Board init: ${BOARD_RC}" - sh $BOARD_RC + . $BOARD_RC fi if [ -f /etc/extras/px4_io-v2_default.bin ] @@ -119,7 +119,7 @@ then tests mount fi -sh /etc/init.d/rc.sensors +. /etc/init.d/rc.sensors ver all diff --git a/Tools/px4airframes/rcout.py b/Tools/px4airframes/rcout.py index 18e8170ab3..7060bd075c 100644 --- a/Tools/px4airframes/rcout.py +++ b/Tools/px4airframes/rcout.py @@ -74,7 +74,7 @@ class RCOutput(): result += "\n" result += "if [ ${AIRFRAME} != none ]\n" result += "then\n" - result += "\tsh /etc/init.d/airframes/${AIRFRAME}\n" + result += "\t. /etc/init.d/airframes/${AIRFRAME}\n" if not post_start: result += "else\n" result += "\techo \"ERROR [init] No file matches SYS_AUTOSTART value found in : /etc/init.d/airframes\"\n" diff --git a/Tools/serial/rc.serial.jinja b/Tools/serial/rc.serial.jinja index e767409173..fb04e2ec27 100644 --- a/Tools/serial/rc.serial.jinja +++ b/Tools/serial/rc.serial.jinja @@ -11,7 +11,7 @@ set PRT {{ command.port_param_name }} set i {{ command.instance }} {% endif -%} # get the device & baudrate -sh $PRT_F +. $PRT_F if [ $SERIAL_DEV != none ]; then {% if not constrained_flash -%} echo "Starting {{ command.label }} on $SERIAL_DEV"