eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Thread Tracing and Scheduling Update #379

Merged
muellerr merged 11 commits from thread_tracing into develop 2023-02-14 15:59:12 +01:00
Conversation 0 Commits 11 Files Changed 28 +5 -12
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f84099c5e - Show all commits

4
CMakeLists.txt
View File

@ -490,8 +490,8 @@ endif()
# ############################################################################## # ##############################################################################
# Add libraries # Add libraries
target_link_libraries(${LIB_EIVE_MISSION} target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_FSFW_NAME}
PUBLIC ${LIB_FSFW_NAME} ${LIB_OS_NAME}) ${LIB_OS_NAME})
target_link_libraries(${LIB_DUMMIES} PUBLIC ${LIB_FSFW_NAME} ${LIB_JSON_NAME}) target_link_libraries(${LIB_DUMMIES} PUBLIC ${LIB_FSFW_NAME} ${LIB_JSON_NAME})

3
linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
View File

@ -1,12 +1,11 @@
#include "pollingSequenceFactory.h" #include "pollingSequenceFactory.h"
#include "OBSWConfig.h"
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/objectmanager/ObjectManagerIF.h> #include <fsfw/objectmanager/ObjectManagerIF.h>
#include <fsfw/serviceinterface/ServiceInterfaceStream.h> #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
#include <fsfw/tasks/FixedTimeslotTaskIF.h> #include <fsfw/tasks/FixedTimeslotTaskIF.h>
#include "OBSWConfig.h"
#include "eive/definitions.h" #include "eive/definitions.h"
#include "mission/devices/devicedefinitions/Max31865Definitions.h" #include "mission/devices/devicedefinitions/Max31865Definitions.h"

5
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -39,10 +39,7 @@ SolarArrayDeploymentHandler::~SolarArrayDeploymentHandler() = default;
ReturnValue_t SolarArrayDeploymentHandler::performOperation(uint8_t operationCode) { ReturnValue_t SolarArrayDeploymentHandler::performOperation(uint8_t operationCode) {
using namespace std::filesystem; using namespace std::filesystem;
#if OBSW_THREAD_TRACING == 1 #if OBSW_THREAD_TRACING == 1
opCounter++; trace::threadTrace(opCounter, "SA DEPL");
if (opCounter % 5 == 0) {
sif::debug << "SA DEPL task running" << std::endl;
}
#endif #endif
if (opDivider.checkAndIncrement()) { if (opDivider.checkAndIncrement()) {
auto activeSdc = sdcMan.getActiveSdCard(); auto activeSdc = sdcMan.getActiveSdCard();

3
test/TestTask.cpp
View File

@ -42,10 +42,8 @@ ReturnValue_t EiveTestTask::performOperation(uint8_t operationCode) {
#include <etl/vector.h> #include <etl/vector.h>
// #include <lwgps/lwgps.h> // #include <lwgps/lwgps.h>
/** /**
* @brief Dummy data from GPS receiver. Will be replaced witgh hyperion data later. * @brief Dummy data from GPS receiver. Will be replaced witgh hyperion data later.
*/ */
@ -76,7 +74,6 @@ const char hyperion_gps_data[] =
"$GNVTG,040.7,T,,M,000.0,N,000.0,K,A*10\r\n" "$GNVTG,040.7,T,,M,000.0,N,000.0,K,A*10\r\n"
"$GNZDA,173225.998892,27,02,2021,00,00*75\r\n"; "$GNZDA,173225.998892,27,02,2021,00,00*75\r\n";
ReturnValue_t EiveTestTask::performOneShotAction() { ReturnValue_t EiveTestTask::performOneShotAction() {
#if OBSW_ADD_TEST_CODE == 1 #if OBSW_ADD_TEST_CODE == 1
// performLwgpsTest(); // performLwgpsTest();