Skip to content

Q
qgroundcontrol
Commit 637774f7 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Shorter units naming to save real estate

parent bcb0ee0b
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
src/FactSystem/FactMetaData.cc
View file @ 637774f7
......@@ -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 },
};
......
src/FirmwarePlugin/APM/MavCmdInfoCommon.json
View file @ 637774f7
......@@ -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
}
......
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
View file @ 637774f7
......@@ -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
}
}
......
src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json
View file @ 637774f7
......@@ -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
}
......
src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
View file @ 637774f7
......@@ -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
}
}
......
src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json
View file @ 637774f7
......@@ -35,7 +35,7 @@
"category": "Basic",
"param1": {
"label": "Hold:",
"units": "seconds",
"units": "secs",
"default": 30,
"decimalPlaces": 0
}
......
src/MissionManager/MavCmdInfoCommon.json
View file @ 637774f7
......@@ -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
}
},
......
src/MissionManager/SimpleMissionItem.cc
View file @ 637774f7
......@@ -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();
......
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