zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #5915 from lvale/FlightMode 

Renaming new flight mode to SmartRTL
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
971aa24d2b 1141b141dd
commit
91d558cfd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.3.5.xml
  2. 12
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.3.7.xml
  3. 12
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.3.8.xml
  4. 12
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.3.2.xml
  5. 2
      src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc

12
src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.3.5.xml
Unescape View File

@ -1336,7 +1336,7 @@ @@ -1336,7 +1336,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard">
@ -1359,7 +1359,7 @@ @@ -1359,7 +1359,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard">
@ -1382,7 +1382,7 @@ @@ -1382,7 +1382,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard">
@ -1405,7 +1405,7 @@ @@ -1405,7 +1405,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard">
@ -1428,7 +1428,7 @@ @@ -1428,7 +1428,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard">
@ -1451,7 +1451,7 @@ @@ -1451,7 +1451,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Simple mode bitmask" name="ArduCopter:SIMPLE" documentation="Bitmask which holds which flight modes use simple heading mode (eg bit 0 = 1 means Flight Mode 0 uses simple mode)" user="Advanced">

12
src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.3.7.xml
Unescape View File

@ -1094,7 +1094,7 @@ @@ -1094,7 +1094,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard">
@ -1117,7 +1117,7 @@ @@ -1117,7 +1117,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard">
@ -1140,7 +1140,7 @@ @@ -1140,7 +1140,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard">
@ -1163,7 +1163,7 @@ @@ -1163,7 +1163,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard">
@ -1186,7 +1186,7 @@ @@ -1186,7 +1186,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard">
@ -1209,7 +1209,7 @@ @@ -1209,7 +1209,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Simple mode bitmask" name="ArduCopter:SIMPLE" documentation="Bitmask which holds which flight modes use simple heading mode (eg bit 0 = 1 means Flight Mode 0 uses simple mode)" user="Advanced">

12
src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.3.8.xml
Unescape View File

@ -1013,7 +1013,7 @@ @@ -1013,7 +1013,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard">
@ -1036,7 +1036,7 @@ @@ -1036,7 +1036,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard">
@ -1059,7 +1059,7 @@ @@ -1059,7 +1059,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard">
@ -1082,7 +1082,7 @@ @@ -1082,7 +1082,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard">
@ -1105,7 +1105,7 @@ @@ -1105,7 +1105,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard">
@ -1128,7 +1128,7 @@ @@ -1128,7 +1128,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Simple mode bitmask" name="ArduCopter:SIMPLE" documentation="Bitmask which holds which flight modes use simple heading mode (eg bit 0 = 1 means Flight Mode 0 uses simple mode)" user="Advanced">

12
src/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.3.2.xml
Unescape View File

@ -1013,7 +1013,7 @@ @@ -1013,7 +1013,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard">
@ -1036,7 +1036,7 @@ @@ -1036,7 +1036,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard">
@ -1059,7 +1059,7 @@ @@ -1059,7 +1059,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard">
@ -1082,7 +1082,7 @@ @@ -1082,7 +1082,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard">
@ -1105,7 +1105,7 @@ @@ -1105,7 +1105,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard">
@ -1128,7 +1128,7 @@ @@ -1128,7 +1128,7 @@
<value code="18">Throw</value>
<value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value>
<value code="21">SmartRTL</value>
</values>
</param>
<param humanName="Simple mode bitmask" name="ArduCopter:SIMPLE" documentation="Bitmask which holds which flight modes use simple heading mode (eg bit 0 = 1 means Flight Mode 0 uses simple mode)" user="Advanced">

2
src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
Unescape View File

@ -41,7 +41,7 @@ APMCopterMode::APMCopterMode(uint32_t mode, bool settable) : @@ -41,7 +41,7 @@ APMCopterMode::APMCopterMode(uint32_t mode, bool settable) :
enumToString.insert(THROW, "Throw");
enumToString.insert(AVOID_ADSB,"Avoid ADSB");
enumToString.insert(GUIDED_NOGPS,"Guided No GPS");
enumToString.insert(SAFE_RTL,"Safe RTL");
enumToString.insert(SAFE_RTL,"Smart RTL");
setEnumToStringMapping(enumToString);

Write Preview
Loading…
Cancel
Save