-
Notifications
You must be signed in to change notification settings - Fork 96
Add stubbed version of new Integrity Bounds/Flags [OTA-134] #1130
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.
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
Conversation
@silverjam Is this what you were referring as stubbing in your staging proposal? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this is exactly what I meant
Will convert this into a draft until all the other messages are merged into |
d01824f
to
54d3e14
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need a couple things before we can merge:
- an indication in the version when we're on a staging branch (something a -staging should be appended e.g.
v4.2.0-g<git_short_hash>-staging
). - a compiler macro in
sbp.h
that indicates if we're on a staging branch e.g.#define SBP_STAGING 1
We can implement here and merge master into staging or implement in master, then cherry pick to staging.
These facilities will be used when we cut a release of Starling and disable parsing of the new messages.
@@ -789,7 +828,7 @@ definitions: | |||
short_desc: Deprecated | |||
public: False | |||
replaced_by: | |||
- MSG_SSR_TILE_DEFINITION | |||
- MSG_SSR_TILE_DEFINITION_DEP |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these deprecated symbols be _DEP_A
? Seems to be a common pattern in other deprecated messages
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I though we used first _DEP
and when that one is already used, we switched to _DEP_A
.
short_desc: High level integrity flags | ||
public: False | ||
fields: | ||
- stub: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the plan for all these stubs? Are they going to be included in a release and then redefined later on? Or are they going to be defined properly on this PR before merging?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's part of a new proposal.
https://swift-nav.atlassian.net/wiki/spaces/~jason/pages/2198831192/Proposal+for+SBP+message+staging
In the staging
branch the full definition of the message is going to be defined. While in master
this stubbed version reserve the ids. Once the messages are mature enough and don't need to have any fields updated, they will be promoted from staging
to master
.
@silverjam Is this the correct place to append libsbp/generator/sbpg/generator.py Lines 87 to 101 in e88fbd8
|
Yes, this looks correct |
54d3e14
to
31ec86d
Compare
gen-c_args = -i $(SBP_SPEC_DIR) \ | ||
-o $(SWIFTNAV_ROOT)/c \ | ||
-r $(SBP_VERSION) | ||
ifeq ($(SBP_STAGING), 1) | ||
gen-c_args += -s | ||
endif | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not the sure if it is the best approach to append a flag conditionally.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems fine, this makes the behavior more explicit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As an alternative I could see moving this behavior inside the generator an implicitly deciding if we're in a "staging" mode based on some environmental condition, but again, passing the switch makes the behavior more explicit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When merging please rebase and squash into two commits (make sure to select "rebase and merge" when merging the PR, we want two physical commits to go to the master branch):
- message stubs
- support for "SBP_STAGING"
We'll then do a merge commit of master into staging and revert the "message stubs" commit.
@fpezzinosn should be able to rebase and merge this PR now |
bf69f6d
to
24859a2
Compare
Description
@swift-nav/devinfra
Reserves the IDs associated with the Satellite Bounds messages that are defined in the
staging
branch.API compatibility
Does this change introduce a API compatibility risk?
No
API compatibility plan
If the above is "Yes", please detail the compatibility (or migration) plan:
JIRA Reference
https://swift-nav.atlassian.net/browse/OTA-134