Add RSC_ERASE_FLASH proto command to master (fixes FCB master build) - #21
Open
Jad-Dina19 wants to merge 3 commits into
Open
Jad-Dina19 wants to merge 3 commits into
Jad-Dina19 wants to merge 3 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
FCB master's
RadioProtoTask.cpphandlesProto::FcbCommand::Command::RSC_ERASE_FLASH, but that enum value only exists on side branches of this repo (Andrey/IREC2026,adamg/camcommands,adamg/irctramp) — it was never merged to master. As a result, FCB master does not compile on a fresh clone (error: 'RSC_ERASE_FLASH' is not a member of 'Proto::FcbCommand::Command').This PR merges the proto commit (
9fb7b8a"generate proto files") onto master so the definition and FCB's code agree. FCB has been built and linked successfully against this merge.This change is not purely additive —
RSC_ERASE_FLASHtakes over value 36 andRSC_NONEmoves from 36 to 37:RSC_ERASE_FLASH = 36; RSC_NONE = 37; // Invalid command, must be lastAny system built against the old definition disagrees about what 36 means on the wire: an old-proto sender transmitting
RSC_NONE(36) would be decoded by updated firmware asRSC_ERASE_FLASH— a destructive command.RSC_NONEappears to be a never-transmitted sentinel, but please update GUI/Python tooling and firmware in the same coordinated step.Changes
SoarProto/Aegis/CommandMessage.proto— addRSC_ERASE_FLASH = 36, moveRSC_NONEto 37SoarProto/Aegis/_C++/CommandMessage.hpp— regeneratedSoarProto/Aegis/_Python/CommandMessage_pb2.py/.pyi— regeneratedAfter merge, FCB should bump its
SoarCommunicationssubmodule pointer to the new master commit.🤖 Generated with Claude Code