Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion CanAutoNode/LogTypes/RPBLogs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "LogStructs.hpp"
#include "CanAutoNodeDaughter.hpp"
#include "IRCTramp.hpp"

#ifdef PACK_CAN_STRUCTS
#pragma pack(push,1)
Expand Down Expand Up @@ -37,6 +38,13 @@ struct RPB_FROM_DAQ_AIR_BRAKES_LEVEL {
uint8_t level;
};

struct RPB_IRCTRAMP_SET_COMMAND {
IRCTramp::POWER power;
IRCTramp::FREQUENCY freq;
bool setPower;
bool setFreq;
};

#ifdef PACK_CAN_STRUCTS
#pragma pack(pop)
#endif
Expand All @@ -46,7 +54,8 @@ struct RPB_FROM_DAQ_AIR_BRAKES_LEVEL {
X(RPB_CAMERA_RECORDING_COMMAND) \
X(RPB_CAMERA_SWITCH_COMMAND) \
X(RPB_AIR_BRAKES_COMMAND) \
X(RPB_FROM_DAQ_AIR_BRAKES_LEVEL)
X(RPB_FROM_DAQ_AIR_BRAKES_LEVEL) \
X(RPB_IRCTRAMP_SET_COMMAND)

#define X(x) sizeof(x),
const CanAutoNodeDaughter::LogInit RPB_Init[] = {RPB_CAN_LOGS};
Expand Down
4 changes: 3 additions & 1 deletion SoarProto/Aegis/CommandMessage.proto
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,10 @@ message FcbCommand {
RSC_AIR_BRAKES_ENABLE = 34;
RSC_AIR_BRAKES_DISABLE = 35;

RSC_ERASE_FLASH = 36;

//-- TECHNICAL --
RSC_NONE = 36; // Invalid command, must be last
RSC_NONE = 37; // Invalid command, must be last

// TODO NEW : ADD NEW COMMANDS FOR HEATER? OR AIRBRAKES AND STUFF. OR CREATE A NEW MESSAGE TYPE FOR NON-FLIGHT-SEQUENCE COMMANDS?
}
Expand Down
3 changes: 2 additions & 1 deletion SoarProto/Aegis/_C++/CommandMessage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ class FcbCommand final: public ::EmbeddedProto::MessageInterface
RSC_CAM3_DISABLE = 33,
RSC_AIR_BRAKES_ENABLE = 34,
RSC_AIR_BRAKES_DISABLE = 35,
RSC_NONE = 36
RSC_ERASE_FLASH = 36,
RSC_NONE = 37
};

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

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

2 changes: 2 additions & 0 deletions SoarProto/Aegis/_Python/CommandMessage_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class FcbCommand(_message.Message):
RSC_CAM3_DISABLE: _ClassVar[FcbCommand.Command]
RSC_AIR_BRAKES_ENABLE: _ClassVar[FcbCommand.Command]
RSC_AIR_BRAKES_DISABLE: _ClassVar[FcbCommand.Command]
RSC_ERASE_FLASH: _ClassVar[FcbCommand.Command]
RSC_NONE: _ClassVar[FcbCommand.Command]
RSC_FIRST_INVALID: FcbCommand.Command
RSC_ANY_TO_ABORT: FcbCommand.Command
Expand Down Expand Up @@ -101,6 +102,7 @@ class FcbCommand(_message.Message):
RSC_CAM3_DISABLE: FcbCommand.Command
RSC_AIR_BRAKES_ENABLE: FcbCommand.Command
RSC_AIR_BRAKES_DISABLE: FcbCommand.Command
RSC_ERASE_FLASH: FcbCommand.Command
RSC_NONE: FcbCommand.Command
COMMAND_ENUM_FIELD_NUMBER: _ClassVar[int]
command_enum: FcbCommand.Command
Expand Down