Finished the thermal manager implementation for Comms, and RTC

Author: AnshRoutray

obc/app/modules/comms_link_mgr/comms_manager.c

@@ -61,6 +61,13 @@ static uint8_t cc1120TransmitQueueStack[CC1120_TRANSMIT_QUEUE_LENGTH * CC1120_TR
 static const uint8_t TEMP_STATIC_KEY[AES_KEY_SIZE] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
                                                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
 
+#define CC1120_TEMP_QUEUE_LENGTH 1
+#define CC1120_TEMP_QUEUE_ITEM_SIZE sizeof(uint32_t)
+
+QueueHandle_t cc1120TempQueueHandle = NULL;
+static StaticQueue_t cc1120TempQueue;
+static uint32_t cc1120TempQueueStack[COMMS_MANAGER_QUEUE_LENGTH];
+
 /**
  * @brief determines what the next Comms Manager state should be and sets it to
  * that state
@@ -126,6 +133,12 @@ void obcTaskInitCommsMgr(void) {
                                                    cc1120TransmitQueueStack, &cc1120TransmitQueue);
   }
 
+  ASSERT((cc1120TempQueueStack != NULL) && (&cc1120TempQueue != NULL));
+  if (cc1120TempQueueHandle == NULL) {
+    cc1120TempQueueHandle = xQueueCreateStatic(CC1120_TEMP_QUEUE_LENGTH, CC1120_TEMP_QUEUE_ITEM_SIZE,
+                                               cc1120TempQueueStack, &cc1120TempQueue);
+  }
+
   // TODO: Implement a key exchange algorithm instead of using Pre-Shared/static
   // key
   initializeAesCtx(TEMP_STATIC_KEY);
@@ -299,6 +312,13 @@ obc_error_code_t sendToFrontCommsManagerQueue(comms_event_t *event) {
   return OBC_ERR_CODE_QUEUE_FULL;
 }
 
+obc_error_code_t postCommsManagerTempQueue(uint32_t value) {
+  if (xQueueOverwrite(cc1120TempQueueHandle, &value) != pdPASS) {
+    return OBC_ERR_CODE_UNKNOWN;
+  }
+  return OBC_ERR_CODE_INVALID_STATE;
+}
+
 // NOTE: This is created on startup
 void obcTaskFunctionCommsMgr(void *pvParameters) {
   obc_error_code_t errCode;

obc/app/modules/comms_link_mgr/comms_manager.h

@@ -13,6 +13,8 @@
 #define U_FRAME_COMMS_RECV_SIZE 30
 #define I_FRAME_COMMS_RECV_SIZE 300
 
+extern QueueHandle_t cc1120TempQueueHandle;
+
 /**
  * @enum	comms_event_id_t
  * @brief	comms event ID enum.

obc/app/modules/health_collector/health_collector.c

@@ -0,0 +1,61 @@
+#include "thermal_mgr.h"
+#include "lm75bd.h"
+#include "obc_time.h"
+#include "telemetry_manager.h"
+#include "obc_errors.h"
+#include "obc_logging.h"
+#include "obc_scheduler_config.h"
+#include "comms_manager.h"
+
+#include <FreeRTOS.h>
+#include <os_task.h>
+#include <sys_common.h>
+
+#define HEALTH_COLLECTION_PERIOD_MS 60000UL
+
+static obc_error_code_t collectThermalData(void);
+static obc_error_code_t readCC1120Temp(float* temp);
+
+void obcTaskInitThermalMgr(void) {}
+
+void obcTaskFunctionThermalMgr(void* pvParameters) {
+  obc_error_code_t errCode;
+
+  while (1) {
+    LOG_IF_ERROR_CODE(collectThermalData());
+    vTaskDelay(pdMS_TO_TICKS(HEALTH_COLLECTION_PERIOD_MS));
+  }
+}
+
+static obc_error_code_t collectThermalData(void) {
+  obc_error_code_t errCode;
+
+  float lm75bdTemp = 0.0f;
+  RETURN_IF_ERROR_CODE(readTempLM75BD(LM75BD_OBC_I2C_ADDR, &lm75bdTemp));
+
+  float cc1120Temp = 0.0f;
+  RETURN_IF_ERROR_CODE(readCC1120Temp(&cc1120Temp));
+
+  float rtcTemp = 0.0f;
+  RETURN_IF_ERROR_CODE(readRTCTemp(&rtcTemp));
+
+  telemetry_data_t obcTempVal = {.obcTemp = lm75bdTemp, .id = TELEM_OBC_TEMP, .timestamp = getCurrentUnixTime()};
+
+  RETURN_IF_ERROR_CODE(addTelemetryData(&obcTempVal));
+
+  return OBC_ERR_CODE_SUCCESS;
+}
+
+static obc_error_code_t readCC1120Temp(float* data) {
+  if (xQueuePeek(cc1120TempQueueHandle, data, 0) != pdPASS) {
+    return OBC_ERR_CODE_QUEUE_EMPTY;
+  }
+  return OBC_ERR_CODE_SUCCESS;
+}
+
+static obc_error_code_t readRTCTemp(float* data) {
+  if (xQueuePeek(cc1120TempQueueHandle, data, 0) != pdPASS) {
+    return OBC_ERR_CODE_QUEUE_EMPTY;
+  }
+  return OBC_ERR_CODE_SUCCESS;
+}

obc/app/modules/thermal_mgr/thermal_mgr.c

@@ -11,10 +11,31 @@
 #include <os_task.h>
 #include <os_timer.h>
 #include <sys_common.h>
+#include <os_queue.h>
 
 #define LOCAL_TIME_SYNC_PERIOD_S 60UL
 
-void obcTaskInitTimekeeper(void) {}
+#define RTC_TEMP_QUEUE_LENGTH 1
+#define RTC_TEMP_QUEUE_ITEM_SIZE sizeof(uint32_t)
+
+QueueHandle_t rtcTempQueueHandle = NULL;
+static StaticQueue_t rtcTempQueue;
+static uint32_t rtcTempQueueStack[RTC_TEMP_QUEUE_LENGTH];
+
+void obcTaskInitTimekeeper(void) {
+  ASSERT((rtcTempQueueStack != NULL) && (&rtcTempQueue != NULL));
+  if (rtcTempQueueHandle == NULL) {
+    rtcTempQueueHandle =
+        xQueueCreateStatic(RTC_TEMP_QUEUE_LENGTH, RTC_TEMP_QUEUE_ITEM_SIZE, rtcTempQueueStack, &rtcTempQueue);
+  }
+}
+
+obc_error_code_t postRtcTempQueue(uint32_t value) {
+  if (xQueueOverwrite(rtcTempQueueHandle, &value) != pdPASS) {
+    return OBC_ERR_CODE_UNKNOWN;
+  }
+  return OBC_ERR_CODE_INVALID_STATE;
+}
 
 void obcTaskFunctionTimekeeper(void *pvParameters) {
   /*

…ules/health_collector/health_collector.h obc/app/modules/thermal_mgr/thermal_mgr.hobc/app/modules/health_collector/health_collector.h renamed to obc/app/modules/thermal_mgr/thermal_mgr.h obc/app/modules/health_collector/health_collector.h renamed to obc/app/modules/thermal_mgr/thermal_mgr.h

@@ -1 +1,3 @@
 #pragma once
+
+extern QueueHandle_t rtcTempQueueHandle;