From 52d8ae5ffb94d72f43bcabd3e3776121f61f075c Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Dec 2021 17:23:35 +0100
Subject: [PATCH] compiling for windows again

---
 CMakeLists.txt                                               | 2 +-
 fsfw                                                         | 2 +-
 linux/devices/CMakeLists.txt                                 | 1 +
 {mission => linux}/devices/StarTrackerHandler.cpp            | 0
 {mission => linux}/devices/StarTrackerHandler.h              | 0
 .../devices/devicedefinitions/StarTrackerDefinitions.h       | 0
 misc/eclipse/.cproject                                       | 5 ++++-
 misc/eclipse/Host/eive-mingw-debug-cmake.launch              | 2 +-
 mission/devices/CMakeLists.txt                               | 1 -
 mission/devices/RwHandler.cpp                                | 4 ++--
 mission/devices/devicedefinitions/RwDefinitions.h            | 2 +-
 11 files changed, 11 insertions(+), 8 deletions(-)
 rename {mission => linux}/devices/StarTrackerHandler.cpp (100%)
 rename {mission => linux}/devices/StarTrackerHandler.h (100%)
 rename {mission => linux}/devices/devicedefinitions/StarTrackerDefinitions.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d76f2fb..59d9d32d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,7 @@ endif()
 if(NOT EIVE_BUILD_WATCHDOG)
     if(NOT EIVE_BUILD_UNITTESTS)  
         if(EIVE_ADD_LINUX_FILES)
+            add_subdirectory(${LIB_ARCSEC_PATH})
             add_subdirectory(${LINUX_PATH})
         endif()
         add_subdirectory(${BSP_PATH})
@@ -192,7 +193,6 @@ if((NOT BUILD_Q7S_SIMPLE_MODE) AND (NOT EIVE_BUILD_WATCHDOG))
     add_subdirectory(${FSFW_PATH})
     add_subdirectory(${MISSION_PATH})
     add_subdirectory(${TEST_PATH})
-    add_subdirectory(${LIB_ARCSEC_PATH})
 endif()
 
 if(EIVE_BUILD_UNITTESTS)
diff --git a/fsfw b/fsfw
index ceb87b5a..e4999fe0 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit ceb87b5abb2992a18266328e0ea34d9af15db7af
+Subproject commit e4999fe01c0446f9820ceede55be3970aa22bbad
diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt
index 3871a6a6..6c529d8e 100644
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@@ -2,4 +2,5 @@ target_sources(${TARGET_NAME} PRIVATE
 	HeaterHandler.cpp
 	SolarArrayDeploymentHandler.cpp
 	SusHandler.cpp
+	StarTrackerHandler.cpp
 )
diff --git a/mission/devices/StarTrackerHandler.cpp b/linux/devices/StarTrackerHandler.cpp
similarity index 100%
rename from mission/devices/StarTrackerHandler.cpp
rename to linux/devices/StarTrackerHandler.cpp
diff --git a/mission/devices/StarTrackerHandler.h b/linux/devices/StarTrackerHandler.h
similarity index 100%
rename from mission/devices/StarTrackerHandler.h
rename to linux/devices/StarTrackerHandler.h
diff --git a/mission/devices/devicedefinitions/StarTrackerDefinitions.h b/linux/devices/devicedefinitions/StarTrackerDefinitions.h
similarity index 100%
rename from mission/devices/devicedefinitions/StarTrackerDefinitions.h
rename to linux/devices/devicedefinitions/StarTrackerDefinitions.h
diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject
index 7d7c4c09..3bab5367 100644
--- a/misc/eclipse/.cproject
+++ b/misc/eclipse/.cproject
@@ -19,7 +19,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.1176904738" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64" id="cdt.managedbuild.target.gnu.platform.mingw.base.1087094604" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-							<builder arguments="--build ." buildPath="${workspace_loc:/eive_obsw/Debug-Host}" command="cmake" id="cdt.managedbuild.builder.gnu.cross.1026777292" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<builder arguments="--build . -j" buildPath="${workspace_loc:/eive-obsw/build-Debug-Host}" command="cmake" id="cdt.managedbuild.builder.gnu.cross.1026777292" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.813737526" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.596367416" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
@@ -406,6 +406,9 @@
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.autotools.core.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
diff --git a/misc/eclipse/Host/eive-mingw-debug-cmake.launch b/misc/eclipse/Host/eive-mingw-debug-cmake.launch
index 0dddc60f..9109d83c 100644
--- a/misc/eclipse/Host/eive-mingw-debug-cmake.launch
+++ b/misc/eclipse/Host/eive-mingw-debug-cmake.launch
@@ -18,7 +18,7 @@
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
     <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Debug-Host/eive_obsw.exe"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Debug-Host/eive-obsw.exe"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="eive-obsw"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443"/>
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index dd17728c..ea3fdbea 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -14,7 +14,6 @@ target_sources(${TARGET_NAME} PUBLIC
 	RadiationSensorHandler.cpp
 	GyroADIS16507Handler.cpp
 	RwHandler.cpp
-	StarTrackerHandler.cpp
 )
 
 
diff --git a/mission/devices/RwHandler.cpp b/mission/devices/RwHandler.cpp
index 91188d87..c848c809 100644
--- a/mission/devices/RwHandler.cpp
+++ b/mission/devices/RwHandler.cpp
@@ -197,7 +197,7 @@ ReturnValue_t RwHandler::scanForReply(const uint8_t *start, size_t remainingSize
 ReturnValue_t RwHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_t *packet) {
 
     /** Check result code */
-    if (*(packet + 1) == RwDefinitions::ERROR) {
+    if (*(packet + 1) == RwDefinitions::STATE_ERROR) {
 		sif::error << "RwHandler::interpretDeviceReply: Command execution failed. Command id: "
 				<< id << std::endl;
         return EXECUTION_FAILED;
@@ -369,7 +369,7 @@ void RwHandler::handleGetRwStatusReply(const uint8_t* packet) {
     offset += 1;
     statusSet.clcMode = *(packet + offset);
 
-    if (statusSet.state == RwDefinitions::ERROR) {
+    if (statusSet.state == RwDefinitions::STATE_ERROR) {
         /**
          * This requires the commanding of the init reaction wheel controller command to recover
          * form error state which must be handled by the FDIR instance.
diff --git a/mission/devices/devicedefinitions/RwDefinitions.h b/mission/devices/devicedefinitions/RwDefinitions.h
index 4b3eeee7..b8905002 100644
--- a/mission/devices/devicedefinitions/RwDefinitions.h
+++ b/mission/devices/devicedefinitions/RwDefinitions.h
@@ -46,7 +46,7 @@ enum PoolIds: lp_id_t {
 };
 
 enum States: uint8_t {
-    ERROR,
+    STATE_ERROR,
     IDLE,
     COASTING,
     RUNNING_SPEED_STABLE,