Merge remote-tracking branch 'origin/develop' into thermal_controller

bsp_hosted/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 276 translations.
  * @details
- * Generated on: 2023-03-14 14:16:07
+ * Generated on: 2023-03-14 14:24:51
  */
 #include "translateEvents.h"
 
@@ -35,11 +35,11 @@ const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
 const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
 const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
 const char *DEVICE_WANTS_HARD_REBOOT_STRING = "DEVICE_WANTS_HARD_REBOOT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
 const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
 const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
 const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
+const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *HEATER_ON_STRING = "HEATER_ON";
 const char *HEATER_OFF_STRING = "HEATER_OFF";
 const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
@@ -339,16 +339,16 @@ const char *translateEvents(Event event) {
       return MONITORING_AMBIGUOUS_STRING;
     case (2811):
       return DEVICE_WANTS_HARD_REBOOT_STRING;
+    case (4201):
+      return FUSE_CURRENT_HIGH_STRING;
+    case (4202):
+      return FUSE_WENT_OFF_STRING;
+    case (4204):
+      return POWER_ABOVE_HIGH_LIMIT_STRING;
+    case (4205):
+      return POWER_BELOW_LOW_LIMIT_STRING;
     case (4300):
       return SWITCH_WENT_OFF_STRING;
-    case (4301):
-      return FUSE_CURRENT_HIGH_STRING;
-    case (4302):
-      return FUSE_WENT_OFF_STRING;
-    case (4304):
-      return POWER_ABOVE_HIGH_LIMIT_STRING;
-    case (4305):
-      return POWER_BELOW_LOW_LIMIT_STRING;
     case (5000):
       return HEATER_ON_STRING;
     case (5001):

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 169 translations.
- * Generated on: 2023-03-14 14:16:07
+ * Generated on: 2023-03-14 14:24:51
  */
 #include "translateObjects.h"
 

fsfw

@@ -1 +1 @@
-Subproject commit 0973ba6bf2679eb38424b5c10db47f8d11f00ea8
+Subproject commit 8382d61b9206c0259439eeddcad3759f1cd9bd2f

generators/bsp_hosted_events.csv

@@ -29,11 +29,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+4201;0x1069;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4202;0x106a;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 4300;0x10cc;SWITCH_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/PowerSwitchIF.h
-4301;0x10cd;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4302;0x10ce;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4304;0x10d0;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4305;0x10d1;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 5000;0x1388;HEATER_ON;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5001;0x1389;HEATER_OFF;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5002;0x138a;HEATER_TIMEOUT;LOW;No description;fsfw/src/fsfw/thermal/Heater.h

generators/bsp_hosted_returnvalues.csv

@@ -234,7 +234,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0502;PS_SwitchTimeout;No description;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0503;PS_FuseOn;No description;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0504;PS_FuseOff;No description;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x0505;PS_SwitchUnknown;No description;5;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x3b00;SPH_ConnBroken;No description;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
 0x2a01;IEC_NoConfigurationTable;No description;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
 0x2a02;IEC_NoCpuTable;No description;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h

generators/bsp_q7s_events.csv

@@ -29,11 +29,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+4201;0x1069;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4202;0x106a;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 4300;0x10cc;SWITCH_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/PowerSwitchIF.h
-4301;0x10cd;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4302;0x10ce;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4304;0x10d0;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4305;0x10d1;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 5000;0x1388;HEATER_ON;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5001;0x1389;HEATER_OFF;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5002;0x138a;HEATER_TIMEOUT;LOW;No description;fsfw/src/fsfw/thermal/Heater.h

generators/bsp_q7s_returnvalues.csv

@@ -234,7 +234,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0502;PS_SwitchTimeout;No description;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0503;PS_FuseOn;No description;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0504;PS_FuseOff;No description;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x0505;PS_SwitchUnknown;No description;5;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x3b00;SPH_ConnBroken;No description;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
 0x2a01;IEC_NoConfigurationTable;No description;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
 0x2a02;IEC_NoCpuTable;No description;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 276 translations.
  * @details
- * Generated on: 2023-03-14 14:16:07
+ * Generated on: 2023-03-14 14:24:51
  */
 #include "translateEvents.h"
 
@@ -35,11 +35,11 @@ const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
 const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
 const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
 const char *DEVICE_WANTS_HARD_REBOOT_STRING = "DEVICE_WANTS_HARD_REBOOT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
 const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
 const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
 const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
+const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *HEATER_ON_STRING = "HEATER_ON";
 const char *HEATER_OFF_STRING = "HEATER_OFF";
 const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
@@ -339,16 +339,16 @@ const char *translateEvents(Event event) {
       return MONITORING_AMBIGUOUS_STRING;
     case (2811):
       return DEVICE_WANTS_HARD_REBOOT_STRING;
+    case (4201):
+      return FUSE_CURRENT_HIGH_STRING;
+    case (4202):
+      return FUSE_WENT_OFF_STRING;
+    case (4204):
+      return POWER_ABOVE_HIGH_LIMIT_STRING;
+    case (4205):
+      return POWER_BELOW_LOW_LIMIT_STRING;
     case (4300):
       return SWITCH_WENT_OFF_STRING;
-    case (4301):
-      return FUSE_CURRENT_HIGH_STRING;
-    case (4302):
-      return FUSE_WENT_OFF_STRING;
-    case (4304):
-      return POWER_ABOVE_HIGH_LIMIT_STRING;
-    case (4305):
-      return POWER_BELOW_LOW_LIMIT_STRING;
     case (5000):
       return HEATER_ON_STRING;
     case (5001):

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-14 14:16:07
+ * Generated on: 2023-03-14 14:24:51
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 276 translations.
  * @details
- * Generated on: 2023-03-14 14:16:07
+ * Generated on: 2023-03-14 14:24:51
  */
 #include "translateEvents.h"
 
@@ -35,11 +35,11 @@ const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
 const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
 const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
 const char *DEVICE_WANTS_HARD_REBOOT_STRING = "DEVICE_WANTS_HARD_REBOOT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
 const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
 const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
 const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
+const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *HEATER_ON_STRING = "HEATER_ON";
 const char *HEATER_OFF_STRING = "HEATER_OFF";
 const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
@@ -339,16 +339,16 @@ const char *translateEvents(Event event) {
       return MONITORING_AMBIGUOUS_STRING;
     case (2811):
       return DEVICE_WANTS_HARD_REBOOT_STRING;
+    case (4201):
+      return FUSE_CURRENT_HIGH_STRING;
+    case (4202):
+      return FUSE_WENT_OFF_STRING;
+    case (4204):
+      return POWER_ABOVE_HIGH_LIMIT_STRING;
+    case (4205):
+      return POWER_BELOW_LOW_LIMIT_STRING;
     case (4300):
       return SWITCH_WENT_OFF_STRING;
-    case (4301):
-      return FUSE_CURRENT_HIGH_STRING;
-    case (4302):
-      return FUSE_WENT_OFF_STRING;
-    case (4304):
-      return POWER_ABOVE_HIGH_LIMIT_STRING;
-    case (4305):
-      return POWER_BELOW_LOW_LIMIT_STRING;
     case (5000):
       return HEATER_ON_STRING;
     case (5001):

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-14 14:16:07
+ * Generated on: 2023-03-14 14:24:51
  */
 #include "translateObjects.h"
 

thirdparty/lwgps

@@ -1 +1 @@
-Subproject commit 22d865662eb7be6c9849275da9166f6b410f906a
+Subproject commit 18ce34faf729ed63c94517b2ae6a3d3741e0a054

tmtc

@@ -1 +1 @@
-Subproject commit 98617b5ce543aae0fe500d426fff5c89d06a5d13
+Subproject commit 99d2c0e0ca7718887827a2de2757d73b86ea9230