From 87a01af6fd67680cb7ee8f7bb635e68a5a4f48ad Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
Date: Tue, 28 May 2019 12:53:34 -0700
Subject: ubxtool: Improve UBX-RCM-RAWX decode.

---
 ubxtool | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'ubxtool')

diff --git a/ubxtool b/ubxtool
index e6aa983e..706ab7f0 100755
--- a/ubxtool
+++ b/ubxtool
@@ -3677,6 +3677,11 @@ class ubx(object):
 
         return s
 
+    rxm_rawx_recs = {
+        1: "leapSec",
+        2: "clkReset",
+        }
+
     def rxm_rawx(self, buf):
         """UBX-RXM-RAWX decode"""
         m_len = len(buf)
@@ -3690,12 +3695,8 @@ class ubx(object):
         u = struct.unpack_from('<dHbBBBBB', buf, 0)
         s = (' rcvTow %.3f week %u leapS %d numMeas %u recStat %#x'
              ' 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 '
+             ' reserved1[2] %#x %#x\n  recStat (' % u)
+        s += flag_s(u[4], self.rxm_rawx_recs) + ')'
 
         m_len -= 16
         i = 0
-- 
cgit v1.2.1