Implement Thermal Mgr Task #285
+131
−63
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| #include "thermal_mgr.h" | ||
|
|
||
| // sensor imports for telemetry | ||
| #include "lm75bd.h" | ||
| #include "cc1120.h" | ||
| #include "cc1120_defs.h" | ||
| #include "ds3232_mz.h" | ||
| // bd621x, fm25V025A, MAX5360, and RFFM6404 doesn't have a temperature sensors | ||
|
|
||
| #include "obc_time.h" | ||
| #include "telemetry_manager.h" | ||
| #include "obc_errors.h" | ||
| #include "obc_logging.h" | ||
| #include "obc_scheduler_config.h" | ||
| #include <obc_digital_watchdog.h> | ||
| #include "digital_watchdog_mgr.h" | ||
|
|
||
| #include <FreeRTOS.h> | ||
| #include <os_portmacro.h> | ||
| #include <os_task.h> | ||
| #include <os_queue.h> | ||
|
|
||
| #define THERMAL_MGR_PERIOD_MS 1000 | ||
|
There was a problem hiding this comment. Based on our telemetry sheet, it should take the temperature once every minute, not once a sec. Also add U to the end |
||
|
|
||
| void obcTaskInitThermalMgr() {} | ||
|
There was a problem hiding this comment. This task should init the lm75bd |
||
| static obc_error_code_t collectObcLm75bdTemp(void); | ||
| static obc_error_code_t collectObcDs3232Temp(void); | ||
| static obc_error_code_t collectObcCC1120Temp(void); | ||
| static obc_error_code_t collectBMSTemp(void); | ||
|
|
||
| void obcTaskFunctionThermalMgr(void* pvParameters) { | ||
| obc_error_code_t errCode; | ||
| TickType_t xLastWakeTime; | ||
|
|
||
| xLastWakeTime = xTaskGetTickCount(); | ||
|
|
||
| while (1) { | ||
| LOG_IF_ERROR_CODE(collectObcLm75bdTemp()); | ||
| LOG_IF_ERROR_CODE(collectObcCC1120Temp()); | ||
| LOG_IF_ERROR_CODE(collectObcDs3232Temp()); // RTC | ||
| LOG_IF_ERROR_CODE(collectBMSTemp()); | ||
|
|
||
|
There was a problem hiding this comment. BMS driver code does not exist; still in PR #187 |
||
| digitalWatchdogTaskCheckIn(OBC_SCHEDULER_CONFIG_ID_THERMAL_MGR); | ||
|
|
||
| vTaskDelayUntil(&xLastWakeTime, pdMS_TO_TICKS(THERMAL_MGR_PERIOD_MS)); | ||
| } | ||
| } | ||
|
|
||
| static obc_error_code_t collectObcLm75bdTemp(void) { | ||
| obc_error_code_t errCode; | ||
|
|
||
| float temp = 0.0f; | ||
| RETURN_IF_ERROR_CODE(readTempLM75BD(LM75BD_OBC_I2C_ADDR, &temp)); | ||
|
|
||
| telemetry_data_t obcTempVal = {.obcTemp = temp, .id = TELEM_LM75BD_TEMP, .timestamp = getCurrentUnixTime()}; | ||
|
|
||
| RETURN_IF_ERROR_CODE(addTelemetryData(&obcTempVal)); | ||
|
|
||
| return OBC_ERR_CODE_SUCCESS; | ||
| } | ||
|
|
||
| static obc_error_code_t collectObcCC1120Temp(void) { | ||
| // function commented out due to cc1120 driver function being implemented in a different PR | ||
| // obc_error_code_t errCode; | ||
|
|
||
| // float temp = 0.0f; | ||
| // RETURN_IF_ERROR_CODE(readTempCC1120(&temp)); | ||
|
|
||
| // telemetry_data_t obcTempVal = {.obcTemp = temp, .id = TELEM_CC1120_TEMP, .timestamp = getCurrentUnixTime()}; | ||
|
|
||
| // RETURN_IF_ERROR_CODE(addTelemetryData(&obcTempVal)); | ||
|
|
||
| return OBC_ERR_CODE_SUCCESS; | ||
| } | ||
|
|
||
| static obc_error_code_t collectObcDs3232Temp(void) { | ||
| obc_error_code_t errCode; | ||
|
|
||
| float temp = 0.0f; | ||
| RETURN_IF_ERROR_CODE(getTemperatureRTC(&temp)); | ||
|
|
||
| telemetry_data_t obcTempVal = {.obcTemp = temp, .id = TELEM_DS3232_TEMP, .timestamp = getCurrentUnixTime()}; | ||
|
|
||
| RETURN_IF_ERROR_CODE(addTelemetryData(&obcTempVal)); | ||
|
There was a problem hiding this comment. make telem a flag that is passed in since we may want to just read the value sometimes to make sure we are safe without adding that as telemetry |
||
|
|
||
| return OBC_ERR_CODE_SUCCESS; | ||
| } | ||
|
|
||
| static obc_error_code_t collectBMSTemp(void) { | ||
| // obc_error_code_t errCode; | ||
|
|
||
| // BMS in pr https://github.com/UWOrbital/OBC-firmware/pull/187 | ||
| // float temp = 0.0f; | ||
| // RETURN_IF_ERROR_CODE(getTempBMS(&temp)); //this function should get the temperature from the BMS/MAX17320 | ||
|
|
||
| // telemetry_data_t obcTempVal = {.obcTemp = temp, .id = TELEM_BMS_TEMP, .timestamp = getCurrentUnixTime()}; | ||
|
|
||
| // RETURN_IF_ERROR_CODE(addTelemetryData(&obcTempVal)); | ||
|
|
||
| return OBC_ERR_CODE_SUCCESS; | ||
| } | ||
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://discord.com/channels/831191521595621387/1124186460866740314/1301569668242472980
Adding common interface into the header file