fixed merge conflicts

2021-12-14 19:57:35 +01:00
parent 58074f9bfd 9983acf98b
commit 5067519b8a
23 changed files with 283 additions and 240 deletions
--- a/common/config/devices/heaterSwitcherList.h
+++ b/common/config/devices/heaterSwitcherList.h
@ -0,0 +1,20 @@
+#ifndef FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_
+#define FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_
+
+#include <cstdint>
+
+namespace heaterSwitches {
+	enum switcherList: uint8_t {
+		HEATER_0,
+		HEATER_1,
+		HEATER_2,
+		HEATER_3,
+		HEATER_4,
+		HEATER_5,
+		HEATER_6,
+		HEATER_7,
+		NUMBER_OF_SWITCHES
+	};
+}
+
+#endif /* FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ */