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

Shorter units naming to save real estate

QGC4.4
Don Gagne 9 years ago
parent
bcb0ee0bc1
commit
637774f73b
8 changed files with 56 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/FactSystem/FactMetaData.cc
  2. 4
      src/FirmwarePlugin/APM/MavCmdInfoCommon.json
  3. 26
      src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
  4. 6
      src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json
  5. 26
      src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
  6. 2
      src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json
  7. 42
      src/MissionManager/MavCmdInfoCommon.json
  8. 2
      src/MissionManager/SimpleMissionItem.cc

4
src/FactSystem/FactMetaData.cc
Unescape View File

@ -23,8 +23,8 @@
// Built in translations for all Facts // Built in translations for all Facts
const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[] = { const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[] = {
{ "centi-degrees", "degrees", FactMetaData::_centiDegreesToDegrees, FactMetaData::_degreesToCentiDegrees }, { "centi-degrees", "deg", FactMetaData::_centiDegreesToDegrees, FactMetaData::_degreesToCentiDegrees },
{ "radians", "degrees", FactMetaData::_radiansToDegrees, FactMetaData::_degreesToRadians }, { "radians", "deg", FactMetaData::_radiansToDegrees, FactMetaData::_degreesToRadians },
{ "norm", "%", FactMetaData::_normToPercent, FactMetaData::_percentToNorm }, { "norm", "%", FactMetaData::_normToPercent, FactMetaData::_percentToNorm },
}; };

4
src/FirmwarePlugin/APM/MavCmdInfoCommon.json
Unescape View File

@ -18,7 +18,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 25.0, "default": 25.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -42,7 +42,7 @@
"category": "VTOL", "category": "VTOL",
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 0.0, "default": 0.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }

26
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
Unescape View File

@ -11,13 +11,13 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -32,13 +32,13 @@
"category": "Loiter", "category": "Loiter",
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -58,13 +58,13 @@
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -79,19 +79,19 @@
"category": "Loiter", "category": "Loiter",
"param1": { "param1": {
"label": "Seconds:", "label": "Seconds:",
"units": "seconds", "units": "secs",
"default": 30, "default": 30,
"decimalPlaces": 1 "decimalPlaces": 1
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -106,7 +106,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Abort Alt:", "label": "Abort Alt:",
"units": "meters", "units": "m",
"default": 25, "default": 25,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
@ -118,7 +118,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 0, "default": 0,
"decimalPlaces": 1 "decimalPlaces": 1
} }
@ -145,7 +145,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 25, "default": 25,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -159,7 +159,7 @@
"param1": { "param1": {
"label": "Distance:", "label": "Distance:",
"default": 25, "default": 25,
"units": "meters", "units": "m",
"decimalPlaces": 1 "decimalPlaces": 1
} }
} }

6
src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json
Unescape View File

@ -12,7 +12,7 @@
"category": "Basic", "category": "Basic",
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 25.0, "default": 25.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -41,7 +41,7 @@
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 10.0, "default": 10.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -56,7 +56,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 30, "default": 30,
"decimalPlaces": 0 "decimalPlaces": 0
} }

26
src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
Unescape View File

@ -11,13 +11,13 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -32,13 +32,13 @@
"category": "Loiter", "category": "Loiter",
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -58,13 +58,13 @@
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -79,19 +79,19 @@
"category": "Loiter", "category": "Loiter",
"param1": { "param1": {
"label": "Seconds:", "label": "Seconds:",
"units": "seconds", "units": "secs",
"default": 30, "default": 30,
"decimalPlaces": 1 "decimalPlaces": 1
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 50, "default": 50,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -106,7 +106,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Abort Alt:", "label": "Abort Alt:",
"units": "meters", "units": "m",
"default": 25, "default": 25,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
@ -118,7 +118,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 0, "default": 0,
"decimalPlaces": 1 "decimalPlaces": 1
} }
@ -145,7 +145,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 25, "default": 25,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -159,7 +159,7 @@
"param1": { "param1": {
"label": "Distance:", "label": "Distance:",
"default": 25, "default": 25,
"units": "meters", "units": "m",
"decimalPlaces": 1 "decimalPlaces": 1
} }
} }

2
src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json
Unescape View File

@ -35,7 +35,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 30, "default": 30,
"decimalPlaces": 0 "decimalPlaces": 0
} }

42
src/MissionManager/MavCmdInfoCommon.json
Unescape View File

@ -32,7 +32,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -47,7 +47,7 @@
"category": "Loiter", "category": "Loiter",
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 10.0, "default": 10.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -67,7 +67,7 @@
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 10.0, "default": 10.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -82,13 +82,13 @@
"category": "Loiter", "category": "Loiter",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 30, "default": 30,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param3": { "param3": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 10.0, "default": 10.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -111,7 +111,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Abort Alt:", "label": "Abort Alt:",
"units": "meters", "units": "m",
"default": 25.0, "default": 25.0,
"decimalPlaces": 3 "decimalPlaces": 3
}, },
@ -123,7 +123,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 0.0, "default": 0.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -169,7 +169,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 55, "default": 55,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -191,7 +191,7 @@
}, },
"param2": { "param2": {
"label": "Radius:", "label": "Radius:",
"units": "meters", "units": "m",
"default": 10.0, "default": 10.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -264,7 +264,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -301,7 +301,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 0.0, "default": 0.0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -326,7 +326,7 @@
"category": "Basic", "category": "Basic",
"param1": { "param1": {
"label": "Hold:", "label": "Hold:",
"units": "seconds", "units": "secs",
"default": 30, "default": 30,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -345,7 +345,7 @@
}, },
"param7": { "param7": {
"label": "Altitude:", "label": "Altitude:",
"units": "meters", "units": "m",
"default": 55, "default": 55,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -358,7 +358,7 @@
"category": "Conditionals", "category": "Conditionals",
"param1": { "param1": {
"label": "Distance:", "label": "Distance:",
"units": "meters", "units": "m",
"default": 0, "default": 0,
"decimalPlaces": 2 "decimalPlaces": 2
} }
@ -488,7 +488,7 @@
"param3": { "param3": {
"label": "Time:", "label": "Time:",
"default": 10, "default": 10,
"units": "seconds", "units": "secs",
"decimalPlaces": 0 "decimalPlaces": 0
} }
}, },
@ -533,7 +533,7 @@
"param4": { "param4": {
"label": "Time:", "label": "Time:",
"default": 10, "default": 10,
"units": "seconds", "units": "secs",
"decimalPlaces": 0 "decimalPlaces": 0
} }
}, },
@ -734,7 +734,7 @@
"param1": { "param1": {
"label": "Distance:", "label": "Distance:",
"default": 25, "default": 25,
"units": "meters", "units": "m",
"decimalPlaces": 2 "decimalPlaces": 2
} }
}, },
@ -818,25 +818,25 @@
"param1": { "param1": {
"label": "Timeout:", "label": "Timeout:",
"default": 0, "default": 0,
"units": "seconds", "units": "secs",
"decimalPlaces": 0 "decimalPlaces": 0
}, },
"param2": { "param2": {
"label": "Min Alt:", "label": "Min Alt:",
"default": 25, "default": 25,
"units": "m(AMSL)", "units": "m",
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param3": { "param3": {
"label": "Max Alt:", "label": "Max Alt:",
"units": "m(AMSL)", "units": "m",
"default": 100, "default": 100,
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "H Limit:", "label": "H Limit:",
"default": 25, "default": 25,
"units": "m(AMSL)", "units": "m",
"decimalPlaces": 2 "decimalPlaces": 2
} }
}, },

2
src/MissionManager/SimpleMissionItem.cc
Unescape View File

@ -191,7 +191,7 @@ void SimpleMissionItem::_setupMetaData(void)
if (!_altitudeMetaData) { if (!_altitudeMetaData) {
_altitudeMetaData = new FactMetaData(FactMetaData::valueTypeDouble); _altitudeMetaData = new FactMetaData(FactMetaData::valueTypeDouble);
_altitudeMetaData->setRawUnits("meters"); _altitudeMetaData->setRawUnits("m");
_altitudeMetaData->setDecimalPlaces(2); _altitudeMetaData->setDecimalPlaces(2);
_altitudeMetaData->setAppSettingsTranslators(); _altitudeMetaData->setAppSettingsTranslators();

Write Preview
Loading…
Cancel
Save