KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

EIVE upstream #29

Merged
muellerr merged 693 commits from use-eive-upstream into develop 2023-06-30 15:44:39 +02:00
Conversation 0 Commits 693 Files Changed 188 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 033676ad3b - Show all commits

10
src/fsfw/devicehandlers/DeviceHandlerBase.cpp
View File

@ -573,8 +573,6 @@ void DeviceHandlerBase::setTransition(Mode_t modeTo, Submode_t submodeTo) {
} }
void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) { void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
/* TODO: This will probably be done by the LocalDataPoolManager now */
// changeHK(mode, submode, false);
/** /**
* handle transition from OFF to NORMAL by continuing towards normal when ON is reached * handle transition from OFF to NORMAL by continuing towards normal when ON is reached
@ -1595,6 +1593,14 @@ void DeviceHandlerBase::setPowerSwitcher(PowerSwitchIF* switcher) {
this->powerSwitcher = switcher; this->powerSwitcher = switcher;
} }
Mode_t DeviceHandlerBase::getMode() {
return mode;
}
Submode_t DeviceHandlerBase::getSubmode() {
return submode;
}
void DeviceHandlerBase::disableCommandsAndReplies() { void DeviceHandlerBase::disableCommandsAndReplies() {
for (auto& command : deviceCommandMap) { for (auto& command : deviceCommandMap) {
if (command.second.isExecuting) { if (command.second.isExecuting) {

2
src/fsfw/devicehandlers/DeviceHandlerBase.h
View File

@ -755,7 +755,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
* *
* set via setMode() * set via setMode()
*/ */
Submode_t getSubmode; Submode_t getSubmode();
/** This is the counter value from performOperation(). */ /** This is the counter value from performOperation(). */
uint8_t pstStep = 0; uint8_t pstStep = 0;