diff --git a/ateam-common-packets/include/extended_telemetry.h b/ateam-common-packets/include/extended_telemetry.h index effb9ac..32d5c6a 100644 --- a/ateam-common-packets/include/extended_telemetry.h +++ b/ateam-common-packets/include/extended_telemetry.h @@ -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 @@ -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); diff --git a/ateam-common-packets/include/kicker.h b/ateam-common-packets/include/kicker.h index 0e58bdb..85acbb7 100644 --- a/ateam-common-packets/include/kicker.h +++ b/ateam-common-packets/include/kicker.h @@ -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); \ No newline at end of file +assert_size(KickerTelemetry, 64); \ No newline at end of file diff --git a/ateam-common-packets/include/radio.h b/ateam-common-packets/include/radio.h index b5e7e48..f03b802 100644 --- a/ateam-common-packets/include/radio.h +++ b/ateam-common-packets/include/radio.h @@ -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; @@ -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 diff --git a/ateam-common-packets/include/stspin.h b/ateam-common-packets/include/stspin.h index 4d00026..9a79e87 100644 --- a/ateam-common-packets/include/stspin.h +++ b/ateam-common-packets/include/stspin.h @@ -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