From 0ce9962817b9f764fa8cfd706c10e94e976c642b Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Wed, 19 Sep 2018 15:29:32 -0700 Subject: ubxtool: clean up UBX-NAV- table. --- contrib/ubxtool | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'contrib') diff --git a/contrib/ubxtool b/contrib/ubxtool index 3c2e1d21..6f3e7801 100755 --- a/contrib/ubxtool +++ b/contrib/ubxtool @@ -954,11 +954,11 @@ class ubx(object): (u[0], u[1], u[2], u[3], u[4], u[5], u[6] * 1e-5, u[7], u[8] * 1e-5)) - nav_ids = {0x1: {'str': 'POSECEF', 'dec': nav_posecef, - 'name': 'UBX-NAV-POSECEF'}, - 0x2: {'str': 'POSLLH', 'name': 'UBX-NAV-POSLLH'}, - 0x3: {'str': 'STATUS', 'dec': nav_status, - 'name': 'UBX-NAV-STATUS'}, + nav_ids = {1: {'str': 'POSECEF', 'dec': nav_posecef, + 'name': 'UBX-NAV-POSECEF'}, + 2: {'str': 'POSLLH', 'name': 'UBX-NAV-POSLLH'}, + 3: {'str': 'STATUS', 'dec': nav_status, + 'name': 'UBX-NAV-STATUS'}, 0x4: {'str': 'DOP', 'dec': nav_dop, 'name': 'UBX-NAV-DOP'}, 0x5: {'str': 'ATT', 'name': 'UBX-NAV-ATT'}, 0x6: {'str': 'SOL', 'dec': nav_sol, 'name': 'UBX-NAV-SOL'}, @@ -986,15 +986,12 @@ class ubx(object): 0x26: {'str': 'TIMEGLO', 'name': 'UBX-NAV-TIMEGLO'}, 0x30: {'str': 'SVINFO', 'dec': nav_svinfo, 'name': 'UBX-NAV-SVINFO'}, - 0x31: {'str': 'DGPS', 'dec': nav_dgps, - 'name': 'UBX-NAV-DGPS'}, - 0x32: {'str': 'SBAS', 'dec': nav_sbas, - 'name': 'UBX-NAV-SBAS'}, + 0x31: {'str': 'DGPS', 'dec': nav_dgps, 'name': 'UBX-NAV-DGPS'}, + 0x32: {'str': 'SBAS', 'dec': nav_sbas, 'name': 'UBX-NAV-SBAS'}, 0x34: {'str': 'ORB', 'name': 'UBX-NAV-ORB'}, 0x35: {'str': 'SAT', 'dec': nav_sat, 'name': 'UBX-NAV-SAT'}, 0x39: {'str': 'GEOFENCE', 'name': 'UBX-NAV-GEOFENCE'}, - 0x3B: {'str': 'SVIN', 'dec': nav_svin, - 'name': 'UBX-NAV-SVIN'}, + 0x3B: {'str': 'SVIN', 'dec': nav_svin, 'name': 'UBX-NAV-SVIN'}, 0x3C: {'str': 'RELPOSNED', 'name': 'UBX-NAV-RELPOSNED'}, 0x60: {'str': 'AOPSTATUS', 'name': 'UBX-NAV-AOPSTATUS'}, 0x61: {'str': 'EOF', 'name': 'UBX-NAV-EOF'}, -- cgit v1.2.1