Skip to content

fix bit masks for new COG message #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 11, 2021
Merged

fix bit masks for new COG message #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad75e1d
fix bit masks for new COG message
Dec 11, 2021
f47dacc
bump js version, regen docs
Dec 11, 2021
f1a2c0b
bump benchmark again
Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions c/include/libsbp/navigation_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) & \
Expand All @@ -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) & \
Expand All @@ -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) & \
Expand All @@ -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) & \
Expand All @@ -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) & \
Expand Down
Binary file modified docs/sbp.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/*",
Expand Down
10 changes: 5 additions & 5 deletions spec/yaml/swiftnav/sbp/navigation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test_data/benchmark_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

RATIOS_JSON2JSON = {
"haskell": 2.19,
"haskell": 2.78,
}

FAILED = [False]
Expand Down