From 7bba5a7287f2c27667d422f5c197926919485ef3 Mon Sep 17 00:00:00 2001 From: RomanBapst Date: Thu, 27 Jun 2019 16:26:06 +0200 Subject: [PATCH] vtol_configs: replaced VT_MOT_COUNT with VT_MOT_ID Signed-off-by: RomanBapst --- .../px4fmu_common/init.d/airframes/13000_generic_vtol_standard | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol | 2 +- ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 | 2 +- ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter | 2 +- ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter | 2 +- ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13010_claire | 2 +- ROMFS/px4fmu_common/init.d/airframes/13012_convergence | 2 +- ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad | 3 ++- ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark | 2 +- ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo | 3 ++- 15 files changed, 23 insertions(+), 15 deletions(-) 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 52e1f5d740..e249af8d0c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard +++ b/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard @@ -26,7 +26,8 @@ then param set PWM_RATE 400 param set VT_TYPE 2 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 + param set VT_FW_MOT_OFFID 1234 fi set MAV_TYPE 22 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol index ec63ac2151..f6d8ff30f2 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol +++ b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol @@ -35,7 +35,7 @@ then param set VT_IDLE_PWM_MC 1080 param set VT_ELEV_MC_LOCK 0 - param set VT_MOT_COUNT 2 + param set VT_MOT_ID 12 param set VT_TYPE 0 fi diff --git a/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 index 7f2acf3156..4e31e097db 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 +++ b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 @@ -42,7 +42,7 @@ then param set VT_FW_MOT_OFFID 34 param set VT_IDLE_PWM_MC 1080 - param set VT_MOT_COUNT 6 + param set VT_MOT_COUNT 123456 param set VT_TILT_MC 0.08 param set VT_TILT_TRANS 0.5 param set VT_TILT_FW 0.9 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter index dd91d353b5..47268f3104 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter @@ -15,7 +15,7 @@ then param set PWM_MAX 2000 param set PWM_RATE 400 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 param set VT_IDLE_PWM_MC 1080 param set VT_TYPE 0 param set VT_ELEV_MC_LOCK 1 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter index 3f3bab06b7..7c52dc0b91 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter @@ -26,7 +26,7 @@ then param set PWM_MAX 2000 param set PWM_RATE 400 - param set VT_MOT_COUNT 4 + param set VT_MOT_COUNT 1234 param set VT_IDLE_PWM_MC 1080 param set VT_TYPE 0 param set VT_ELEV_MC_LOCK 1 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 ca4288b76d..8dfa6c85c3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad @@ -58,7 +58,8 @@ then param set VT_ARSP_BLEND 6 param set VT_ARSP_TRANS 12 param set VT_F_TRANS_THR 0.75 - param set VT_MOT_COUNT 4 + param set VT_MOT_COUNT 1234 + param set VT_FW_MOT_OFFID 1234 param set VT_IDLE_PWM_MC 1080 param set VT_TYPE 2 fi 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 209290557d..55adc232cb 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta +++ b/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta @@ -45,7 +45,8 @@ then param set PWM_AUX_DIS3 950 param set PWM_RATE 400 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 + param set VT_FW_MOT_OFFID 1234 param set VT_F_TRANS_THR 0.75 param set VT_IDLE_PWM_MC 1080 param set VT_TYPE 2 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 647d6aeb57..f527bc3bc9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad @@ -35,7 +35,8 @@ then param set PWM_RATE 400 param set VT_F_TRANS_THR 0.75 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 + param set VT_FW_MOT_OFFID 1234 param set VT_IDLE_PWM_MC 1080 param set VT_TYPE 2 fi diff --git a/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger index 4a8b0c93b9..cc9ee8537a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger +++ b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger @@ -53,7 +53,8 @@ then param set VT_B_TRANS_DUR 4 param set VT_F_TRANS_THR 0.75 param set VT_IDLE_PWM_MC 1080 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 + param set VT_FW_MOT_OFFID 1234 param set VT_TYPE 2 fi 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 5d3ebcf5bf..3a0f11fc24 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger +++ b/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger @@ -72,7 +72,8 @@ then param set VT_B_TRANS_DUR 4 param set VT_F_TRANS_THR 0.6 param set VT_IDLE_PWM_MC 1180 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 + param set VT_FW_MOT_OFFID 1234 param set VT_TRANS_MIN_TM 5 param set VT_TRANS_TIMEOUT 30 param set VT_TYPE 2 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13010_claire b/ROMFS/px4fmu_common/init.d/airframes/13010_claire index 022bf58853..1b6c167719 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13010_claire +++ b/ROMFS/px4fmu_common/init.d/airframes/13010_claire @@ -22,7 +22,7 @@ then param set PWM_MAX 2000 param set PWM_RATE 400 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 param set VT_FW_MOT_OFFID 13 param set VT_IDLE_PWM_MC 1080 param set VT_TILT_FW 0.9 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13012_convergence b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence index d7410eda0d..0976f0b03d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13012_convergence +++ b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence @@ -69,7 +69,7 @@ then param set VT_FW_MOT_OFFID 3 param set VT_FW_PERM_STAB 0 param set VT_IDLE_PWM_MC 1200 - param set VT_MOT_COUNT 3 + param set VT_MOT_ID 123 param set VT_TILT_FW 1 param set VT_TILT_MC 0 param set VT_TILT_TRANS 0.45 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad index 3671d55eaa..75a348e72e 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad +++ b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad @@ -133,7 +133,8 @@ then param set SER_TEL2_BAUD 57600 param set VT_TYPE 2 - param set VT_MOT_COUNT 4 + param set VT_MOT_ID 1234 + param set VT_FW_MOT_OFFID 1234 param set VT_F_TRANS_THR 1 param set VT_DWN_PITCH_MAX 8 param set VT_FW_QC_P 55 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark index 5cb1b4abb2..9159e857bc 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark +++ b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark @@ -67,7 +67,7 @@ then param set VT_F_TRANS_THR 0.85 param set VT_F_TR_OL_TM 7 param set VT_IDLE_PWM_MC 1000 - param set VT_MOT_COUNT 8 + param set VT_MOT_ID 5678 param set VT_PSHER_RMP_DT 2 param set VT_TRANS_MIN_TM 6 param set VT_TYPE 2 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 7da4a205c8..8cc0fb8d88 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo +++ b/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo @@ -30,7 +30,8 @@ then param set PWM_RATE 400 param set VT_TYPE 2 - param set VT_MOT_COUNT 8 + param set VT_MOT_ID 12345678 + param set VT_FW_MOT_OFFID 12345678 fi set MAV_TYPE 22