fixed merge conflicts

2021-10-29 18:43:01 +02:00
parent 3144514338
commit 608644f5f1
22 changed files with 403 additions and 5 deletions
--- a/unittest/testcfg/devices/logicalAddresses.h
+++ b/unittest/testcfg/devices/logicalAddresses.h
@ -0,0 +1,15 @@
+#ifndef CONFIG_DEVICES_LOGICALADDRESSES_H_
+#define CONFIG_DEVICES_LOGICALADDRESSES_H_
+
+#include <fsfw/devicehandlers/CookieIF.h>
+#include <fsfw/unittest/config/objects/systemObjectList.h>
+#include <cstdint>
+
+namespace addresses {
+	/* Logical addresses have uint32_t datatype */
+	enum logicalAddresses: address_t {
+	};
+}
+
+
+#endif /* CONFIG_DEVICES_LOGICALADDRESSES_H_ */