interior structure changes, use new sched block

CHANGELOG.md

@@ -20,6 +20,8 @@ will consitute of a breaking change warranting a new major release:
 
 - All `targetQuat` functions in `Guidance` now return the target quaternion (target
   in ECI frame), which is passed on to `CtrlValData`.
+- Moved polling sequence table definitions and source code to `mission/core` folder.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/395
 
 ## Added
 

bsp_q7s/core/scheduling.cpp

@@ -17,10 +17,10 @@
 #include "fsfw/tasks/FixedTimeslotTaskIF.h"
 #include "fsfw/tasks/PeriodicTaskIF.h"
 #include "fsfw/tasks/TaskFactory.h"
+#include "mission/core/pollingSeqTables.h"
 #include "mission/core/scheduling.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/utility/InitMission.h"
-#include "pollingsequence/pollingSequenceFactory.h"
 
 /* This is configured for linux without CR */
 #ifdef PLATFORM_UNIX

bsp_q7s/core/scheduling.h

@@ -1,11 +1,10 @@
 #ifndef BSP_Q7S_INITMISSION_H_
 #define BSP_Q7S_INITMISSION_H_
 
-#include <pollingsequence/pollingSequenceFactory.h>
-
 #include <vector>
 
 #include "fsfw/tasks/definitions.h"
+#include "mission/core/pollingSeqTables.h"
 
 using pst::AcsPstCfg;
 

fsfw

@@ -1 +1 @@
-Subproject commit 2efff4d2c5ef82b5b62567ab1bb0ee53aeed6a5a
+Subproject commit bd208038dd85a94dce8c763397ad5ac7eae76402

linux/devices/CMakeLists.txt

@@ -3,8 +3,9 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
 endif()
 
 target_sources(
-  ${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp ImtqPollingTask.cpp
-                       ScexDleParser.cpp ScexHelper.cpp RwPollingTask.cpp)
+  ${OBSW_NAME}
+  PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp ImtqPollingTask.cpp
+          ScexDleParser.cpp ScexHelper.cpp RwPollingTask.cpp)
 
 add_subdirectory(ploc)
 

linux/fsfwconfig/CMakeLists.txt

@@ -1,5 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp
-                                    pollingsequence/pollingSequenceFactory.cpp)
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp)
 
 target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 

mission/controller/acs/Guidance.cpp

@@ -111,8 +111,7 @@ void Guidance::targetQuatPtgSingleAxis(timeval now, double posSatE[3], double ve
       if (sightAngleSun < critSightAngle) {
         strBlindAvoidFlag = true;
       }
-    }
-    else {
+    } else {
       if (sightAngleSun < blindEnd * exclAngle) {
         double normBlindRefRate = acsParameters.targetModeControllerParameters.blindRotRate;
         double blindRefRate[3] = {0, 0, 0};

mission/controller/acs/MultiplicativeKalmanFilter.cpp

@@ -1098,7 +1098,7 @@ void MultiplicativeKalmanFilter::reset(acsctrl::MekfData *mekfData) {
 }
 
 void MultiplicativeKalmanFilter::updateDataSetWithoutData(acsctrl::MekfData *mekfData,
-                                                         MekfStatus mekfStatus) {
+                                                          MekfStatus mekfStatus) {
   {
     PoolReadGuard pg(mekfData);
     if (pg.getReadResult() == returnvalue::OK) {
@@ -1114,9 +1114,8 @@ void MultiplicativeKalmanFilter::updateDataSetWithoutData(acsctrl::MekfData *mek
   }
 }
 
-void MultiplicativeKalmanFilter::updateDataSet(acsctrl::MekfData *mekfData,
-                                                             MekfStatus mekfStatus, double quat[4],
-                                                             double satRotRate[3]) {
+void MultiplicativeKalmanFilter::updateDataSet(acsctrl::MekfData *mekfData, MekfStatus mekfStatus,
+                                               double quat[4], double satRotRate[3]) {
   {
     PoolReadGuard pg(mekfData);
     if (pg.getReadResult() == returnvalue::OK) {

mission/core/CMakeLists.txt

@@ -1 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp scheduling.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp scheduling.cpp
+                                           pollingSeqTables.cpp)

mission/core/pollingSeqTables.cpp

@@ -1,4 +1,4 @@
-#include "pollingSequenceFactory.h"
+#include "pollingSeqTables.h"
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
@@ -659,7 +659,7 @@ ReturnValue_t pst::pstTcsAndAcs(FixedTimeslotTaskIF *thisSequence, AcsPstCfg cfg
                           DeviceHandlerIF::GET_READ);
   }
 
-  thisSequence->addSlot(objects::SPI_RTD_COM_IF, length * 0.5, 0);
+  thisSequence->addSlot(objects::SPI_RTD_COM_IF, length * config::acs::SCHED_BLOCK_RTD_PERIOD, 0);
 
   return returnvalue::OK;
 }

mission/devices/ImtqHandler.cpp

@@ -256,7 +256,7 @@ ReturnValue_t ImtqHandler::scanForReply(const uint8_t* start, size_t remainingSi
 ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) {
   ReturnValue_t result;
   ReturnValue_t status = returnvalue::OK;
-  if(getMode() != MODE_NORMAL) {
+  if (getMode() != MODE_NORMAL) {
     // Ignore replies during transitions.
     return returnvalue::OK;
   }

mission/tmtc/CfdpTmFunnel.cpp

@@ -21,7 +21,7 @@ ReturnValue_t CfdpTmFunnel::performOperation(uint8_t) {
       break;
     }
     count++;
-    if(count == 500) {
+    if (count == 500) {
       sif::error << "CfdpTmFunnel: Possible message storm detected" << std::endl;
       break;
     }

mission/tmtc/PusTmFunnel.cpp

@@ -21,7 +21,7 @@ ReturnValue_t PusTmFunnel::performOperation(uint8_t) {
       break;
     }
     count++;
-    if(count == 500) {
+    if (count == 500) {
       sif::error << "PusTmFunnel: Possible message storm detected" << std::endl;
       break;
     }

mission/tmtc/VirtualChannel.cpp

@@ -50,7 +50,7 @@ ReturnValue_t VirtualChannel::performOperation() {
     }
 
     count++;
-    if(count == 500) {
+    if (count == 500) {
       sif::error << "VirtualChannel: Possible message storm detected" << std::endl;
       break;
     }