ubxtool: Add poll UBX-RXM-RAWX, better decode UBX-RXM-RAWX

2 files changed, 25 insertions, 2 deletions

diff --git a/ubxtool b/ubxtool
index b9497596..7c6d2804 100755
--- a/ubxtool
+++ b/ubxtool
@@ -1108,15 +1108,24 @@ class ubx(object):
         return s
 
     def rxm_rawx(self, buf):
-        "UBX-RXM-RAWX decode"
+        """UBX-RXM-RAWX decode"""
         m_len = len(buf)
+        if 0 == m_len:
+            return " Poll request"
+
         if 16 > m_len:
             return " Bad Length %s" % m_len
 
         # version not here before protver 18, I hope it is zero.
         u = struct.unpack_from('<dHbBBBBB', buf, 0)
         s = (' rcvTow %.3f week %u leapS %d numMeas %u recStat %#x'
-             ' version %u reserved1[2] %u %u' % u)
+             ' version %u\n'
+             ' reserved1[2] %#x %#x\n recStat: ' % u)
+        if 0x3 & u[4]:
+            if 1 & u[4]:
+                s += 'leapSec '
+            if 2 & u[4]:
+                s += 'clkReset '
 
         m_len -= 16
         i = 0
@@ -1520,6 +1529,11 @@ class ubx(object):
         header = b"\xb5\x62"
         return header + msg[:m_len + 4] + m_chk
 
+    def poll_rxm_rawx(self):
+        """Poll UBX-RXM-RAWX message"""
+        m_data = bytearray(0)
+        gps_model.gps_send(2, 0x15, m_data)
+
     def gps_send(self, m_class, m_id, m_data):
         "Build, and send, a message to GPS"
         m_all = self.make_pkt(m_class, m_id, m_data)
@@ -2000,6 +2014,9 @@ class ubx(object):
         # UBX-CFG-PRT, poll I/O port number
         "PRT": {"command": send_cfg_prt,
                 "help": "UBX-CFG-PRT poll I/O port settings"},
+        # UBX-CFG-PRT, poll I/O port number
+        "RXM-RAWX": {"command": poll_rxm_rawx,
+                "help": "UBX-RXM-RAWX poll raw measurement data"},
         # UBX-CFG-CFG reset config
         "RESET": {"command": send_cfg_cfg,
                   "help": "UBX-CFG-CFG reset config to defaults",
diff --git a/ubxtool.xml b/ubxtool.xml
index c61e35f6..493f72ab 100644
--- a/ubxtool.xml
+++ b/ubxtool.xml
@@ -240,6 +240,12 @@ after the GPS acknowledges the command, unless the -W is given.
        </listitem>
       </varlistentry>
       <varlistentry>
+       <term>RXM-RAWX</term>
+       <listitem>
+        <para>Poll UBX-RXM-RAWX message.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
        <term>RESET</term>
        <listitem>
         <para>Reset configuration to defaults (UBX-CFG-CFG).</para>