Merge pull request #3272 from mavlink/px4param

PX4 Param System Update

src/AutoPilotPlugins/PX4/SafetyComponent.qml

@@ -117,7 +117,7 @@ QGCView {
                                 QGCLabel {
                                     anchors.baseline:   batLowLevelField.baseline
                                     width:              _middleRowWidth
-                                    text:               qsTr("Battery Low Level:")
+                                    text:               qsTr("Battery Warn Level:")
                                 }
                                 FactTextField {
                                     id:                 batLowLevelField
@@ -126,6 +126,19 @@ QGCView {
                                     width:              _editFieldWidth
                                 }
                             }
+                            Row {
+                                QGCLabel {
+                                    anchors.baseline:   batLowLevelField.baseline
+                                    width:              _middleRowWidth
+                                    text:               qsTr("Battery Failsafe Level:")
+                                }
+                                FactTextField {
+                                    id:                 batCritLevelField
+                                    fact:               controller.getParameterFact(-1, "BAT_CRIT_THR")
+                                    showUnits:          true
+                                    width:              _editFieldWidth
+                                }
+                            }
                         }
                     }
                 }

src/FactSystem/FactMetaData.cc

@@ -38,6 +38,7 @@
 const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[] = {
     { "centi-degrees",  "degrees",  FactMetaData::_centiDegreesToDegrees,   FactMetaData::_degreesToCentiDegrees },
     { "radians",        "degrees",  FactMetaData::_radiansToDegrees,        FactMetaData::_degreesToRadians },
+    { "norm",           "%",  FactMetaData::_normToPercent,           FactMetaData::_percentToNorm },
 };
 
 // Translations driven by app settings
@@ -449,6 +450,16 @@ QVariant FactMetaData::_knotsToMetersPerSecond(const QVariant& knots)
     return QVariant(knots.toDouble() * 0.51444444444);
 }
 
+QVariant FactMetaData::_percentToNorm(const QVariant& percent)
+{
+    return QVariant(percent.toDouble() / 100.0);
+}
+
+QVariant FactMetaData::_normToPercent(const QVariant& normalized)
+{
+    return QVariant(normalized.toDouble() * 100.0);
+}
+
 void FactMetaData::setRawUnits(const QString& rawUnits)
 {
     _rawUnits = rawUnits;

src/FactSystem/FactMetaData.h

@@ -163,6 +163,8 @@ private:
     static QVariant _kilometersPerHourToMetersPerSecond(const QVariant& kilometersPerHour);
     static QVariant _metersPerSecondToKnots(const QVariant& metersPerSecond);
     static QVariant _knotsToMetersPerSecond(const QVariant& knots);
+    static QVariant _percentToNorm(const QVariant& percent);
+    static QVariant _normToPercent(const QVariant& normalized);
 
     struct AppSettingsTranslation_s {
         const char* rawUnits;