update ubx_cfgval_frame for X types

Author: semuadmin

RELEASE_NOTES.md

@@ -2,7 +2,10 @@
 
 ### RELEASE 1.6.10
 
-1. Minor enhancements to UBX Config Dialog confirmation signalling. Clarify 'X' bitfields are little endian.
+1. Minor enhancements to UBX Config Dialog confirmation signalling. 
+1. Amend CFG-VALSET/GET/DEL Configuration Interface panel; X-type attributes (`X004`, `X008`, etc.) are now entered in 
+conventional hexadecimal integer notation rather than little-endian hex strings, consistent with values illustrated in the Interface
+Specifications e.g. value for CFG_SBAS_PRNSCANMASK (`X008`) would now be entered `0x000000000003ab88` rather than `88ab030000000000`.
 1. Make 'Check for update on startup' 'opt-in' rather than 'opt-out'. Setting available via About dialog.
 
 ### RELEASE 1.6.9

src/pygpsclient/helpers.py

@@ -1483,6 +1483,23 @@ def valid_geom(geom: str) -> bool:
     return regexgeom.match(geom) is not None
 
 
+def valid_hex(val: str, *args) -> bool:
+    """
+    Validate hex string in Entry field.
+
+    :param str val: hexadecimal value
+    :return: Valid/Invalid
+    :rtype: bool
+    """
+
+    try:
+        atts = args[0]
+        int.to_bytes(int(val, 16), atts, "little")
+        return True
+    except (TypeError, ValueError, OverflowError):
+        return False
+
+
 def xy2ll(width: int, height: int, bounds: Area, xy: tuple) -> Point | NoneType:
     """
     Convert canvas x/y to lat/lon.

src/pygpsclient/ubx_cfgval_frame.py

@@ -51,10 +51,12 @@
     TRACEMODE_WRITE,
     UBX_CFGVAL,
     VALBOOL,
+    VALCUSTOM,
     VALFLOAT,
     VALINT,
     VALNONBLANK,
 )
+from pygpsclient.helpers import valid_hex
 
 VALSET = 0
 VALDEL = 1
@@ -183,7 +185,6 @@ def _body(self):
             width=8,
             state=READONLY,
         )
-        self._lbl_endian = Label(self, text="")
         self._lbl_val = Label(self, text="Value")
         self._ent_val = Entry(
             self,
@@ -223,7 +224,6 @@ def _do_layout(self):
         self._lbl_att.grid(column=4, row=13, sticky=W)
         self._lbl_layer.grid(column=1, row=14, sticky=E)
         self._spn_layer.grid(column=2, row=14, sticky=W)
-        self._lbl_endian.grid(column=3, row=14, columnspan=2, sticky=E)
         self._lbl_val.grid(column=1, row=15, sticky=E)
         self._ent_val.grid(column=2, row=15, columnspan=3, sticky=EW)
 
@@ -307,8 +307,6 @@ def _on_select_parm(self, *args, **kwargs):  # pylint: disable=unused-argument
             self._cfgatt.set(att)
             self._cfgval.set("")
             self._lbl_send_command.config(image=self._img_blank)
-            endian = "Little Endian" if att[0:1] == "X" and att[1:] > "001" else ""
-            self._lbl_endian.config(text=endian)
         except TclError:
             pass
 
@@ -352,12 +350,15 @@ def _do_valset(self):
             layers = 1
         try:
             if att in ("C", "X"):  # byte or char
-                self._ent_val.validate(VALNONBLANK)
-                if len(val) == atts * 2:  # 2 hex chars per byte
-                    val = bytearray.fromhex(val)
-                else:
-                    valid = False
-
+                valid = self._ent_val.validate(
+                    VALCUSTOM,
+                    func=valid_hex,
+                    args=[
+                        atts,
+                    ],
+                )
+                if valid:
+                    val = int.to_bytes(int(val, 16), atts, "little")
             elif att in ("E", "U"):  # unsigned integer
                 self._ent_val.validate(VALINT)
                 val = int(val)
@@ -462,7 +463,9 @@ def update_status(self, msg: UBXMessage):  # pylint: disable=unused-argument
             val = getattr(msg, self._cfgval_keyname, None)
             if val is not None:
                 if isinstance(val, bytes):
-                    val = val.hex()
+                    atts = attsiz(self._cfgatt.get())
+                    vali = int.from_bytes(val, "little")
+                    val = f"0x{vali:0{atts*2}x}"
                 self._cfgval.set(val)
             self.__container.status_label = ("CFG-VALGET GET message received", OKCOL)
 

tests/test_static.py

@@ -77,6 +77,7 @@
     unused_sats,
     val2sphp,
     valid_geom,
+    valid_hex,
     xy2ll,
 )
 from pygpsclient.mapquest_handler import (
@@ -963,6 +964,15 @@ def testhdg2yaw(self):
         self.assertEqual(hdg2yaw(375.0),15.0)
         self.assertEqual(hdg2yaw(715.0),-5.0)
 
+    def testvalidhex(self):
+
+        self.assertTrue(valid_hex("0x11223344", 4))
+        self.assertFalse(valid_hex("0x112233zz", 4))
+        self.assertFalse(valid_hex("0x1122334455667788", 4))
+        self.assertTrue(valid_hex("0x1122334455667788", 8))
+        self.assertFalse(valid_hex("asdfttwergazz", 4))
+        self.assertFalse(valid_hex("", 4))
+
 if __name__ == "__main__":
     # import sys;sys.argv = ['', 'Test.testName']
     unittest.main()