diff --git a/c/include/libsbp/navigation_macros.h b/c/include/libsbp/navigation_macros.h index 0b13cb1a9b..a7cef89e16 100644 --- a/c/include/libsbp/navigation_macros.h +++ b/c/include/libsbp/navigation_macros.h @@ -925,7 +925,7 @@ #define SBP_MSG_VEL_BODY_ENCODED_LEN 42u #define SBP_MSG_VEL_COG 0x021C -#define SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_MASK (0x3) +#define SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_MASK (0x1) #define SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_SHIFT (5u) #define SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_GET(flags) \ ((u8)(((flags) >> SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_SHIFT) & \ @@ -939,7 +939,7 @@ #define SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_INVALID (0) #define SBP_VEL_COG_VERTICAL_VELOCITY_VALIDITY_VERTICAL_VELOCITY_VALID (1) -#define SBP_VEL_COG_SOG_VALIDITY_MASK (0x3) +#define SBP_VEL_COG_SOG_VALIDITY_MASK (0x1) #define SBP_VEL_COG_SOG_VALIDITY_SHIFT (4u) #define SBP_VEL_COG_SOG_VALIDITY_GET(flags) \ ((u8)(((flags) >> SBP_VEL_COG_SOG_VALIDITY_SHIFT) & \ @@ -952,7 +952,7 @@ #define SBP_VEL_COG_SOG_VALIDITY_INVALID (0) #define SBP_VEL_COG_SOG_VALIDITY_SOG_VALID (1) -#define SBP_VEL_COG_COG_VALIDITY_MASK (0x3) +#define SBP_VEL_COG_COG_VALIDITY_MASK (0x1) #define SBP_VEL_COG_COG_VALIDITY_SHIFT (3u) #define SBP_VEL_COG_COG_VALIDITY_GET(flags) \ ((u8)(((flags) >> SBP_VEL_COG_COG_VALIDITY_SHIFT) & \ @@ -965,7 +965,7 @@ #define SBP_VEL_COG_COG_VALIDITY_INVALID (0) #define SBP_VEL_COG_COG_VALIDITY_COG_VALID (1) -#define SBP_VEL_COG_INS_NAVIGATION_MODE_MASK (0x3) +#define SBP_VEL_COG_INS_NAVIGATION_MODE_MASK (0x1) #define SBP_VEL_COG_INS_NAVIGATION_MODE_SHIFT (2u) #define SBP_VEL_COG_INS_NAVIGATION_MODE_GET(flags) \ ((u8)(((flags) >> SBP_VEL_COG_INS_NAVIGATION_MODE_SHIFT) & \ @@ -978,7 +978,7 @@ #define SBP_VEL_COG_INS_NAVIGATION_MODE_NONE (0) #define SBP_VEL_COG_INS_NAVIGATION_MODE_INS_USED (1) -#define SBP_VEL_COG_VELOCITY_MODE_MASK (0x7) +#define SBP_VEL_COG_VELOCITY_MODE_MASK (0x3) #define SBP_VEL_COG_VELOCITY_MODE_SHIFT (0u) #define SBP_VEL_COG_VELOCITY_MODE_GET(flags) \ ((u8)(((flags) >> SBP_VEL_COG_VELOCITY_MODE_SHIFT) & \ diff --git a/docs/sbp.pdf b/docs/sbp.pdf index 80545e1ede..9469034eff 100644 Binary files a/docs/sbp.pdf and b/docs/sbp.pdf differ diff --git a/package-lock.json b/package-lock.json index 3d2a4b930a..6f585a0a70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sbp", - "version": "4.1.0", + "version": "4.1.1-alpha", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sbp", - "version": "4.1.0", + "version": "4.1.1-alpha", "license": "MIT", "dependencies": { "binary-parser": "^1.7.0", diff --git a/package.json b/package.json index 2783ee0948..048a5fe5ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sbp", - "version": "4.1.0", + "version": "4.1.1-alpha", "description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/", "files": [ "javascript/*", diff --git a/spec/yaml/swiftnav/sbp/navigation.yaml b/spec/yaml/swiftnav/sbp/navigation.yaml index ca4382b822..e8830951a1 100644 --- a/spec/yaml/swiftnav/sbp/navigation.yaml +++ b/spec/yaml/swiftnav/sbp/navigation.yaml @@ -1722,27 +1722,27 @@ definitions: fields: - 6-7: desc: Reserved - - 5-6: + - 5: desc: Vertical velocity validity values: - 0: Invalid - 1: Vertical velocity valid - - 4-5: + - 4: desc: SOG validity values: - 0: Invalid - 1: SOG valid - - 3-4: + - 3: desc: COG validity values: - 0: Invalid - 1: COG valid - - 2-3: + - 2: desc: INS Navigation Mode values: - 0: None - 1: INS used - - 0-2: + - 0-1: desc: Velocity mode values: - 0: Invalid diff --git a/test_data/benchmark_main.py b/test_data/benchmark_main.py index 672fb285b1..a287efa857 100755 --- a/test_data/benchmark_main.py +++ b/test_data/benchmark_main.py @@ -20,7 +20,7 @@ } RATIOS_JSON2JSON = { - "haskell": 2.19, + "haskell": 2.78, } FAILED = [False]