mission/devices/PayloadPcduHandler.cpp

@@ -547,8 +547,9 @@ bool PayloadPcduHandler::checkCurrent(float val, float upperBound, Event event)
 ReturnValue_t PayloadPcduHandler::isModeCombinationValid(Mode_t mode, Submode_t submode) {
   using namespace plpcdu;
   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
-        this->submode != NormalSubmodes::ALL_OFF) {
+        (this->mode == MODE_NORMAL and this->submode != NormalSubmodes::ALL_OFF)) {
       return TRANS_NOT_ALLOWED;
     }
     if ((submode == NormalSubmodes::DRO_ON and