Skip to content

Spiro/update board protocol #15

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
AndreyDiDev merged 20 commits into from
May 23, 2026
Merged

Spiro/update board protocol #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
529626c
Create new proto file for references to board stack
SpiroDouvis Apr 29, 2026
4ad9cc6
changed references to new boards
SpiroDouvis Apr 29, 2026
324feb9
small config change
SpiroDouvis Apr 30, 2026
58bcdfd
Merge branch 'master' of https://github.com/UCSOAR/CommunicationSyste…
SpiroDouvis Apr 30, 2026
d841181
References to proper boards now
SpiroDouvis Apr 30, 2026
a21164a
Pulling master
SpiroDouvis May 5, 2026
e6ab3c1
Remove gps init for pollingtask, unneeded
SpiroDouvis May 5, 2026
cf0faeb
Reorganized structure of SoarProto module, existing proto logic store…
SpiroDouvis May 5, 2026
9d25e33
Decoupled rocket state logic from fcb, preparing to adding logic for …
SpiroDouvis May 5, 2026
86f2f44
Updated PV and IBH stuff for updated system
SpiroDouvis May 6, 2026
5941d8f
Update Proto Gen and install scripts
shivamdesai04 May 6, 2026
1f0b7bf
Update Command Messages
shivamdesai04 May 6, 2026
ec8a24e
Update old board names to Aegis names
shivamdesai04 May 6, 2026
1eb6436
update telemetry messages
shivamdesai04 May 6, 2026
03a02af
Lastest proto gen for Aegis
shivamdesai04 May 6, 2026
7ab1648
Changed path for canbustargets.hpp
SpiroDouvis May 7, 2026
6a5b782
pull main shizzy stuff
SpiroDouvis May 9, 2026
df43682
New camera command messages for commandproto, implementation still ne…
SpiroDouvis May 23, 2026
6fa15ef
Merge branch 'master' of https://github.com/UCSOAR/CommunicationSyste…
SpiroDouvis May 23, 2026
e88874f
new air brakes enable and disable command
SpiroDouvis May 23, 2026
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
17 changes: 16 additions & 1 deletion SoarProto/Aegis/CommandMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,23 @@ message FcbCommand {
RSC_TEST_MEV_ENABLE = 23; // Not used for Aegis
RSC_TEST_MEV_DISABLE = 24; // Not used for Aegis

//CAMERA COMMANDS
RSC_CAMERA_SWITCH = 25;

RSC_CAM1_ENABLE = 26;
RSC_CAM1_DISABLE = 27;

RSC_CAM2_ENABLE = 28;
RSC_CAM2_DISABLE = 29;

RSC_CAM3_ENABLE = 30;
RSC_CAM3_DISABLE = 31;

RSC_AIR_BRAKES_ENABLE = 32;
RSC_AIR_BRAKES_DISABLE = 33;

//-- TECHNICAL --
RSC_NONE = 25; // Invalid command, must be last
RSC_NONE = 34; // Invalid command, must be last

Comment on lines +104 to 121
// TODO NEW : ADD NEW COMMANDS FOR HEATER? OR AIRBRAKES AND STUFF. OR CREATE A NEW MESSAGE TYPE FOR NON-FLIGHT-SEQUENCE COMMANDS?
}
Expand Down
11 changes: 10 additions & 1 deletion SoarProto/Aegis/_C++/CommandMessage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,16 @@ class FcbCommand final: public ::EmbeddedProto::MessageInterface
RSC_TEST_MEV_OPEN = 22,
RSC_TEST_MEV_ENABLE = 23,
RSC_TEST_MEV_DISABLE = 24,
RSC_NONE = 25
RSC_CAMERA_SWITCH = 25,
RSC_CAM1_ENABLE = 26,
RSC_CAM1_DISABLE = 27,
RSC_CAM2_ENABLE = 28,
RSC_CAM2_DISABLE = 29,
RSC_CAM3_ENABLE = 30,
RSC_CAM3_DISABLE = 31,
RSC_AIR_BRAKES_ENABLE = 32,
RSC_AIR_BRAKES_DISABLE = 33,
RSC_NONE = 34
};

enum class FieldNumber : uint32_t
Expand Down
30 changes: 15 additions & 15 deletions SoarProto/Aegis/_Python/CommandMessage_pb2.py
View file
Open in desktop

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

18 changes: 18 additions & 0 deletions SoarProto/Aegis/_Python/CommandMessage_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ class FcbCommand(_message.Message):
RSC_TEST_MEV_OPEN: _ClassVar[FcbCommand.Command]
RSC_TEST_MEV_ENABLE: _ClassVar[FcbCommand.Command]
RSC_TEST_MEV_DISABLE: _ClassVar[FcbCommand.Command]
RSC_CAMERA_SWITCH: _ClassVar[FcbCommand.Command]
RSC_CAM1_ENABLE: _ClassVar[FcbCommand.Command]
RSC_CAM1_DISABLE: _ClassVar[FcbCommand.Command]
RSC_CAM2_ENABLE: _ClassVar[FcbCommand.Command]
RSC_CAM2_DISABLE: _ClassVar[FcbCommand.Command]
RSC_CAM3_ENABLE: _ClassVar[FcbCommand.Command]
RSC_CAM3_DISABLE: _ClassVar[FcbCommand.Command]
RSC_AIR_BRAKES_ENABLE: _ClassVar[FcbCommand.Command]
RSC_AIR_BRAKES_DISABLE: _ClassVar[FcbCommand.Command]
RSC_NONE: _ClassVar[FcbCommand.Command]
RSC_FIRST_INVALID: FcbCommand.Command
RSC_ANY_TO_ABORT: FcbCommand.Command
Expand All @@ -79,6 +88,15 @@ class FcbCommand(_message.Message):
RSC_TEST_MEV_OPEN: FcbCommand.Command
RSC_TEST_MEV_ENABLE: FcbCommand.Command
RSC_TEST_MEV_DISABLE: FcbCommand.Command
RSC_CAMERA_SWITCH: FcbCommand.Command
RSC_CAM1_ENABLE: FcbCommand.Command
RSC_CAM1_DISABLE: FcbCommand.Command
RSC_CAM2_ENABLE: FcbCommand.Command
RSC_CAM2_DISABLE: FcbCommand.Command
RSC_CAM3_ENABLE: FcbCommand.Command
RSC_CAM3_DISABLE: FcbCommand.Command
RSC_AIR_BRAKES_ENABLE: FcbCommand.Command
RSC_AIR_BRAKES_DISABLE: FcbCommand.Command
RSC_NONE: FcbCommand.Command
COMMAND_ENUM_FIELD_NUMBER: _ClassVar[int]
command_enum: FcbCommand.Command
Expand Down
6 changes: 3 additions & 3 deletions SoarProto/Ouroboros/CoreProto.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ enum Node {

NODE_UNKNOWN = 1; // This can happen if the node is not yet known at this stage, eg. COBS decode failed
NODE_ANY = 2;
NODE_RCU = 3;
NODE_DMB = 4;
NODE_FSB = 3;
NODE_FCB = 4;
NODE_PBB = 5;
NODE_SOB = 6;
NODE_LRB = 6;
}

enum MessageID {
Expand Down
Loading