Skip to content

Q
qgroundcontrol
Unverified Commit 91d558cf authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5915 from lvale/FlightMode 

Renaming new flight mode to SmartRTL
parents 971aa24d 1141b141
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.3.5.xml
View file @ 91d558cf
...@@ -1336,7 +1336,7 @@ ...@@ -1336,7 +1336,7 @@
<value code="18">Throw</value> <value code="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </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"> <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">
......
src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.3.7.xml
View file @ 91d558cf
...@@ -1094,7 +1094,7 @@ ...@@ -1094,7 +1094,7 @@
<value code="18">Throw</value> <value code="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </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"> <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">
......
src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.3.8.xml
View file @ 91d558cf
...@@ -1013,7 +1013,7 @@ ...@@ -1013,7 +1013,7 @@
<value code="18">Throw</value> <value code="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </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"> <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">
......
src/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.3.2.xml
View file @ 91d558cf
...@@ -1013,7 +1013,7 @@ ...@@ -1013,7 +1013,7 @@
<value code="18">Throw</value> <value code="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 2" name="ArduCopter:FLTMODE2" documentation="Flight mode when Channel 5 pwm is &gt;1230, &lt;= 1360" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 3" name="ArduCopter:FLTMODE3" documentation="Flight mode when Channel 5 pwm is &gt;1360, &lt;= 1490" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 4" name="ArduCopter:FLTMODE4" documentation="Flight mode when Channel 5 pwm is &gt;1490, &lt;= 1620" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 5" name="ArduCopter:FLTMODE5" documentation="Flight mode when Channel 5 pwm is &gt;1620, &lt;= 1749" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </param>
<param humanName="Flight Mode 6" name="ArduCopter:FLTMODE6" documentation="Flight mode when Channel 5 pwm is &gt;=1750" user="Standard"> <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="18">Throw</value>
<value code="19">Avoid_ADSB</value> <value code="19">Avoid_ADSB</value>
<value code="20">Guided_NoGPS</value> <value code="20">Guided_NoGPS</value>
<value code="21">SafeRTL</value> <value code="21">SmartRTL</value>
</values> </values>
</param> </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"> <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">
......
src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
View file @ 91d558cf
...@@ -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(THROW, "Throw");
enumToString.insert(AVOID_ADSB,"Avoid ADSB"); enumToString.insert(AVOID_ADSB,"Avoid ADSB");
enumToString.insert(GUIDED_NOGPS,"Guided No GPS"); enumToString.insert(GUIDED_NOGPS,"Guided No GPS");
enumToString.insert(SAFE_RTL,"Safe RTL"); enumToString.insert(SAFE_RTL,"Smart RTL");
setEnumToStringMapping(enumToString); setEnumToStringMapping(enumToString);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment