From 27e3e446e9aab307b2c958654e3d6ac6ec25d616 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Sat, 5 Feb 2022 17:45:28 +0100
Subject: [PATCH] clean up egse build

---
 bsp_egse/InitMission.cpp       | 2 +-
 bsp_egse/InitMission.h         | 2 --
 bsp_egse/ObjectFactory.cpp     | 4 ++--
 bsp_egse/ObjectFactory.h       | 3 ---
 bsp_egse/boardconfig/busConf.h | 8 ++++++++
 bsp_egse/main.cpp              | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 bsp_egse/boardconfig/busConf.h

diff --git a/bsp_egse/InitMission.cpp b/bsp_egse/InitMission.cpp
index 96e18917..920c066d 100644
--- a/bsp_egse/InitMission.cpp
+++ b/bsp_egse/InitMission.cpp
@@ -113,7 +113,7 @@ void initmission::initTasks() {
   tmtcPollingTask->startTask();
 
   taskStarter(pstTasks, "PST Tasks");
-  taskStarter(pusTasks, "PST Tasks");
+  taskStarter(pusTasks, "PUS Tasks");
 
   sif::info << "Tasks started.." << std::endl;
 }
diff --git a/bsp_egse/InitMission.h b/bsp_egse/InitMission.h
index f14135dd..c3ba58ec 100644
--- a/bsp_egse/InitMission.h
+++ b/bsp_egse/InitMission.h
@@ -14,8 +14,6 @@ void initTasks();
 
 void createPstTasks(TaskFactory& factory, TaskDeadlineMissedFunction missedDeadlineFunc,
                     std::vector<PeriodicTaskIF*>& taskVec);
-void createTestTasks(TaskFactory& factory, TaskDeadlineMissedFunction missedDeadlineFunc,
-                     std::vector<PeriodicTaskIF*>& taskVec);
 void createPusTasks(TaskFactory& factory, TaskDeadlineMissedFunction missedDeadlineFunc,
                     std::vector<PeriodicTaskIF*>& taskVec);
 };  // namespace initmission
diff --git a/bsp_egse/ObjectFactory.cpp b/bsp_egse/ObjectFactory.cpp
index 7de917d0..2e2ccd68 100644
--- a/bsp_egse/ObjectFactory.cpp
+++ b/bsp_egse/ObjectFactory.cpp
@@ -4,6 +4,7 @@
 #include <mission/devices/GPSHyperionHandler.h>
 
 #include "OBSWConfig.h"
+#include "busConf.h"
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
 #include "fsfw/tmtcpacket/pus/tm.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
@@ -30,7 +31,6 @@ void Factory::setStaticFrameworkObjectIds() {
   CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
 
   TmFunnel::downlinkDestination = objects::TMTC_BRIDGE;
-  // No storage object for now.
   TmFunnel::storageDestination = objects::NO_OBJECT;
 
   VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
@@ -42,7 +42,7 @@ void ObjectFactory::produce(void* args) {
   ObjectFactory::produceGenericObjects();
 
   UartCookie* starTrackerCookie =
-      new UartCookie(objects::STAR_TRACKER, "/dev/serial0", UartModes::NON_CANONICAL,
+      new UartCookie(objects::STAR_TRACKER, egse::STAR_TRACKER_UART, UartModes::NON_CANONICAL,
                      uart::STAR_TRACKER_BAUD, StarTracker::MAX_FRAME_SIZE * 2 + 2);
   new UartComIF(objects::UART_COM_IF);
   starTrackerCookie->setNoFixedSizeReply();
diff --git a/bsp_egse/ObjectFactory.h b/bsp_egse/ObjectFactory.h
index 909baf06..b24dd321 100644
--- a/bsp_egse/ObjectFactory.h
+++ b/bsp_egse/ObjectFactory.h
@@ -2,10 +2,7 @@
 #define BSP_LINUX_OBJECTFACTORY_H_
 
 namespace ObjectFactory {
-void setStatics();
 void produce(void* args);
-
-void createTestTasks();
 };  // namespace ObjectFactory
 
 #endif /* BSP_LINUX_OBJECTFACTORY_H_ */
diff --git a/bsp_egse/boardconfig/busConf.h b/bsp_egse/boardconfig/busConf.h
new file mode 100644
index 00000000..38822dc6
--- /dev/null
+++ b/bsp_egse/boardconfig/busConf.h
@@ -0,0 +1,8 @@
+#ifndef BSP_EGSE_BOARDCONFIG_BUSCONF_H_
+#define BSP_EGSE_BOARDCONFIG_BUSCONF_H_
+
+namespace egse {
+    static constexpr char STAR_TRACKER_UART[] = "/dev/serial0";
+}
+
+#endif /* BSP_EGSE_BOARDCONFIG_BUSCONF_H_ */
diff --git a/bsp_egse/main.cpp b/bsp_egse/main.cpp
index 661c26b2..fc2d9a0f 100644
--- a/bsp_egse/main.cpp
+++ b/bsp_egse/main.cpp
@@ -7,7 +7,7 @@
 #include "fsfw/tasks/TaskFactory.h"
 
 /**
- * @brief 	    This is the main program and entry point for egse (raspberry pi 4)
+ * @brief 	    This is the main program and entry point for the egse (raspberry pi 4)
  * @return
  */
 int main(void) {