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

RW Assembly #224

Merged
meierj merged 53 commits from mueller/rw-ass into develop 2022-05-11 17:03:32 +02:00
Conversation 0 Commits 53 Files Changed 43 +127 -128
9 changed files with 127 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1f6aab8124 - Show all commits

2
bsp_hosted/ObjectFactory.cpp
View File

@ -7,9 +7,9 @@
#include <objects/systemObjectList.h> #include <objects/systemObjectList.h>
#include <tmtc/apid.h> #include <tmtc/apid.h>
#include <tmtc/pusIds.h> #include <tmtc/pusIds.h>
#include "fsfw_tests/integration/task/TestTask.h"
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "fsfw_tests/integration/task/TestTask.h"
#if OBSW_USE_TMTC_TCP_BRIDGE == 0 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
#include "fsfw/osal/common/UdpTcPollingTask.h" #include "fsfw/osal/common/UdpTcPollingTask.h"

3
bsp_q7s/boardtest/Q7STestTask.cpp
View File

@ -300,8 +300,7 @@ void Q7STestTask::testGpsDaemonSocket() {
if (gps == nullptr) { if (gps == nullptr) {
if (gpsReadFailedSwitch) { if (gpsReadFailedSwitch) {
gpsReadFailedSwitch = false; gpsReadFailedSwitch = false;
sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed" sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed" << std::endl;
<< std::endl;
} }
return; return;
} }

1
bsp_q7s/boardtest/Q7STestTask.h
View File

@ -2,6 +2,7 @@
#define BSP_Q7S_BOARDTEST_Q7STESTTASK_H_ #define BSP_Q7S_BOARDTEST_Q7STESTTASK_H_
#include <libgpsmm.h> #include <libgpsmm.h>
#include "test/testtasks/TestTask.h" #include "test/testtasks/TestTask.h"
class CoreController; class CoreController;

4
linux/boardtest/LibgpiodTest.cpp
View File

@ -29,8 +29,8 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
sif::warning << "LibgpiodTest::performPeriodicAction: Failed to read gpio " << std::endl; sif::warning << "LibgpiodTest::performPeriodicAction: Failed to read gpio " << std::endl;
return RETURN_FAILED; return RETURN_FAILED;
} else { } else {
sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = " << sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = "
static_cast<int>(gpioState) << std::endl; << static_cast<int>(gpioState) << std::endl;
} }
break; break;
} }

7
mission/devices/RwHandler.cpp
View File

@ -340,13 +340,14 @@ void RwHandler::handleResetStatusReply(const uint8_t* packet) {
lastResetStatusSet.lastNonClearedResetStatus = resetStatus; lastResetStatusSet.lastNonClearedResetStatus = resetStatus;
triggerEvent(RwDefinitions::RESET_OCCURED, resetStatus, 0); triggerEvent(RwDefinitions::RESET_OCCURED, resetStatus, 0);
} }
lastResetStatusSet.lastResetStatus = resetStatus; lastResetStatusSet.currentResetStatus = resetStatus;
if (debugMode) { if (debugMode) {
#if OBSW_VERBOSE_LEVEL >= 1 #if OBSW_VERBOSE_LEVEL >= 1
sif::info << "RwHandler::handleResetStatusReply: Last reset status: " sif::info << "RwHandler::handleResetStatusReply: Last reset status: "
<< static_cast<unsigned int>(lastResetStatusSet.lastNonClearedResetStatus.value) << std::endl; << static_cast<unsigned int>(lastResetStatusSet.lastNonClearedResetStatus.value)
<< std::endl;
sif::info << "RwHandler::handleResetStatusReply: Current reset status: " sif::info << "RwHandler::handleResetStatusReply: Current reset status: "
<< static_cast<unsigned int>(lastResetStatusSet.lastResetStatus.value) << static_cast<unsigned int>(lastResetStatusSet.currentResetStatus.value)
<< std::endl; << std::endl;
#endif #endif
} }

2
mission/devices/RwHandler.h
View File

@ -71,8 +71,6 @@ class RwHandler : public DeviceHandlerBase {
LocalDataPoolManager& poolManager) override; LocalDataPoolManager& poolManager) override;
private: private:
//! [EXPORT] : [COMMENT] Action Message with invalid speed was received. Valid speeds must be in //! [EXPORT] : [COMMENT] Action Message with invalid speed was received. Valid speeds must be in
//! the range of [-65000; 1000] or [1000; 65000] //! the range of [-65000; 1000] or [1000; 65000]
static const ReturnValue_t INVALID_SPEED = MAKE_RETURN_CODE(0xA0); static const ReturnValue_t INVALID_SPEED = MAKE_RETURN_CODE(0xA0);

2
mission/devices/devicedefinitions/RwDefinitions.h
View File

@ -144,7 +144,7 @@ class LastResetSatus : public StaticLocalDataSet<LAST_RESET_ENTRIES> {
lp_var_t<uint8_t> lastNonClearedResetStatus = lp_var_t<uint8_t> lastNonClearedResetStatus =
lp_var_t<uint8_t>(sid.objectId, PoolIds::LAST_RESET_STATUS, this); lp_var_t<uint8_t>(sid.objectId, PoolIds::LAST_RESET_STATUS, this);
// This will always contain the last polled reset status // This will always contain the last polled reset status
lp_var_t<uint8_t> lastResetStatus = lp_var_t<uint8_t> currentResetStatus =
lp_var_t<uint8_t>(sid.objectId, PoolIds::CURRRENT_RESET_STATUS, this); lp_var_t<uint8_t>(sid.objectId, PoolIds::CURRRENT_RESET_STATUS, this);
}; };

2
tmtc

@ -1 +1 @@
Subproject commit 510ba82fefa3da20c7e34cf788a9637a514e0385 Subproject commit 7e460d05c3530b3053b3b10054788d98ed509b20