diff --git a/src/FactSystem/FactMetaData.cc b/src/FactSystem/FactMetaData.cc index 878c7d026e108fd59007e64b715d98be56da4c3e..422d4f0a479acc823bb58ec0d8812c2930568f9c 100644 --- a/src/FactSystem/FactMetaData.cc +++ b/src/FactSystem/FactMetaData.cc @@ -23,8 +23,8 @@ // Built in translations for all Facts const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[] = { - { "centi-degrees", "degrees", FactMetaData::_centiDegreesToDegrees, FactMetaData::_degreesToCentiDegrees }, - { "radians", "degrees", FactMetaData::_radiansToDegrees, FactMetaData::_degreesToRadians }, + { "centi-degrees", "deg", FactMetaData::_centiDegreesToDegrees, FactMetaData::_degreesToCentiDegrees }, + { "radians", "deg", FactMetaData::_radiansToDegrees, FactMetaData::_degreesToRadians }, { "norm", "%", FactMetaData::_normToPercent, FactMetaData::_percentToNorm }, }; diff --git a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json index fecc10ffb2150999f5db719b201a2b256ec278b0..d67684eb9a0bc1fac644ae1b58e8a8bb61d36048 100644 --- a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json +++ b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json @@ -18,7 +18,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 25.0, "decimalPlaces": 2 } @@ -42,7 +42,7 @@ "category": "VTOL", "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 0.0, "decimalPlaces": 2 } diff --git a/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json b/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json index c93a456cfc1ce6248ef95c8acfce605045462640..788bc885dc2aace0a5326eacdae22ea220e42524 100644 --- a/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json +++ b/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json @@ -11,13 +11,13 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 0, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -32,13 +32,13 @@ "category": "Loiter", "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 100, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -58,13 +58,13 @@ }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 100, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -79,19 +79,19 @@ "category": "Loiter", "param1": { "label": "Seconds:", - "units": "seconds", + "units": "secs", "default": 30, "decimalPlaces": 1 }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 100, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -106,7 +106,7 @@ "category": "Basic", "param1": { "label": "Abort Alt:", - "units": "meters", + "units": "m", "default": 25, "decimalPlaces": 0 }, @@ -118,7 +118,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 0, "decimalPlaces": 1 } @@ -145,7 +145,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 25, "decimalPlaces": 0 } @@ -159,7 +159,7 @@ "param1": { "label": "Distance:", "default": 25, - "units": "meters", + "units": "m", "decimalPlaces": 1 } } diff --git a/src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json b/src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json index e779f7e3e3d67a103c23f9e616df2f0b9fb9a3c1..a3f7887d1d4d1623ceee2fb9a118cfde8ee0961a 100644 --- a/src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json +++ b/src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json @@ -12,7 +12,7 @@ "category": "Basic", "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 25.0, "decimalPlaces": 2 } @@ -41,7 +41,7 @@ }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 10.0, "decimalPlaces": 2 } @@ -56,7 +56,7 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 30, "decimalPlaces": 0 } diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json index c93a456cfc1ce6248ef95c8acfce605045462640..788bc885dc2aace0a5326eacdae22ea220e42524 100644 --- a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json +++ b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json @@ -11,13 +11,13 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 0, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -32,13 +32,13 @@ "category": "Loiter", "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 100, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -58,13 +58,13 @@ }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 100, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -79,19 +79,19 @@ "category": "Loiter", "param1": { "label": "Seconds:", - "units": "seconds", + "units": "secs", "default": 30, "decimalPlaces": 1 }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 100, "decimalPlaces": 0 }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 50, "decimalPlaces": 0 } @@ -106,7 +106,7 @@ "category": "Basic", "param1": { "label": "Abort Alt:", - "units": "meters", + "units": "m", "default": 25, "decimalPlaces": 0 }, @@ -118,7 +118,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 0, "decimalPlaces": 1 } @@ -145,7 +145,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 25, "decimalPlaces": 0 } @@ -159,7 +159,7 @@ "param1": { "label": "Distance:", "default": 25, - "units": "meters", + "units": "m", "decimalPlaces": 1 } } diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json b/src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json index b4022f7e1078ac887314afdaff16df8061f8da4b..26a8362387598c3ba75288cdae70e5d59c6d53bd 100644 --- a/src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json +++ b/src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json @@ -35,7 +35,7 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 30, "decimalPlaces": 0 } diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json index 17144d8f50dfb556a747bdcc63272abab774196b..c1282def02bab97a8bf97a7799ef9a1f6ea7560c 100644 --- a/src/MissionManager/MavCmdInfoCommon.json +++ b/src/MissionManager/MavCmdInfoCommon.json @@ -32,7 +32,7 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 0, "decimalPlaces": 0 } @@ -47,7 +47,7 @@ "category": "Loiter", "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 10.0, "decimalPlaces": 2 } @@ -67,7 +67,7 @@ }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 10.0, "decimalPlaces": 2 } @@ -82,13 +82,13 @@ "category": "Loiter", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 30, "decimalPlaces": 0 }, "param3": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 10.0, "decimalPlaces": 2 } @@ -111,7 +111,7 @@ "category": "Basic", "param1": { "label": "Abort Alt:", - "units": "meters", + "units": "m", "default": 25.0, "decimalPlaces": 3 }, @@ -123,7 +123,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 0.0, "decimalPlaces": 2 } @@ -169,7 +169,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 55, "decimalPlaces": 2 } @@ -191,7 +191,7 @@ }, "param2": { "label": "Radius:", - "units": "meters", + "units": "m", "default": 10.0, "decimalPlaces": 2 } @@ -264,7 +264,7 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 0, "decimalPlaces": 0 } @@ -301,7 +301,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 0.0, "decimalPlaces": 2 } @@ -326,7 +326,7 @@ "category": "Basic", "param1": { "label": "Hold:", - "units": "seconds", + "units": "secs", "default": 30, "decimalPlaces": 0 } @@ -345,7 +345,7 @@ }, "param7": { "label": "Altitude:", - "units": "meters", + "units": "m", "default": 55, "decimalPlaces": 2 } @@ -358,7 +358,7 @@ "category": "Conditionals", "param1": { "label": "Distance:", - "units": "meters", + "units": "m", "default": 0, "decimalPlaces": 2 } @@ -488,7 +488,7 @@ "param3": { "label": "Time:", "default": 10, - "units": "seconds", + "units": "secs", "decimalPlaces": 0 } }, @@ -533,7 +533,7 @@ "param4": { "label": "Time:", "default": 10, - "units": "seconds", + "units": "secs", "decimalPlaces": 0 } }, @@ -734,7 +734,7 @@ "param1": { "label": "Distance:", "default": 25, - "units": "meters", + "units": "m", "decimalPlaces": 2 } }, @@ -818,25 +818,25 @@ "param1": { "label": "Timeout:", "default": 0, - "units": "seconds", + "units": "secs", "decimalPlaces": 0 }, "param2": { "label": "Min Alt:", "default": 25, - "units": "m(AMSL)", + "units": "m", "decimalPlaces": 2 }, "param3": { "label": "Max Alt:", - "units": "m(AMSL)", + "units": "m", "default": 100, "decimalPlaces": 2 }, "param4": { "label": "H Limit:", "default": 25, - "units": "m(AMSL)", + "units": "m", "decimalPlaces": 2 } }, diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index 9b15e96bcb1d41b005aff7b6d3f402ff69065f9a..9e22704fee2f186ae992b3310bf480e28a80e0d9 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -191,7 +191,7 @@ void SimpleMissionItem::_setupMetaData(void) if (!_altitudeMetaData) { _altitudeMetaData = new FactMetaData(FactMetaData::valueTypeDouble); - _altitudeMetaData->setRawUnits("meters"); + _altitudeMetaData->setRawUnits("m"); _altitudeMetaData->setDecimalPlaces(2); _altitudeMetaData->setAppSettingsTranslators();