diff --git a/Apps/Inc/UpdateDisplay.h b/Apps/Inc/UpdateDisplay.h index 6fdd02e0..961cc2d9 100644 --- a/Apps/Inc/UpdateDisplay.h +++ b/Apps/Inc/UpdateDisplay.h @@ -138,6 +138,8 @@ UpdateDisplayError_t UpdateDisplay_SetBattCurrent(int32_t val); UpdateDisplayError_t UpdateDisplay_SetHeartbeat(uint32_t val); +UpdateDisplayError_t UpdateDisplay_SetHeatSinkTemp(uint32_t val); + /** * @brief Clears the display message queue and sets the message counter semaphore value to 0 * @param none diff --git a/Apps/Src/ReadTritium.c b/Apps/Src/ReadTritium.c index 940d1c91..3f2392b6 100755 --- a/Apps/Src/ReadTritium.c +++ b/Apps/Src/ReadTritium.c @@ -83,6 +83,10 @@ void Task_ReadTritium(void *p_arg){ } + case TEMPERATURE:{ + UpdateDisplay_SetHeatSinkTemp(*(float *)(&dataBuf.data[4])); + } + default:{ break; //for cases not handled currently } diff --git a/Apps/Src/UpdateDisplay.c b/Apps/Src/UpdateDisplay.c index 8ba405cf..f3e63168 100644 --- a/Apps/Src/UpdateDisplay.c +++ b/Apps/Src/UpdateDisplay.c @@ -41,6 +41,7 @@ typedef enum{ PACK_VOLTAGE, PACK_CURRENT, PACK_TEMP, + HEAT_SINK_TEMP, GEAR, // Fault code components OS_CODE, @@ -50,7 +51,7 @@ typedef enum{ static uint32_t componentVals[NUM_COMPONENTS] = {0}; -const char* compStrings[16]= { +const char* compStrings[NUM_COMPONENTS]= { // Boolean components "arr", "hb", @@ -66,6 +67,7 @@ const char* compStrings[16]= { "pv", "pc", "pt", + "heatsink", "gear", // Fault code components "oserr", @@ -251,6 +253,12 @@ UpdateDisplayError_t UpdateDisplay_SetHeartbeat(uint32_t val){ return UPDATEDISPLAY_ERR_NONE; } +UpdateDisplayError_t UpdateDisplay_SetHeatSinkTemp(uint32_t val){ + componentVals[HEAT_SINK_TEMP] = val; + + return UPDATEDISPLAY_ERR_NONE; +} + /** * @brief Loops through the display queue and sends all messages diff --git a/Config/Display/display.HMI b/Config/Display/display.HMI index 5e2f84c6..0a3c8c0c 100755 Binary files a/Config/Display/display.HMI and b/Config/Display/display.HMI differ