diff --git a/src/AutoPilotPlugins/APM/APMHeliComponent.qml b/src/AutoPilotPlugins/APM/APMHeliComponent.qml index 6d1e5ac936f61f999701ecdf6d8004228417d966..eb48110763da98709d1c5e503ecdf553d6cad352 100644 --- a/src/AutoPilotPlugins/APM/APMHeliComponent.qml +++ b/src/AutoPilotPlugins/APM/APMHeliComponent.qml @@ -65,10 +65,10 @@ SetupPage { property Fact _hRscGovTcgain: controller.getParameterFact(-1, "H_RSC_GOV_TCGAIN") property Fact _hRscGovRange: controller.getParameterFact(-1, "H_RSC_GOV_RANGE") - property Fact _imStabCol1: controller.getParameterFact(-1, "IM_STAB_COL_1") - property Fact _imStabCol2: controller.getParameterFact(-1, "IM_STAB_COL_2") - property Fact _imStabCol3: controller.getParameterFact(-1, "IM_STAB_COL_3") - property Fact _imStabCol4: controller.getParameterFact(-1, "IM_STAB_COL_4") + property Fact _imStbCol1: controller.getParameterFact(-1, "IM_STB_COL_1") + property Fact _imStbCol2: controller.getParameterFact(-1, "IM_STB_COL_2") + property Fact _imStbCol3: controller.getParameterFact(-1, "IM_STB_COL_3") + property Fact _imStbCol4: controller.getParameterFact(-1, "IM_STB_COL_4") property Fact _hTailType: controller.getParameterFact(-1, "H_TAIL_TYPE") property Fact _hTailSpeed: controller.getParameterFact(-1, "H_TAIL_SPEED") property Fact _hGyrGain: controller.getParameterFact(-1, "H_GYR_GAIN") @@ -400,17 +400,17 @@ SetupPage { QGCLabel { text: qsTr("* Stabilize Collective Curve *") } QGCLabel { text: qsTr("") } - QGCLabel { text: _imStabCol1.shortDescription } - FactTextField { fact: _imStabCol1 } + QGCLabel { text: _imStbCol1.shortDescription } + FactTextField { fact: _imStbCol1 } - QGCLabel { text: _imStabCol2.shortDescription } - FactTextField { fact: _imStabCol2 } + QGCLabel { text: _imStbCol2.shortDescription } + FactTextField { fact: _imStbCol2 } - QGCLabel { text: _imStabCol3.shortDescription } - FactTextField { fact: _imStabCol3 } + QGCLabel { text: _imStbCol3.shortDescription } + FactTextField { fact: _imStbCol3 } - QGCLabel { text: _imStabCol4.shortDescription } - FactTextField { fact: _imStabCol4 } + QGCLabel { text: _imStbCol4.shortDescription } + FactTextField { fact: _imStbCol4 } QGCLabel { text: qsTr("* Tail & Gyros *") } QGCLabel { text: qsTr("") } diff --git a/src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.0.xml b/src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.0.xml index 6b7216534d386e5ce994790d24649d24c8ce7e65..e5a61af8d314fcd273cd6c728a2c876bff10ff98 100644 --- a/src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.0.xml +++ b/src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.0.xml @@ -5028,12 +5028,13 @@ - + Servo only Servo with ExtGyro DirectDrive VarPitch -DirectDrive FixedPitch +DirectDrive FixedPitch CW +DirectDrive FixedPitch CCW @@ -5042,7 +5043,7 @@ PWM PWM in microseconds - + -10 10 0.1 @@ -5052,62 +5053,18 @@ Flybar - -0 1000 + +0 100 1 -PWM -PWM in microseconds +% +percent - + 0 1000 1 PWM PWM in microseconds - - -H3 Generic -H1 non-CPPM -H3_140 -H3_120 -H4_90 -H4_45 - - - - -Normal -Reversed - - - - -Disabled -Enabled - - - - -Disabled -Enabled - - - --180 180 -deg -degrees - - --180 180 -deg -degrees - - --30 30 -1 -deg -degrees - Longitudinal @@ -5125,25 +5082,25 @@ -10 10 0.1 - + 1000 2000 1 PWM PWM in microseconds - + 1000 2000 1 PWM PWM in microseconds - + 1000 2000 1 PWM PWM in microseconds - + H3 Generic H1 non-CPPM @@ -5153,41 +5110,46 @@ H4_45 - + Normal Reversed - + Disabled Enabled - + Disabled Enabled - + -180 180 deg degrees - + -180 180 deg degrees - + +-180 180 +deg +degrees + + -30 30 1 deg degrees - + H3 Generic H1 non-CPPM @@ -5197,53 +5159,58 @@ H4_45 - + Normal Reversed - + Disabled Enabled - + Disabled Enabled - + -180 180 deg degrees - + -180 180 deg degrees - + +-180 180 +deg +degrees + + -30 30 1 deg degrees - + 1000 2000 1 PWM PWM in microseconds - + 1000 2000 1 PWM PWM in microseconds - + 1000 2000 1 PWM @@ -5258,11 +5225,9 @@ Min collective - -0 18000 + +0 4500 100 -cdeg -centidegrees 0 10 @@ -5284,7 +5249,7 @@ Governor - + 0 60 s seconds @@ -5300,59 +5265,59 @@ % percent - + 0 50 1 % percent - + 0 500 10 - + 0 100 1 % percent - + 0 100 1 % percent - + 0 100 1 % percent - + 0 100 1 % percent - + 0 100 1 % percent - + 800 3500 10 RPM Revolutions Per Minute - + 0 50 1 % percent - + 0 150 1 % @@ -5372,29 +5337,29 @@ - -0 500 + +0 50 1 -d% -decipercent +% +percent - -0 500 + +0 50 1 -d% -decipercent +% +percent - -500 1000 + +50 100 1 -d% -decipercent +% +percent - -500 1000 + +50 100 1 -d% -decipercent +% +percent