From b02af04f41f749fec236627a0ea9a7ce54cdebc8 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 23 Aug 2015 14:02:20 +0200 Subject: [PATCH] Re-enable VTOL airframes on master --- ..._caipirinha_vtol => 13001_caipirinha_vtol} | 0 ...INACTIVE_13002_firefly6 => 13002_firefly6} | 0 ..._quad_tailsitter => 13003_quad_tailsitter} | 0 ...uad+_tailsitter => 13004_quad+_tailsitter} | 0 .../init.d/INACTIVE_13005_vtol_AAERT_quad | 50 ------------------- 5 files changed, 50 deletions(-) rename ROMFS/px4fmu_common/init.d/{INACTIVE_13001_caipirinha_vtol => 13001_caipirinha_vtol} (100%) rename ROMFS/px4fmu_common/init.d/{INACTIVE_13002_firefly6 => 13002_firefly6} (100%) rename ROMFS/px4fmu_common/init.d/{INACTIVE_13003_quad_tailsitter => 13003_quad_tailsitter} (100%) rename ROMFS/px4fmu_common/init.d/{INACTIVE_13004_quad+_tailsitter => 13004_quad+_tailsitter} (100%) delete mode 100644 ROMFS/px4fmu_common/init.d/INACTIVE_13005_vtol_AAERT_quad diff --git a/ROMFS/px4fmu_common/init.d/INACTIVE_13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol similarity index 100% rename from ROMFS/px4fmu_common/init.d/INACTIVE_13001_caipirinha_vtol rename to ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol diff --git a/ROMFS/px4fmu_common/init.d/INACTIVE_13002_firefly6 b/ROMFS/px4fmu_common/init.d/13002_firefly6 similarity index 100% rename from ROMFS/px4fmu_common/init.d/INACTIVE_13002_firefly6 rename to ROMFS/px4fmu_common/init.d/13002_firefly6 diff --git a/ROMFS/px4fmu_common/init.d/INACTIVE_13003_quad_tailsitter b/ROMFS/px4fmu_common/init.d/13003_quad_tailsitter similarity index 100% rename from ROMFS/px4fmu_common/init.d/INACTIVE_13003_quad_tailsitter rename to ROMFS/px4fmu_common/init.d/13003_quad_tailsitter diff --git a/ROMFS/px4fmu_common/init.d/INACTIVE_13004_quad+_tailsitter b/ROMFS/px4fmu_common/init.d/13004_quad+_tailsitter similarity index 100% rename from ROMFS/px4fmu_common/init.d/INACTIVE_13004_quad+_tailsitter rename to ROMFS/px4fmu_common/init.d/13004_quad+_tailsitter diff --git a/ROMFS/px4fmu_common/init.d/INACTIVE_13005_vtol_AAERT_quad b/ROMFS/px4fmu_common/init.d/INACTIVE_13005_vtol_AAERT_quad deleted file mode 100644 index 4b8191f557..0000000000 --- a/ROMFS/px4fmu_common/init.d/INACTIVE_13005_vtol_AAERT_quad +++ /dev/null @@ -1,50 +0,0 @@ -#!nsh -# -# @name Generic AAERT tailplane airframe with Quad VTOL. -# -# @type Standard VTOL -# -# @maintainer Simon Wilks -# - -sh /etc/init.d/rc.vtol_defaults - -if [ $AUTOCNF == yes ] -then - param set VT_TYPE 2 - param set VT_MOT_COUNT 4 - param set VT_TRANS_THR 0.75 - - param set MC_ROLL_P 7.0 - param set MC_ROLLRATE_P 0.15 - param set MC_ROLLRATE_I 0.002 - param set MC_ROLLRATE_D 0.003 - param set MC_ROLLRATE_FF 0.0 - param set MC_PITCH_P 7.0 - param set MC_PITCHRATE_P 0.12 - param set MC_PITCHRATE_I 0.002 - param set MC_PITCHRATE_D 0.003 - param set MC_PITCHRATE_FF 0.0 - param set MC_YAW_P 2.8 - param set MC_YAW_FF 0.5 - param set MC_YAWRATE_P 0.22 - param set MC_YAWRATE_I 0.02 - param set MC_YAWRATE_D 0.0 - param set MC_YAWRATE_FF 0.0 -fi - -set MIXER vtol_quad_x -set PWM_OUT 12345678 - -set MIXER_AUX vtol_AAERT -set PWM_AUX_RATE 50 -set PWM_AUX_OUT 1234 -set PWM_AUX_DISARMED 1000 -set PWM_AUX_MIN 1000 -set PWM_AUX_MAX 2000 - -set MAV_TYPE 22 - -param set VT_MOT_COUNT 4 -param set VT_IDLE_PWM_MC 1080 -param set VT_TYPE 2