Rework Remote ID settings to new style

Validation reporting in the ui is not yet supported. That will come in a subsequent pull.
mavlink · Oct 10, 2024 · eab759c · eab759c
1 parent 2d4bb34
commit eab759c
Show file tree

Hide file tree

Showing 7 changed files with 416 additions and 78 deletions.
diff --git a/src/FactSystem/FactControls/LabelledFactTextField.qml b/src/FactSystem/FactControls/LabelledFactTextField.qml
@@ -22,6 +22,7 @@ RowLayout {
     property alias  textFieldUnitsLabel:     _factTextField.unitsLabel
     property alias  textFieldShowUnits:      _factTextField.showUnits
     property alias  textFieldShowHelp:       _factTextField.showHelp
+    property alias  textField:               _factTextField
 
     spacing: ScreenTools.defaultFontPixelWidth * 2
 

diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
@@ -75,7 +75,6 @@ QGCPopupDialog {
     }
 
     Component.onCompleted: {
-        console.log("ParameterEditor")
         if (validate) {
             valueField.text = validateValue
             validationError.text = fact.validate(validateValue, false /* convertOnly */)
@@ -116,11 +115,12 @@ QGCPopupDialog {
             }
 
             QGCComboBox {
-                id:         factCombo
-                width:      _editFieldWidth
-                model:      fact.enumStrings
-                visible:    _showCombo
-                focus:      setFocus && visible
+                id:             factCombo
+                width:          _editFieldWidth
+                model:          fact.enumStrings
+                sizeToContents: true
+                visible:        _showCombo
+                focus:          setFocus && visible
 
                 Component.onCompleted: {
                     // We can't bind directly to fact.enumIndex since that would add an unknown value

diff --git a/src/QmlControls/SettingsGroupLayout.qml b/src/QmlControls/SettingsGroupLayout.qml
@@ -6,10 +6,10 @@ import QGroundControl.ScreenTools
 import QGroundControl.Palette
 
 ColumnLayout {
-    id:             control    
-    spacing:        _margins / 2
-    implicitWidth:  _contentLayout.implicitWidth + (_margins * 2)
-    implicitHeight: _contentLayout.implicitHeight + (_margins * 2)
+    id:                 control    
+    spacing:            _margins / 2
+    implicitWidth:      _contentLayout.implicitWidth + (_margins * 2)
+    implicitHeight:     _contentLayout.implicitHeight + (_margins * 2)
 
     default property alias contentItem: _contentLayout.data
 

diff --git a/src/Settings/RemoteID.SettingsGroup.json b/src/Settings/RemoteID.SettingsGroup.json
@@ -34,21 +34,21 @@
 },
 {
     "name":         "selfIDFree",
-    "shortDesc":    "Self ID",
+    "shortDesc":    "Flight Purpose",
     "longDesc":     "Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.",
     "type":         "string",
     "default":      ""
 },
 {
     "name":         "selfIDEmergency",
-    "shortDesc":    "Self ID",
+    "shortDesc":    "Emergency Text",
     "longDesc":     "Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.",
     "type":         "string",
     "default":      "Pilot Emergency Status"
 },
 {
     "name":         "selfIDExtended",
-    "shortDesc":    "Self ID",
+    "shortDesc":    "Extended Status",
     "longDesc":     "Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.",
     "type":         "string",
     "default":      ""
@@ -57,7 +57,7 @@
     "name":         "selfIDType",
     "shortDesc":    "Self ID type",
     "type":         "uint8",
-    "enumStrings":  "Free Text,Emergency,Extended Status",
+    "enumStrings":  "Flight Purpose,Emergency,Extended Status",
     "enumValues":   "0,1,2",
     "default":      0
 },
@@ -78,7 +78,7 @@
     "name":         "basicIDType",
     "shortDesc":    "Basic ID Type",
     "type":         "uint8",
-    "enumStrings":  "None,SerialNumber(ANSI/CTA-2063),CAA,UTM(RFC4122),Specific",
+    "enumStrings":  "None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific",
     "enumValues":   "0,1,2,3,4",
     "default":      2
 },
@@ -116,41 +116,45 @@
     "default":      1
 },
 {
-    "name":         "latitudeFixed",
-    "shortDesc":    "Latitude Fixed",
-    "longDesc":     "Fixed latitude to send on SYSTEM message",
-    "type":         "double",
-    "decimalPlaces":7,
-    "default":      0
+    "name":             "latitudeFixed",
+    "shortDesc":        "Latitude Fixed",
+    "longDesc":         "Fixed latitude to send on SYSTEM message",
+    "type":             "double",
+    "minValue":         "-90",
+    "maxValue":         "90",
+    "decimalPlaces":    7,
+    "default":          0
 },
 {
-    "name":         "longitudeFixed",
-    "shortDesc":    "Longitude Fixed",
-    "longDesc":     "Fixed Longitude to send on SYSTEM message",
-    "type":         "double",
-    "decimalPlaces":7,
-    "default":      0
+    "name":             "longitudeFixed",
+    "shortDesc":        "Longitude Fixed",
+    "longDesc":         "Fixed Longitude to send on SYSTEM message",
+    "type":             "double",
+    "minValue":         "-180",
+    "maxValue":         "180",
+    "decimalPlaces":    7,
+    "default":          0
 },
 {
-    "name":         "altitudeFixed",
-    "shortDesc":    "Altitude Fixed",
-    "longDesc":     "Fixed Altitude to send on SYSTEM message",
-    "type":         "double",
-    "decimalPlaces":7,
-    "default":      0
+    "name":             "altitudeFixed",
+    "shortDesc":        "Altitude Fixed",
+    "longDesc":         "Fixed Altitude to send on SYSTEM message",
+    "type":             "double",
+    "decimalPlaces":    7,
+    "default":          0
 },
 {
     "name":         "classificationType",
     "shortDesc":    "Classification Type",
-    "longDesc":     "Classification Type of UA",
+    "longDesc":     "Classification Type of UAS",
     "type":         "uint8",
-    "enumStrings":  "Undefined,EU",
+    "enumStrings":  "Undeclared,EU",
     "enumValues":   "0,1",
     "default":      0
 },
 {
     "name":         "categoryEU",
-    "shortDesc":    "Category EU",
+    "shortDesc":    "Category",
     "longDesc":     "Category of the UAS in the EU region",
     "type":         "uint8",
     "enumStrings":  "Undeclared,Open,Specific,Certified",
@@ -159,7 +163,7 @@
 },
 {
     "name":         "classEU",
-    "shortDesc":    "Class EU",
+    "shortDesc":    "Class",
     "longDesc":     "Class of the UAS in the EU region",
     "type":         "uint8",
     "enumStrings":  "Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6",