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

PL PCDU Refactoring v1 #189

Merged
meierj merged 14 commits from mueller/plpcdu-refactoring into develop 2022-03-31 15:31:47 +02:00
Conversation 2 Commits 14 Files Changed 12 +223 -212
14 changed files with 223 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2f350116f - Show all commits

3
mission/devices/PayloadPcduHandler.cpp
View File

@@ -547,8 +547,9 @@ bool PayloadPcduHandler::checkCurrent(float val, float upperBound, Event event)
ReturnValue_t PayloadPcduHandler::isModeCombinationValid(Mode_t mode, Submode_t submode) { ReturnValue_t PayloadPcduHandler::isModeCombinationValid(Mode_t mode, Submode_t submode) {
using namespace plpcdu; using namespace plpcdu;
if (mode == MODE_NORMAL) { if (mode == MODE_NORMAL) {
// Also deals with the case where the mode is MODE_ON, submode should be 0 here
if (submode == NormalSubmodes::SOLID_STATE_RELAYS_ADC_ON and if (submode == NormalSubmodes::SOLID_STATE_RELAYS_ADC_ON and
this->submode != NormalSubmodes::ALL_OFF) { (this->mode == MODE_NORMAL and this->submode != NormalSubmodes::ALL_OFF)) {
return TRANS_NOT_ALLOWED; return TRANS_NOT_ALLOWED;
} }
if ((submode == NormalSubmodes::DRO_ON and if ((submode == NormalSubmodes::DRO_ON and

2
tmtc

Submodule tmtc updated: e37430423e...b5a9dac8f6