fixed merge conflicts

common/config/CMakeLists.txt

@@ -1,3 +1,7 @@
 target_include_directories(${TARGET_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(${TARGET_NAME} PRIVATE
+    commonConfig.cpp
 )

common/config/commonConfig.cpp

@@ -0,0 +1,5 @@
+#include "commonConfig.h"
+#include "tmtc/apid.h"
+#include "fsfw/tmtcpacket/SpacePacket.h"
+
+const uint16_t common::TC_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

common/config/commonConfig.h.in

@@ -1,11 +1,14 @@
 #ifndef COMMON_CONFIG_COMMONCONFIG_H_
 #define COMMON_CONFIG_COMMONCONFIG_H_
 
+#include <cstdint>
+
 #define OBSW_ADD_LWGPS_TEST             0
 
+// Disable this for mission code. It allows exchanging TMTC packets via the Ethernet port
+#define OBSW_ADD_TCPIP_BRIDGE           1
 // Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
 // because UDP packets are not allowed in the VPN
-#define OBSW_USE_TMTC_TCP_BRIDGE        1
 // This will cause the OBSW to initialize the TMTC bridge responsible for exchanging data with the
 // CCSDS IP Cores. 
 #define OBSW_USE_CCSDS_IP_CORE		 	1
@@ -13,5 +16,10 @@
 #define OBSW_TM_TO_PTME 				1
 // Set to 1 if telecommands are received via the PDEC IP Core
 #define OBSW_TC_FROM_PDEC			    0
+#define OBSW_USE_TCP_BRIDGE             1
+
+namespace common {
+extern const uint16_t TC_PACKET_ID;
+}
 
 #endif /* COMMON_CONFIG_COMMONCONFIG_H_ */

common/config/devices/powerSwitcherList.h

@@ -0,0 +1,60 @@
+#ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
+#define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
+
+#include "OBSWConfig.h"
+
+#include <cstdint>
+
+namespace pcduSwitches {
+	/* Switches are uint8_t datatype and go from 0 to 255 */
+	enum SwitcherList: uint8_t {
+	    Q7S,
+        PAYLOAD_PCDU_CH1,
+        RW,
+        TCS_BOARD_8V_HEATER_IN,
+        SUS_REDUNDANT,
+        DEPLOYMENT_MECHANISM,
+        PAYLOAD_PCDU_CH6,
+        ACS_BOARD_SIDE_B,
+        PAYLOAD_CAMERA,
+        TCS_BOARD_3V3,
+        SYRLINKS,
+        STAR_TRACKER,
+        MGT,
+        SUS_NOMINAL,
+        SOLAR_CELL_EXP,
+        PLOC,
+        ACS_BOARD_SIDE_A,
+        NUMBER_OF_SWITCHES
+	};
+
+	static const uint8_t ON = 1;
+	static const uint8_t OFF = 0;
+
+	/* Output states after reboot of the PDUs */
+	static const uint8_t INIT_STATE_Q7S = ON;
+	static const uint8_t INIT_STATE_PAYLOAD_PCDU_CH1 = OFF;
+	static const uint8_t INIT_STATE_RW = OFF;
+#if BOARD_TE0720 == 1
+	/* Because the TE0720 is not connected to the PCDU, this switch is always on */
+	static const uint8_t INIT_STATE_TCS_BOARD_8V_HEATER_IN = ON;
+#else
+	static const uint8_t INIT_STATE_TCS_BOARD_8V_HEATER_IN = OFF;
+#endif
+	static const uint8_t INIT_STATE_SUS_REDUNDANT = OFF;
+	static const uint8_t INIT_STATE_DEPLOYMENT_MECHANISM = OFF;
+	static const uint8_t INIT_STATE_PAYLOAD_PCDU_CH6 = OFF;
+	static const uint8_t INIT_STATE_ACS_BOARD_SIDE_B = OFF;
+	static const uint8_t INIT_STATE_PAYLOAD_CAMERA = OFF;
+	static const uint8_t INIT_STATE_TCS_BOARD_3V3 = OFF;
+	static const uint8_t INIT_STATE_SYRLINKS = OFF;
+	static const uint8_t INIT_STATE_STAR_TRACKER = OFF;
+	static const uint8_t INIT_STATE_MGT = OFF;
+	static const uint8_t INIT_STATE_SUS_NOMINAL = OFF;
+	static const uint8_t INIT_STATE_SOLAR_CELL_EXP = OFF;
+	static const uint8_t INIT_STATE_PLOC = OFF;
+	static const uint8_t INIT_STATE_ACS_BOARD_SIDE_A = OFF;
+}
+
+
+#endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */

common/config/tmtc/apid.h

@@ -0,0 +1,19 @@
+#ifndef FSFWCONFIG_TMTC_APID_H_
+#define FSFWCONFIG_TMTC_APID_H_
+
+#include <cstdint>
+
+/**
+ * Application Process Definition: entity, uniquely identified by an
+ * application process ID (APID), capable of generating telemetry source
+ * packets and receiving telecommand packets
+ *
+ * EIVE APID: 0x65 / 101 / e
+ * APID is a 11 bit number
+ */
+namespace apid {
+	static const uint16_t EIVE_OBSW = 0x65;
+}
+
+
+#endif /* FSFWCONFIG_TMTC_APID_H_ */