bugfixes

bsp_q7s/core/ObjectFactory.cpp

@@ -161,8 +161,10 @@ void ObjectFactory::produce(void* args) {
   BpxBatteryHandler* bpxHandler =
       new BpxBatteryHandler(objects::BPX_BATT_HANDLER, objects::I2C_COM_IF, bpxI2cCookie);
 #if OBSW_DEBUG_BPX_BATT == 1
-  bpxHandler->setStartUpImmediately();
   bpxHandler->setToGoToNormalMode(true);
+  bpxHandler->setStartUpImmediately();
+#else
+  static_cast<void>(bpxHandler);
 #endif
 #endif
 

fsfw

@@ -1 +1 @@
-Subproject commit 8f95b03e6a6dd321488aa5d60d28f20dddf7549a
+Subproject commit fca48257b7a156f4563d5a5a6ca71b0ab98bb9fc

generators/bsp_q7s_objects.csv

@@ -28,14 +28,14 @@
 0x44120313;GYRO_3_L3G_HANDLER
 0x44120350;RW4
 0x44130001;STAR_TRACKER
-0x44130045;GPS0_HANDLER
+0x44130045;GPS_CONTROLLER
-0x44130146;GPS1_HANDLER
 0x44140014;IMTQ_HANDLER
 0x442000A1;PCDU_HANDLER
 0x44250000;P60DOCK_HANDLER
 0x44250001;PDU1_HANDLER
 0x44250002;PDU2_HANDLER
 0x44250003;ACU_HANDLER
+0x44260000;BPX_BATT_HANDLER
 0x443200A5;RAD_SENSOR
 0x44330000;PLOC_UPDATER
 0x44330001;PLOC_MEMORY_DUMPER
@@ -75,11 +75,7 @@
 0x50000400;TMTC_POLLING_TASK
 0x50000500;FILE_SYSTEM_HANDLER
 0x50000600;PTME
-0x50000700;PAPB_VC0
+0x50000700;PDEC_HANDLER
-0x50000701;PAPB_VC1
-0x50000702;PAPB_VC2
-0x50000703;PAPB_VC3
-0x50000704;PDEC_HANDLER
 0x50000800;CCSDS_HANDLER
 0x51000500;PUS_SERVICE_6
 0x53000000;FSFW_OBJECTS_START
@@ -93,6 +89,7 @@
 0x53000020;PUS_SERVICE_20_PARAMETERS
 0x53000200;PUS_SERVICE_200_MODE_MGMT
 0x53000201;PUS_SERVICE_201_HEALTH
+0x53001000;CFDP_PACKET_DISTRIBUTOR
 0x53010000;HEALTH_TABLE
 0x53010100;MODE_STORE
 0x53030000;EVENT_MANAGER

generators/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief	Auto-generated object translation file.
  * @details
- * Contains 113 translations.
+ * Contains 110 translations.
- * Generated on: 2022-01-17 15:36:10
+ * Generated on: 2022-02-03 12:01:36
  */
 #include "translateObjects.h"
 
@@ -36,14 +36,14 @@ const char *MGM_3_RM3100_HANDLER_STRING = "MGM_3_RM3100_HANDLER";
 const char *GYRO_3_L3G_HANDLER_STRING = "GYRO_3_L3G_HANDLER";
 const char *RW4_STRING = "RW4";
 const char *STAR_TRACKER_STRING = "STAR_TRACKER";
-const char *GPS0_HANDLER_STRING = "GPS0_HANDLER";
+const char *GPS_CONTROLLER_STRING = "GPS_CONTROLLER";
-const char *GPS1_HANDLER_STRING = "GPS1_HANDLER";
 const char *IMTQ_HANDLER_STRING = "IMTQ_HANDLER";
 const char *PCDU_HANDLER_STRING = "PCDU_HANDLER";
 const char *P60DOCK_HANDLER_STRING = "P60DOCK_HANDLER";
 const char *PDU1_HANDLER_STRING = "PDU1_HANDLER";
 const char *PDU2_HANDLER_STRING = "PDU2_HANDLER";
 const char *ACU_HANDLER_STRING = "ACU_HANDLER";
+const char *BPX_BATT_HANDLER_STRING = "BPX_BATT_HANDLER";
 const char *RAD_SENSOR_STRING = "RAD_SENSOR";
 const char *PLOC_UPDATER_STRING = "PLOC_UPDATER";
 const char *PLOC_MEMORY_DUMPER_STRING = "PLOC_MEMORY_DUMPER";
@@ -83,10 +83,6 @@ const char *TMTC_BRIDGE_STRING = "TMTC_BRIDGE";
 const char *TMTC_POLLING_TASK_STRING = "TMTC_POLLING_TASK";
 const char *FILE_SYSTEM_HANDLER_STRING = "FILE_SYSTEM_HANDLER";
 const char *PTME_STRING = "PTME";
-const char *PAPB_VC0_STRING = "PAPB_VC0";
-const char *PAPB_VC1_STRING = "PAPB_VC1";
-const char *PAPB_VC2_STRING = "PAPB_VC2";
-const char *PAPB_VC3_STRING = "PAPB_VC3";
 const char *PDEC_HANDLER_STRING = "PDEC_HANDLER";
 const char *CCSDS_HANDLER_STRING = "CCSDS_HANDLER";
 const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6";
@@ -101,6 +97,7 @@ const char *PUS_SERVICE_17_TEST_STRING = "PUS_SERVICE_17_TEST";
 const char *PUS_SERVICE_20_PARAMETERS_STRING = "PUS_SERVICE_20_PARAMETERS";
 const char *PUS_SERVICE_200_MODE_MGMT_STRING = "PUS_SERVICE_200_MODE_MGMT";
 const char *PUS_SERVICE_201_HEALTH_STRING = "PUS_SERVICE_201_HEALTH";
+const char *CFDP_PACKET_DISTRIBUTOR_STRING = "CFDP_PACKET_DISTRIBUTOR";
 const char *HEALTH_TABLE_STRING = "HEALTH_TABLE";
 const char *MODE_STORE_STRING = "MODE_STORE";
 const char *EVENT_MANAGER_STRING = "EVENT_MANAGER";
@@ -183,9 +180,7 @@ const char* translateObject(object_id_t object) {
 	case 0x44130001:
 		return STAR_TRACKER_STRING;
 	case 0x44130045:
-		return GPS0_HANDLER_STRING;
+		return GPS_CONTROLLER_STRING;
-	case 0x44130146:
-		return GPS1_HANDLER_STRING;
 	case 0x44140014:
 		return IMTQ_HANDLER_STRING;
 	case 0x442000A1:
@@ -198,6 +193,8 @@ const char* translateObject(object_id_t object) {
 		return PDU2_HANDLER_STRING;
 	case 0x44250003:
 		return ACU_HANDLER_STRING;
+	case 0x44260000:
+		return BPX_BATT_HANDLER_STRING;
 	case 0x443200A5:
 		return RAD_SENSOR_STRING;
 	case 0x44330000:
@@ -277,14 +274,6 @@ const char* translateObject(object_id_t object) {
 	case 0x50000600:
 		return PTME_STRING;
 	case 0x50000700:
-		return PAPB_VC0_STRING;
-	case 0x50000701:
-		return PAPB_VC1_STRING;
-	case 0x50000702:
-		return PAPB_VC2_STRING;
-	case 0x50000703:
-		return PAPB_VC3_STRING;
-	case 0x50000704:
 		return PDEC_HANDLER_STRING;
 	case 0x50000800:
 		return CCSDS_HANDLER_STRING;
@@ -312,6 +301,8 @@ const char* translateObject(object_id_t object) {
 		return PUS_SERVICE_200_MODE_MGMT_STRING;
 	case 0x53000201:
 		return PUS_SERVICE_201_HEALTH_STRING;
+	case 0x53001000:
+		return CFDP_PACKET_DISTRIBUTOR_STRING;
 	case 0x53010000:
 		return HEALTH_TABLE_STRING;
 	case 0x53010100:

linux/fsfwconfig/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief	Auto-generated object translation file.
  * @details
- * Contains 113 translations.
+ * Contains 110 translations.
- * Generated on: 2022-01-17 15:36:10
+ * Generated on: 2022-02-03 12:01:36
  */
 #include "translateObjects.h"
 
@@ -36,14 +36,14 @@ const char *MGM_3_RM3100_HANDLER_STRING = "MGM_3_RM3100_HANDLER";
 const char *GYRO_3_L3G_HANDLER_STRING = "GYRO_3_L3G_HANDLER";
 const char *RW4_STRING = "RW4";
 const char *STAR_TRACKER_STRING = "STAR_TRACKER";
-const char *GPS0_HANDLER_STRING = "GPS0_HANDLER";
+const char *GPS_CONTROLLER_STRING = "GPS_CONTROLLER";
-const char *GPS1_HANDLER_STRING = "GPS1_HANDLER";
 const char *IMTQ_HANDLER_STRING = "IMTQ_HANDLER";
 const char *PCDU_HANDLER_STRING = "PCDU_HANDLER";
 const char *P60DOCK_HANDLER_STRING = "P60DOCK_HANDLER";
 const char *PDU1_HANDLER_STRING = "PDU1_HANDLER";
 const char *PDU2_HANDLER_STRING = "PDU2_HANDLER";
 const char *ACU_HANDLER_STRING = "ACU_HANDLER";
+const char *BPX_BATT_HANDLER_STRING = "BPX_BATT_HANDLER";
 const char *RAD_SENSOR_STRING = "RAD_SENSOR";
 const char *PLOC_UPDATER_STRING = "PLOC_UPDATER";
 const char *PLOC_MEMORY_DUMPER_STRING = "PLOC_MEMORY_DUMPER";
@@ -83,10 +83,6 @@ const char *TMTC_BRIDGE_STRING = "TMTC_BRIDGE";
 const char *TMTC_POLLING_TASK_STRING = "TMTC_POLLING_TASK";
 const char *FILE_SYSTEM_HANDLER_STRING = "FILE_SYSTEM_HANDLER";
 const char *PTME_STRING = "PTME";
-const char *PAPB_VC0_STRING = "PAPB_VC0";
-const char *PAPB_VC1_STRING = "PAPB_VC1";
-const char *PAPB_VC2_STRING = "PAPB_VC2";
-const char *PAPB_VC3_STRING = "PAPB_VC3";
 const char *PDEC_HANDLER_STRING = "PDEC_HANDLER";
 const char *CCSDS_HANDLER_STRING = "CCSDS_HANDLER";
 const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6";
@@ -101,6 +97,7 @@ const char *PUS_SERVICE_17_TEST_STRING = "PUS_SERVICE_17_TEST";
 const char *PUS_SERVICE_20_PARAMETERS_STRING = "PUS_SERVICE_20_PARAMETERS";
 const char *PUS_SERVICE_200_MODE_MGMT_STRING = "PUS_SERVICE_200_MODE_MGMT";
 const char *PUS_SERVICE_201_HEALTH_STRING = "PUS_SERVICE_201_HEALTH";
+const char *CFDP_PACKET_DISTRIBUTOR_STRING = "CFDP_PACKET_DISTRIBUTOR";
 const char *HEALTH_TABLE_STRING = "HEALTH_TABLE";
 const char *MODE_STORE_STRING = "MODE_STORE";
 const char *EVENT_MANAGER_STRING = "EVENT_MANAGER";
@@ -120,236 +117,230 @@ const char *TM_FUNNEL_STRING = "TM_FUNNEL";
 const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE";
 const char *NO_OBJECT_STRING = "NO_OBJECT";
 
-const char *translateObject(object_id_t object) {
+const char* translateObject(object_id_t object) {
-  switch ((object & 0xFFFFFFFF)) {
+	switch( (object & 0xFFFFFFFF) ) {
-    case 0x00005060:
+	case 0x00005060:
-      return P60DOCK_TEST_TASK_STRING;
+		return P60DOCK_TEST_TASK_STRING;
-    case 0x43000003:
+	case 0x43000003:
-      return CORE_CONTROLLER_STRING;
+		return CORE_CONTROLLER_STRING;
-    case 0x43100002:
+	case 0x43100002:
-      return ACS_CONTROLLER_STRING;
+		return ACS_CONTROLLER_STRING;
-    case 0x43400001:
+	case 0x43400001:
-      return THERMAL_CONTROLLER_STRING;
+		return THERMAL_CONTROLLER_STRING;
-    case 0x44120006:
+	case 0x44120006:
-      return MGM_0_LIS3_HANDLER_STRING;
+		return MGM_0_LIS3_HANDLER_STRING;
-    case 0x44120010:
+	case 0x44120010:
-      return GYRO_0_ADIS_HANDLER_STRING;
+		return GYRO_0_ADIS_HANDLER_STRING;
-    case 0x44120032:
+	case 0x44120032:
-      return SUS_1_STRING;
+		return SUS_1_STRING;
-    case 0x44120033:
+	case 0x44120033:
-      return SUS_2_STRING;
+		return SUS_2_STRING;
-    case 0x44120034:
+	case 0x44120034:
-      return SUS_3_STRING;
+		return SUS_3_STRING;
-    case 0x44120035:
+	case 0x44120035:
-      return SUS_4_STRING;
+		return SUS_4_STRING;
-    case 0x44120036:
+	case 0x44120036:
-      return SUS_5_STRING;
+		return SUS_5_STRING;
-    case 0x44120037:
+	case 0x44120037:
-      return SUS_6_STRING;
+		return SUS_6_STRING;
-    case 0x44120038:
+	case 0x44120038:
-      return SUS_7_STRING;
+		return SUS_7_STRING;
-    case 0x44120039:
+	case 0x44120039:
-      return SUS_8_STRING;
+		return SUS_8_STRING;
-    case 0x44120040:
+	case 0x44120040:
-      return SUS_9_STRING;
+		return SUS_9_STRING;
-    case 0x44120041:
+	case 0x44120041:
-      return SUS_10_STRING;
+		return SUS_10_STRING;
-    case 0x44120042:
+	case 0x44120042:
-      return SUS_11_STRING;
+		return SUS_11_STRING;
-    case 0x44120043:
+	case 0x44120043:
-      return SUS_12_STRING;
+		return SUS_12_STRING;
-    case 0x44120044:
+	case 0x44120044:
-      return SUS_13_STRING;
+		return SUS_13_STRING;
-    case 0x44120047:
+	case 0x44120047:
-      return RW1_STRING;
+		return RW1_STRING;
-    case 0x44120107:
+	case 0x44120107:
-      return MGM_1_RM3100_HANDLER_STRING;
+		return MGM_1_RM3100_HANDLER_STRING;
-    case 0x44120111:
+	case 0x44120111:
-      return GYRO_1_L3G_HANDLER_STRING;
+		return GYRO_1_L3G_HANDLER_STRING;
-    case 0x44120148:
+	case 0x44120148:
-      return RW2_STRING;
+		return RW2_STRING;
-    case 0x44120208:
+	case 0x44120208:
-      return MGM_2_LIS3_HANDLER_STRING;
+		return MGM_2_LIS3_HANDLER_STRING;
-    case 0x44120212:
+	case 0x44120212:
-      return GYRO_2_ADIS_HANDLER_STRING;
+		return GYRO_2_ADIS_HANDLER_STRING;
-    case 0x44120249:
+	case 0x44120249:
-      return RW3_STRING;
+		return RW3_STRING;
-    case 0x44120309:
+	case 0x44120309:
-      return MGM_3_RM3100_HANDLER_STRING;
+		return MGM_3_RM3100_HANDLER_STRING;
-    case 0x44120313:
+	case 0x44120313:
-      return GYRO_3_L3G_HANDLER_STRING;
+		return GYRO_3_L3G_HANDLER_STRING;
-    case 0x44120350:
+	case 0x44120350:
-      return RW4_STRING;
+		return RW4_STRING;
-    case 0x44130001:
+	case 0x44130001:
-      return STAR_TRACKER_STRING;
+		return STAR_TRACKER_STRING;
-    case 0x44130045:
+	case 0x44130045:
-      return GPS0_HANDLER_STRING;
+		return GPS_CONTROLLER_STRING;
-    case 0x44130146:
+	case 0x44140014:
-      return GPS1_HANDLER_STRING;
+		return IMTQ_HANDLER_STRING;
-    case 0x44140014:
+	case 0x442000A1:
-      return IMTQ_HANDLER_STRING;
+		return PCDU_HANDLER_STRING;
-    case 0x442000A1:
+	case 0x44250000:
-      return PCDU_HANDLER_STRING;
+		return P60DOCK_HANDLER_STRING;
-    case 0x44250000:
+	case 0x44250001:
-      return P60DOCK_HANDLER_STRING;
+		return PDU1_HANDLER_STRING;
-    case 0x44250001:
+	case 0x44250002:
-      return PDU1_HANDLER_STRING;
+		return PDU2_HANDLER_STRING;
-    case 0x44250002:
+	case 0x44250003:
-      return PDU2_HANDLER_STRING;
+		return ACU_HANDLER_STRING;
-    case 0x44250003:
+	case 0x44260000:
-      return ACU_HANDLER_STRING;
+		return BPX_BATT_HANDLER_STRING;
-    case 0x443200A5:
+	case 0x443200A5:
-      return RAD_SENSOR_STRING;
+		return RAD_SENSOR_STRING;
-    case 0x44330000:
+	case 0x44330000:
-      return PLOC_UPDATER_STRING;
+		return PLOC_UPDATER_STRING;
-    case 0x44330001:
+	case 0x44330001:
-      return PLOC_MEMORY_DUMPER_STRING;
+		return PLOC_MEMORY_DUMPER_STRING;
-    case 0x44330002:
+	case 0x44330002:
-      return STR_HELPER_STRING;
+		return STR_HELPER_STRING;
-    case 0x44330015:
+	case 0x44330015:
-      return PLOC_MPSOC_HANDLER_STRING;
+		return PLOC_MPSOC_HANDLER_STRING;
-    case 0x44330016:
+	case 0x44330016:
-      return PLOC_SUPERVISOR_HANDLER_STRING;
+		return PLOC_SUPERVISOR_HANDLER_STRING;
-    case 0x444100A2:
+	case 0x444100A2:
-      return SOLAR_ARRAY_DEPL_HANDLER_STRING;
+		return SOLAR_ARRAY_DEPL_HANDLER_STRING;
-    case 0x444100A4:
+	case 0x444100A4:
-      return HEATER_HANDLER_STRING;
+		return HEATER_HANDLER_STRING;
-    case 0x44420004:
+	case 0x44420004:
-      return TMP1075_HANDLER_1_STRING;
+		return TMP1075_HANDLER_1_STRING;
-    case 0x44420005:
+	case 0x44420005:
-      return TMP1075_HANDLER_2_STRING;
+		return TMP1075_HANDLER_2_STRING;
-    case 0x44420016:
+	case 0x44420016:
-      return RTD_IC_3_STRING;
+		return RTD_IC_3_STRING;
-    case 0x44420017:
+	case 0x44420017:
-      return RTD_IC_4_STRING;
+		return RTD_IC_4_STRING;
-    case 0x44420018:
+	case 0x44420018:
-      return RTD_IC_5_STRING;
+		return RTD_IC_5_STRING;
-    case 0x44420019:
+	case 0x44420019:
-      return RTD_IC_6_STRING;
+		return RTD_IC_6_STRING;
-    case 0x44420020:
+	case 0x44420020:
-      return RTD_IC_7_STRING;
+		return RTD_IC_7_STRING;
-    case 0x44420021:
+	case 0x44420021:
-      return RTD_IC_8_STRING;
+		return RTD_IC_8_STRING;
-    case 0x44420022:
+	case 0x44420022:
-      return RTD_IC_9_STRING;
+		return RTD_IC_9_STRING;
-    case 0x44420023:
+	case 0x44420023:
-      return RTD_IC_10_STRING;
+		return RTD_IC_10_STRING;
-    case 0x44420024:
+	case 0x44420024:
-      return RTD_IC_11_STRING;
+		return RTD_IC_11_STRING;
-    case 0x44420025:
+	case 0x44420025:
-      return RTD_IC_12_STRING;
+		return RTD_IC_12_STRING;
-    case 0x44420026:
+	case 0x44420026:
-      return RTD_IC_13_STRING;
+		return RTD_IC_13_STRING;
-    case 0x44420027:
+	case 0x44420027:
-      return RTD_IC_14_STRING;
+		return RTD_IC_14_STRING;
-    case 0x44420028:
+	case 0x44420028:
-      return RTD_IC_15_STRING;
+		return RTD_IC_15_STRING;
-    case 0x44420029:
+	case 0x44420029:
-      return RTD_IC_16_STRING;
+		return RTD_IC_16_STRING;
-    case 0x44420030:
+	case 0x44420030:
-      return RTD_IC_17_STRING;
+		return RTD_IC_17_STRING;
-    case 0x44420031:
+	case 0x44420031:
-      return RTD_IC_18_STRING;
+		return RTD_IC_18_STRING;
-    case 0x445300A3:
+	case 0x445300A3:
-      return SYRLINKS_HK_HANDLER_STRING;
+		return SYRLINKS_HK_HANDLER_STRING;
-    case 0x49000000:
+	case 0x49000000:
-      return ARDUINO_COM_IF_STRING;
+		return ARDUINO_COM_IF_STRING;
-    case 0x49010005:
+	case 0x49010005:
-      return GPIO_IF_STRING;
+		return GPIO_IF_STRING;
-    case 0x49020004:
+	case 0x49020004:
-      return SPI_COM_IF_STRING;
+		return SPI_COM_IF_STRING;
-    case 0x49030003:
+	case 0x49030003:
-      return UART_COM_IF_STRING;
+		return UART_COM_IF_STRING;
-    case 0x49040002:
+	case 0x49040002:
-      return I2C_COM_IF_STRING;
+		return I2C_COM_IF_STRING;
-    case 0x49050001:
+	case 0x49050001:
-      return CSP_COM_IF_STRING;
+		return CSP_COM_IF_STRING;
-    case 0x50000100:
+	case 0x50000100:
-      return CCSDS_PACKET_DISTRIBUTOR_STRING;
+		return CCSDS_PACKET_DISTRIBUTOR_STRING;
-    case 0x50000200:
+	case 0x50000200:
-      return PUS_PACKET_DISTRIBUTOR_STRING;
+		return PUS_PACKET_DISTRIBUTOR_STRING;
-    case 0x50000300:
+	case 0x50000300:
-      return TMTC_BRIDGE_STRING;
+		return TMTC_BRIDGE_STRING;
-    case 0x50000400:
+	case 0x50000400:
-      return TMTC_POLLING_TASK_STRING;
+		return TMTC_POLLING_TASK_STRING;
-    case 0x50000500:
+	case 0x50000500:
-      return FILE_SYSTEM_HANDLER_STRING;
+		return FILE_SYSTEM_HANDLER_STRING;
-    case 0x50000600:
+	case 0x50000600:
-      return PTME_STRING;
+		return PTME_STRING;
-    case 0x50000700:
+	case 0x50000700:
-      return PAPB_VC0_STRING;
+		return PDEC_HANDLER_STRING;
-    case 0x50000701:
+	case 0x50000800:
-      return PAPB_VC1_STRING;
+		return CCSDS_HANDLER_STRING;
-    case 0x50000702:
+	case 0x51000500:
-      return PAPB_VC2_STRING;
+		return PUS_SERVICE_6_STRING;
-    case 0x50000703:
+	case 0x53000000:
-      return PAPB_VC3_STRING;
+		return FSFW_OBJECTS_START_STRING;
-    case 0x50000704:
+	case 0x53000001:
-      return PDEC_HANDLER_STRING;
+		return PUS_SERVICE_1_VERIFICATION_STRING;
-    case 0x50000800:
+	case 0x53000002:
-      return CCSDS_HANDLER_STRING;
+		return PUS_SERVICE_2_DEVICE_ACCESS_STRING;
-    case 0x51000500:
+	case 0x53000003:
-      return PUS_SERVICE_6_STRING;
+		return PUS_SERVICE_3_HOUSEKEEPING_STRING;
-    case 0x53000000:
+	case 0x53000005:
-      return FSFW_OBJECTS_START_STRING;
+		return PUS_SERVICE_5_EVENT_REPORTING_STRING;
-    case 0x53000001:
+	case 0x53000008:
-      return PUS_SERVICE_1_VERIFICATION_STRING;
+		return PUS_SERVICE_8_FUNCTION_MGMT_STRING;
-    case 0x53000002:
+	case 0x53000009:
-      return PUS_SERVICE_2_DEVICE_ACCESS_STRING;
+		return PUS_SERVICE_9_TIME_MGMT_STRING;
-    case 0x53000003:
+	case 0x53000017:
-      return PUS_SERVICE_3_HOUSEKEEPING_STRING;
+		return PUS_SERVICE_17_TEST_STRING;
-    case 0x53000005:
+	case 0x53000020:
-      return PUS_SERVICE_5_EVENT_REPORTING_STRING;
+		return PUS_SERVICE_20_PARAMETERS_STRING;
-    case 0x53000008:
+	case 0x53000200:
-      return PUS_SERVICE_8_FUNCTION_MGMT_STRING;
+		return PUS_SERVICE_200_MODE_MGMT_STRING;
-    case 0x53000009:
+	case 0x53000201:
-      return PUS_SERVICE_9_TIME_MGMT_STRING;
+		return PUS_SERVICE_201_HEALTH_STRING;
-    case 0x53000017:
+	case 0x53001000:
-      return PUS_SERVICE_17_TEST_STRING;
+		return CFDP_PACKET_DISTRIBUTOR_STRING;
-    case 0x53000020:
+	case 0x53010000:
-      return PUS_SERVICE_20_PARAMETERS_STRING;
+		return HEALTH_TABLE_STRING;
-    case 0x53000200:
+	case 0x53010100:
-      return PUS_SERVICE_200_MODE_MGMT_STRING;
+		return MODE_STORE_STRING;
-    case 0x53000201:
+	case 0x53030000:
-      return PUS_SERVICE_201_HEALTH_STRING;
+		return EVENT_MANAGER_STRING;
-    case 0x53010000:
+	case 0x53040000:
-      return HEALTH_TABLE_STRING;
+		return INTERNAL_ERROR_REPORTER_STRING;
-    case 0x53010100:
+	case 0x534f0100:
-      return MODE_STORE_STRING;
+		return TC_STORE_STRING;
-    case 0x53030000:
+	case 0x534f0200:
-      return EVENT_MANAGER_STRING;
+		return TM_STORE_STRING;
-    case 0x53040000:
+	case 0x534f0300:
-      return INTERNAL_ERROR_REPORTER_STRING;
+		return IPC_STORE_STRING;
-    case 0x534f0100:
+	case 0x53500010:
-      return TC_STORE_STRING;
+		return TIME_STAMPER_STRING;
-    case 0x534f0200:
+	case 0x53ffffff:
-      return TM_STORE_STRING;
+		return FSFW_OBJECTS_END_STRING;
-    case 0x534f0300:
+	case 0x54000010:
-      return IPC_STORE_STRING;
+		return SPI_TEST_STRING;
-    case 0x53500010:
+	case 0x54000020:
-      return TIME_STAMPER_STRING;
+		return UART_TEST_STRING;
-    case 0x53ffffff:
+	case 0x5400AFFE:
-      return FSFW_OBJECTS_END_STRING;
+		return DUMMY_HANDLER_STRING;
-    case 0x54000010:
+	case 0x5400CAFE:
-      return SPI_TEST_STRING;
+		return DUMMY_INTERFACE_STRING;
-    case 0x54000020:
+	case 0x54123456:
-      return UART_TEST_STRING;
+		return LIBGPIOD_TEST_STRING;
-    case 0x5400AFFE:
+	case 0x54694269:
-      return DUMMY_HANDLER_STRING;
+		return TEST_TASK_STRING;
-    case 0x5400CAFE:
+	case 0x73000100:
-      return DUMMY_INTERFACE_STRING;
+		return TM_FUNNEL_STRING;
-    case 0x54123456:
+	case 0x73500000:
-      return LIBGPIOD_TEST_STRING;
+		return CCSDS_IP_CORE_BRIDGE_STRING;
-    case 0x54694269:
+	case 0xFFFFFFFF:
-      return TEST_TASK_STRING;
+		return NO_OBJECT_STRING;
-    case 0x73000100:
+	default:
-      return TM_FUNNEL_STRING;
+		return "UNKNOWN_OBJECT";
-    case 0x73500000:
+	}
-      return CCSDS_IP_CORE_BRIDGE_STRING;
+	return 0;
-    case 0xFFFFFFFF:
-      return NO_OBJECT_STRING;
-    default:
-      return "UNKNOWN_OBJECT";
-  }
-  return 0;
 }

mission/devices/BpxBatteryHandler.cpp

@@ -4,7 +4,8 @@
 #include <fsfw/datapool/PoolReadGuard.h>
 
 BpxBatteryHandler::BpxBatteryHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
-    : DeviceHandlerBase(objectId, comIF, comCookie), hkSet(this), cfgSet(this) {}
+    : DeviceHandlerBase(objectId, comIF, comCookie), hkSet(this), cfgSet(this) {
+}
 
 BpxBatteryHandler::~BpxBatteryHandler() {}
 
@@ -203,6 +204,9 @@ ReturnValue_t BpxBatteryHandler::interpretDeviceReply(DeviceCommandId_t id, cons
       if (packet[0] != sentPingByte) {
         return DeviceHandlerIF::INVALID_DATA;
       }
+      if(mode == _MODE_START_UP) {
+        commandExecuted = true;
+      }
       break;
     }
     case (BpxBattery::RESET_COUNTERS):

mission/devices/devicedefinitions/BpxBatteryDefinitions.h

@@ -38,8 +38,8 @@ static constexpr DeviceCommandId_t MAN_HEAT_OFF = 11;
 static constexpr uint8_t RESET_COUNTERS_MAGIC_VALUE = 0x42;
 static constexpr uint8_t DEFAULT_PING_SENT_BYTE = 0x07;
 
-static constexpr uint32_t HK_SET_ID = 0;
+static constexpr uint32_t HK_SET_ID = GET_HK;
-static constexpr uint32_t CFG_SET_ID = 1;
+static constexpr uint32_t CFG_SET_ID = CONFIG_GET;
 
 static constexpr uint8_t PORT_PING = 1;
 static constexpr uint8_t PORT_REBOOT = 4;
@@ -166,7 +166,6 @@ class BpxBatteryHk : public StaticLocalDataSet<BpxBattery::HK_ENTRIES> {
     return result;
   }
 
- private:
   //! Charge current in mA
   lp_var_t<uint16_t> chargeCurrent =
       lp_var_t<uint16_t>(sid.objectId, BpxBattery::HkPoolIds::CHARGE_CURRENT, this);
@@ -181,22 +180,24 @@ class BpxBatteryHk : public StaticLocalDataSet<BpxBattery::HK_ENTRIES> {
   lp_var_t<uint16_t> battVoltage =
       lp_var_t<uint16_t>(sid.objectId, BpxBattery::HkPoolIds::BATT_VOLTAGE, this);
   //! Battery temperature 1 in degC
-  SerializeElement<int16_t> battTemp1 =
+  lp_var_t<int16_t> battTemp1 =
       lp_var_t<int16_t>(sid.objectId, BpxBattery::HkPoolIds::BATT_TEMP_1, this);
   //! Battery temperature 2 in degC
-  SerializeElement<int16_t> battTemp2 =
+  lp_var_t<int16_t> battTemp2 =
       lp_var_t<int16_t>(sid.objectId, BpxBattery::HkPoolIds::BATT_TEMP_2, this);
   //! Battery temperature 3 in degC
-  SerializeElement<int16_t> battTemp3 =
+  lp_var_t<int16_t> battTemp3 =
       lp_var_t<int16_t>(sid.objectId, BpxBattery::HkPoolIds::BATT_TEMP_3, this);
   //! Battery temperature 4 in degC
-  SerializeElement<int16_t> battTemp4 =
+  lp_var_t<int16_t> battTemp4 =
       lp_var_t<int16_t>(sid.objectId, BpxBattery::HkPoolIds::BATT_TEMP_4, this);
-  SerializeElement<uint32_t> rebootCounter =
+  lp_var_t<uint32_t> rebootCounter =
       lp_var_t<uint32_t>(sid.objectId, BpxBattery::HkPoolIds::REBOOT_COUNTER, this);
-  SerializeElement<uint8_t> bootcause =
+  lp_var_t<uint8_t> bootcause =
       lp_var_t<uint8_t>(sid.objectId, BpxBattery::HkPoolIds::BOOTCAUSE, this);
 
+ private:
+
   friend class BpxBatteryHandler;
   /**
    * Constructor for data creator