Skip to content

Commit

Permalink
Merge UOSM-Core
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremycote committed Mar 26, 2024
1 parent 2841844 commit 9ad3d6b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Core/Tasks/InternalCommsTask.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ PRIVATE void InternalCommsTask(void* argument) {

IComms_PeriodicReceive();
}
}
}
2 changes: 1 addition & 1 deletion UOSM-Core/Modules/CANMessageLookUpModule.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ __weak void MotorRPMDataCallback(iCommsMessage_t* msg) {};

__weak void CurrentVoltageDataCallback(iCommsMessage_t* msg) {};

__weak void PressureTemperatureDataCallback(iCommsMessage_t* msg) {};
__weak void PressureTemperatureDataCallback(iCommsMessage_t* msg);

__weak void LightsDataCallback(iCommsMessage_t* msg) {};

Expand Down
8 changes: 6 additions & 2 deletions UOSM-Core/Modules/InternalCommsModule.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,13 @@ PUBLIC result_t IComms_ReadPairInt32Message(iCommsMessage_t* msg, int32_t* a, in
}

PUBLIC iCommsMessage_t
IComms_CreatePressureTemperatureMessage(uint16_t standardMessageID, pressure_t a, temperature_t b) {}
IComms_CreatePressureTemperatureMessage(uint16_t standardMessageID, pressure_t a, temperature_t b) {
return IComms_CreatePairInt32Message(standardMessageID, a, b);
}

PUBLIC result_t IComms_ReadPressureTemperatureMessage(iCommsMessage_t* msg, pressure_t* a, temperature_t* b);
PUBLIC result_t IComms_ReadPressureTemperatureMessage(iCommsMessage_t* msg, pressure_t* a, temperature_t* b) {
return IComms_ReadPairInt32Message(msg, a, b);
}

PUBLIC uint16_pair_t readMsgPairUInt16Bit(iCommsMessage_t* msg) {
uint16_pair_t pair = {};
Expand Down

0 comments on commit 9ad3d6b

Please sign in to comment.