merged develop

common/config/commonSubsystemIds.h

@@ -6,24 +6,31 @@
 namespace SUBSYSTEM_ID {
 enum: uint8_t {
 	COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	PCDU_HANDLER = 108,
-	HEATER_HANDLER = 109,
-	SA_DEPL_HANDLER = 110,
-	PLOC_MPSOC_HANDLER = 111,
-	IMTQ_HANDLER = 112,
-	RW_HANDLER = 113,
-	STR_HANDLER = 114,
-	PLOC_SUPERVISOR_HANDLER = 115,
-	FILE_SYSTEM = 116,
-	PLOC_SUPV_HELPER = 117,
-	PLOC_MEMORY_DUMPER = 118,
-	PDEC_HANDLER = 119,
-	STR_HELPER = 120,
-	PLOC_MPSOC_HELPER = 121,
-	PL_PCDU_HANDLER = 122,
-	ACS_BOARD_ASS = 123,
-	SUS_BOARD_ASS = 124,
-	TCS_BOARD_ASS = 125,
+	ACS_SUBSYSTEM = 112,
+	PCDU_HANDLER = 113,
+	HEATER_HANDLER = 114,
+	SA_DEPL_HANDLER = 115,
+	PLOC_MPSOC_HANDLER = 116,
+	IMTQ_HANDLER = 117,
+	RW_HANDLER = 118,
+	STR_HANDLER = 119,
+	PLOC_SUPERVISOR_HANDLER = 120,
+	FILE_SYSTEM = 121,
+	PLOC_UPDATER = 122,
+	PLOC_MEMORY_DUMPER = 123,
+	PDEC_HANDLER = 124,
+	STR_HELPER = 125,
+	PLOC_MPSOC_HELPER = 126,
+	PL_PCDU_HANDLER = 127,
+	ACS_BOARD_ASS = 128,
+	SUS_BOARD_ASS = 129,
+	TCS_BOARD_ASS = 130,
+	GPS_HANDLER = 131,
+	P60_DOCK_HANDLER = 132,
+	PDU1_HANDLER = 133,
+	PDU2_HANDLER = 134,
+	ACU_HANDLER = 135,
+	PLOC_SUPV_HELPER = 136,
 	COMMON_SUBSYSTEM_ID_END
 };
 }

common/config/devices/powerSwitcherList.h

@@ -1,72 +1,6 @@
 #ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 #define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 
-#include "OBSWConfig.h"
-
-#include <fsfw/power/definitions.h>
-
-#include <array>
-#include <cstdint>
-
-namespace pcduSwitches {
-
-/* Switches are uint8_t datatype and go from 0 to 255 */
-enum Switches: power::Switch_t {
-  PDU1_CH0_TCS_BOARD_3V3,
-  PDU1_CH1_SYRLINKS_12V,
-  PDU1_CH2_STAR_TRACKER_5V,
-  PDU1_CH3_MGT_5V,
-  PDU1_CH4_SUS_NOMINAL_3V3,
-  PDU1_CH5_SOLAR_CELL_EXP_5V,
-  PDU1_CH6_PLOC_12V,
-  PDU1_CH7_ACS_A_SIDE_3V3,
-  PDU1_CH8_UNOCCUPIED,
-
-  PDU2_CH0_Q7S,
-  PDU2_CH1_PL_PCDU_BATT_0_14V8,
-  PDU2_CH2_RW_5V,
-  PDU2_CH3_TCS_BOARD_HEATER_IN_8V,
-  PDU2_CH4_SUS_REDUNDANT_3V3,
-  PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
-  PDU2_CH6_PL_PCDU_BATT_1_14V8,
-  PDU2_CH7_ACS_BOARD_SIDE_B_3V3,
-  PDU2_CH8_PAYLOAD_CAMERA,
-  NUMBER_OF_SWITCHES
-};
-
-static const uint8_t ON = 1;
-static const uint8_t OFF = 0;
-
-// Output states after reboot of the PDUs
-
-const std::array<uint8_t, NUMBER_OF_SWITCHES> INIT_SWITCH_STATES = {
-    // PDU 1
-// Because the TE0720 is not connected to the PCDU, this switch is always on
-#ifdef TE0720_1CFA
-    ON,
-#else
-    OFF,
-#endif
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-
-    // PDU 2
-    ON,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF
-};
-}
+#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 
 #endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */