Merge remote-tracking branch 'origin/develop' into mueller/tcs_subsystem

generators/bsp_q7s_objects.csv

@@ -50,8 +50,12 @@
 0x44330032;SCEX
 0x444100A2;SOLAR_ARRAY_DEPL_HANDLER
 0x444100A4;HEATER_HANDLER
-0x44420004;TMP1075_HANDLER_1
-0x44420005;TMP1075_HANDLER_2
+0x44420004;TMP1075_HANDLER_TCS_0
+0x44420005;TMP1075_HANDLER_TCS_1
+0x44420006;TMP1075_HANDLER_PLPCDU_0
+0x44420007;TMP1075_HANDLER_PLPCDU_1
+0x44420008;TMP1075_HANDLER_IF_BOARD
+0x44420009;TMP1075_HANDLER_OBC_IF_BOARD
 0x44420016;RTD_0_IC3_PLOC_HEATSPREADER
 0x44420017;RTD_1_IC4_PLOC_MISSIONBOARD
 0x44420018;RTD_2_IC5_4K_CAMERA

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 234 translations.
  * @details
- * Generated on: 2022-11-10 18:07:26
+ * Generated on: 2022-11-14 17:10:10
  */
 #include "translateEvents.h"
 

generators/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief  Auto-generated object translation file.
  * @details
- * Contains 144 translations.
- * Generated on: 2022-11-10 18:07:26
+ * Contains 148 translations.
+ * Generated on: 2022-11-14 17:10:10
  */
 #include "translateObjects.h"
 
@@ -58,8 +58,12 @@ const char *PLOC_SUPERVISOR_HELPER_STRING = "PLOC_SUPERVISOR_HELPER";
 const char *SCEX_STRING = "SCEX";
 const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER";
 const char *HEATER_HANDLER_STRING = "HEATER_HANDLER";
-const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1";
-const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2";
+const char *TMP1075_HANDLER_TCS_0_STRING = "TMP1075_HANDLER_TCS_0";
+const char *TMP1075_HANDLER_TCS_1_STRING = "TMP1075_HANDLER_TCS_1";
+const char *TMP1075_HANDLER_PLPCDU_0_STRING = "TMP1075_HANDLER_PLPCDU_0";
+const char *TMP1075_HANDLER_PLPCDU_1_STRING = "TMP1075_HANDLER_PLPCDU_1";
+const char *TMP1075_HANDLER_IF_BOARD_STRING = "TMP1075_HANDLER_IF_BOARD";
+const char *TMP1075_HANDLER_OBC_IF_BOARD_STRING = "TMP1075_HANDLER_OBC_IF_BOARD";
 const char *RTD_0_IC3_PLOC_HEATSPREADER_STRING = "RTD_0_IC3_PLOC_HEATSPREADER";
 const char *RTD_1_IC4_PLOC_MISSIONBOARD_STRING = "RTD_1_IC4_PLOC_MISSIONBOARD";
 const char *RTD_2_IC5_4K_CAMERA_STRING = "RTD_2_IC5_4K_CAMERA";
@@ -258,9 +262,17 @@ const char *translateObject(object_id_t object) {
     case 0x444100A4:
       return HEATER_HANDLER_STRING;
     case 0x44420004:
-      return TMP1075_HANDLER_1_STRING;
+      return TMP1075_HANDLER_TCS_0_STRING;
     case 0x44420005:
-      return TMP1075_HANDLER_2_STRING;
+      return TMP1075_HANDLER_TCS_1_STRING;
+    case 0x44420006:
+      return TMP1075_HANDLER_PLPCDU_0_STRING;
+    case 0x44420007:
+      return TMP1075_HANDLER_PLPCDU_1_STRING;
+    case 0x44420008:
+      return TMP1075_HANDLER_IF_BOARD_STRING;
+    case 0x44420009:
+      return TMP1075_HANDLER_OBC_IF_BOARD_STRING;
     case 0x44420016:
       return RTD_0_IC3_PLOC_HEATSPREADER_STRING;
     case 0x44420017:

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 234 translations.
  * @details
- * Generated on: 2022-11-10 18:07:26
+ * Generated on: 2022-11-14 17:10:10
  */
 #include "translateEvents.h"
 

linux/fsfwconfig/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief  Auto-generated object translation file.
  * @details
- * Contains 144 translations.
- * Generated on: 2022-11-10 18:07:26
+ * Contains 148 translations.
+ * Generated on: 2022-11-14 17:10:10
  */
 #include "translateObjects.h"
 
@@ -58,8 +58,12 @@ const char *PLOC_SUPERVISOR_HELPER_STRING = "PLOC_SUPERVISOR_HELPER";
 const char *SCEX_STRING = "SCEX";
 const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER";
 const char *HEATER_HANDLER_STRING = "HEATER_HANDLER";
-const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1";
-const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2";
+const char *TMP1075_HANDLER_TCS_0_STRING = "TMP1075_HANDLER_TCS_0";
+const char *TMP1075_HANDLER_TCS_1_STRING = "TMP1075_HANDLER_TCS_1";
+const char *TMP1075_HANDLER_PLPCDU_0_STRING = "TMP1075_HANDLER_PLPCDU_0";
+const char *TMP1075_HANDLER_PLPCDU_1_STRING = "TMP1075_HANDLER_PLPCDU_1";
+const char *TMP1075_HANDLER_IF_BOARD_STRING = "TMP1075_HANDLER_IF_BOARD";
+const char *TMP1075_HANDLER_OBC_IF_BOARD_STRING = "TMP1075_HANDLER_OBC_IF_BOARD";
 const char *RTD_0_IC3_PLOC_HEATSPREADER_STRING = "RTD_0_IC3_PLOC_HEATSPREADER";
 const char *RTD_1_IC4_PLOC_MISSIONBOARD_STRING = "RTD_1_IC4_PLOC_MISSIONBOARD";
 const char *RTD_2_IC5_4K_CAMERA_STRING = "RTD_2_IC5_4K_CAMERA";
@@ -258,9 +262,17 @@ const char *translateObject(object_id_t object) {
     case 0x444100A4:
       return HEATER_HANDLER_STRING;
     case 0x44420004:
-      return TMP1075_HANDLER_1_STRING;
+      return TMP1075_HANDLER_TCS_0_STRING;
     case 0x44420005:
-      return TMP1075_HANDLER_2_STRING;
+      return TMP1075_HANDLER_TCS_1_STRING;
+    case 0x44420006:
+      return TMP1075_HANDLER_PLPCDU_0_STRING;
+    case 0x44420007:
+      return TMP1075_HANDLER_PLPCDU_1_STRING;
+    case 0x44420008:
+      return TMP1075_HANDLER_IF_BOARD_STRING;
+    case 0x44420009:
+      return TMP1075_HANDLER_OBC_IF_BOARD_STRING;
     case 0x44420016:
       return RTD_0_IC3_PLOC_HEATSPREADER_STRING;
     case 0x44420017:

mission/controller/controllerdefinitions/ThermalControllerDefinitions.h

@@ -78,7 +78,7 @@ enum PoolIds : lp_id_t {
   TEMP_ADC_PAYLOAD_PCDU
 };
 
-static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 18;
+static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 25;
 static const uint8_t ENTRIES_DEVICE_TEMPERATURE_SET = 25;
 static const uint8_t ENTRIES_SUS_TEMPERATURE_SET = 12;
 

tmtc

@@ -1 +1 @@
-Subproject commit 89285ad511ef11582b67b307c3840a09efd0577a
+Subproject commit 66a1362e7e977e427a66fd3176a9e7b6bc1b5998