From 3e3ac9f5befeafa3b24dcd2f849b364aa40fd2e2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 13 Apr 2023 21:14:38 +0200
Subject: [PATCH] conditional build of STR components

---
 linux/acs/CMakeLists.txt                      | 10 +++++++---
 linux/acs/StrComHandler.cpp                   |  2 +-
 mission/acs/str/ArcsecJsonParamBase.cpp       |  4 ++--
 unittest/controller/testThermalController.cpp |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/linux/acs/CMakeLists.txt b/linux/acs/CMakeLists.txt
index 99cacbc2..5b5b5ac8 100644
--- a/linux/acs/CMakeLists.txt
+++ b/linux/acs/CMakeLists.txt
@@ -1,6 +1,10 @@
-target_sources(
-  ${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp RwPollingTask.cpp
-                      SusPolling.cpp StrComHandler.cpp)
+target_sources(${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp
+                                   RwPollingTask.cpp SusPolling.cpp)
+
+# Dependency on proprietary library
+if(TGT_BSP MATCHES "arm/q7s")
+  target_sources(${OBSW_NAME} PUBLIC StrComHandler.cpp)
+endif()
 
 if(EIVE_BUILD_GPSD_GPS_HANDLER)
   target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp)
diff --git a/linux/acs/StrComHandler.cpp b/linux/acs/StrComHandler.cpp
index 3c88a71b..51c66f18 100644
--- a/linux/acs/StrComHandler.cpp
+++ b/linux/acs/StrComHandler.cpp
@@ -451,7 +451,7 @@ ReturnValue_t StrComHandler::performFlashWrite() {
       return returnvalue::OK;
     }
     result = writeNextSegment(idx);
-    if(result != returnvalue::OK) {
+    if (result != returnvalue::OK) {
       return result;
     }
     if (idx % 50 == 0) {
diff --git a/mission/acs/str/ArcsecJsonParamBase.cpp b/mission/acs/str/ArcsecJsonParamBase.cpp
index ff1f59d2..58c54d30 100644
--- a/mission/acs/str/ArcsecJsonParamBase.cpp
+++ b/mission/acs/str/ArcsecJsonParamBase.cpp
@@ -1,8 +1,8 @@
-#include "arcsecJsonKeys.h"
-
 #include <mission/acs/str/ArcsecJsonParamBase.h>
 #include <mission/acs/str/arcsecJsonKeys.h>
 
+#include "arcsecJsonKeys.h"
+
 extern "C" {
 #include <wire/common/genericstructs.h>
 }
diff --git a/unittest/controller/testThermalController.cpp b/unittest/controller/testThermalController.cpp
index 0e12d94d..c2166ca0 100644
--- a/unittest/controller/testThermalController.cpp
+++ b/unittest/controller/testThermalController.cpp
@@ -47,8 +47,8 @@ TEST_CASE("Thermal Controller", "[ThermalController]") {
 
   CommandMessage modeMessage;
 
-  ModeMessage::setModeMessage(&modeMessage, ModeMessage::CMD_MODE_COMMAND,
-                              HasModesIF::MODE_ON, HasModesIF::SUBMODE_NONE);
+  ModeMessage::setModeMessage(&modeMessage, ModeMessage::CMD_MODE_COMMAND, HasModesIF::MODE_ON,
+                              HasModesIF::SUBMODE_NONE);
 
   MessageQueueIF* commandQueue =
       QueueFactory::instance()->createMessageQueue(5, MessageQueueMessage::MAX_MESSAGE_SIZE);