Skip to content
Merged
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
4 changes: 2 additions & 2 deletions ateam-common-packets/include/extended_telemetry.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ typedef struct ExtendedTelemetry {
// 48 bytes each

KickerTelemetry kicker_status;
// 60 bytes
// 64 bytes

float imu_gyro[3]; // rad/s
float imu_accel[3]; // m/s^2
Expand All @@ -43,4 +43,4 @@ typedef struct ExtendedTelemetry {
float wheel_velocity_clamped_u[4]; // wheel velocities after control policy clamped for local acceleration limits
/// 32 bytes
} ExtendedTelemetry;
assert_size(ExtendedTelemetry, 28 + 192 + 60 + 24 + 48 + 32);
assert_size(ExtendedTelemetry, 28 + 192 + 64 + 24 + 48 + 32);
4 changes: 3 additions & 1 deletion ateam-common-packets/include/kicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ typedef struct KickerTelemetry {
float rail_voltage;
float battery_voltage;

unsigned char kicker_image_hash[4];

MotorTelemetry dribbler_motor;
} KickerTelemetry;
assert_size(KickerTelemetry, 60);
assert_size(KickerTelemetry, 64);
4 changes: 2 additions & 2 deletions ateam-common-packets/include/radio.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ typedef union RadioData {
ExtendedTelemetry extended_telemetry;
ParameterCommand robot_parameter_command;
} RadioData;
assert_size(RadioData, 384);
assert_size(RadioData, 388);

typedef struct RadioPacket {
uint32_t crc32;
Expand All @@ -75,5 +75,5 @@ typedef struct RadioPacket {
// I think this should be a valid swap when we clean packet definitions in the future
// RadioData data __attribute__((aligned (4)));
} RadioPacket;
assert_size(RadioPacket, 396);
assert_size(RadioPacket, 400);
static_assert(sizeof(RadioPacket) <= 448); // 512 is the current size limit of an entry in the packet buffer
2 changes: 1 addition & 1 deletion ateam-common-packets/include/stspin.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ typedef struct ParameterMotorResponse {
uint16_t cur_clamp;
uint16_t _reserved;

unsigned char wheel_img_hash[4];
unsigned char firmware_img_hash[4];
} __attribute__((packed)) ParameterMotorResponse;
assert_size(ParameterMotorResponse, 48); // Note: Same length as MotorResponse_Params_Packet

Expand Down
Loading