Merge remote-tracking branch 'origin/develop' into mueller/master

bsp_q7s/core/ObjectFactory.cpp

@@ -1,5 +1,8 @@
 #include <sstream>
 #include "ObjectFactory.h"
+
+#include "bsp_q7s/devices/startracker/StrHelper.h"
+#include "bsp_q7s/devices/startracker/StarTrackerDefinitions.h"
 #include "OBSWConfig.h"
 #include "devConf.h"
 #include "ccsdsConfig.h"
@@ -16,16 +19,15 @@
 #include "bsp_q7s/devices/PlocSupervisorHandler.h"
 #include "bsp_q7s/devices/PlocUpdater.h"
 #include "bsp_q7s/devices/PlocMemoryDumper.h"
+#include "bsp_q7s/devices/startracker/StarTrackerHandler.h"
 #include "bsp_q7s/callbacks/rwSpiCallback.h"
 #include "bsp_q7s/callbacks/gnssCallback.h"
 
-#include "linux/devices/StarTrackerHandler.h"
 #include "linux/devices/SolarArrayDeploymentHandler.h"
 #include "linux/devices/devicedefinitions/SusDefinitions.h"
 #include "linux/devices/SusHandler.h"
 #include "linux/csp/CspCookie.h"
 #include "linux/csp/CspComIF.h"
-#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
 
 #include "mission/devices/HeaterHandler.h"
 #include "mission/core/GenericFactory.h"
@@ -169,11 +171,15 @@ void ObjectFactory::produce(void* args) {
     new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);
 
 #if OBSW_ADD_STAR_TRACKER == 1
-    UartCookie* starTrackerCookie = new UartCookie(objects::START_TRACKER,
+    UartCookie* starTrackerCookie = new UartCookie(objects::STAR_TRACKER,
             q7s::UART_STAR_TRACKER_DEV, UartModes::NON_CANONICAL, uart::STAR_TRACKER_BAUD,
             StarTracker::MAX_FRAME_SIZE* 2 + 2);
     starTrackerCookie->setNoFixedSizeReply();
-    new StarTrackerHandler(objects::START_TRACKER, objects::UART_COM_IF, starTrackerCookie);
+    StrHelper* strHelper = new StrHelper(objects::STR_HELPER);
+    StarTrackerHandler* starTrackerHandler = new StarTrackerHandler(objects::STAR_TRACKER,
+            objects::UART_COM_IF, starTrackerCookie, strHelper);
+    starTrackerHandler->setStartUpImmediately();
+
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
 #endif /* TE7020 == 0 */