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

tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-03-30 12:09:17 +02:00
parent b5363604bc
commit f2f350116f
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
Subproject commit e37430423e814b9e05f25d63970f2c2b5048cfb1 Subproject commit b5a9dac8f6d3733779a67a72b14a20091069a346