CHANGELOG.md

@@ -34,6 +34,7 @@ will consitute of a breaking change warranting a new major release:
 ## Fixed
 
 - Missing `nullptr` checks for PLOC Supervisor handler, which could lead to crashes.
+- SCEX bugfix for normal and transition commanding.
 
 # [v6.6.0] 2023-09-18
 

mission/payload/ScexDeviceHandler.cpp

@@ -38,9 +38,13 @@ void ScexDeviceHandler::doShutDown() {
   setMode(_MODE_POWER_DOWN);
 }
 
-ReturnValue_t ScexDeviceHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) { return OK; }
+ReturnValue_t ScexDeviceHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
+  return NOTHING_TO_SEND;
+}
 
-ReturnValue_t ScexDeviceHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) { return OK; }
+ReturnValue_t ScexDeviceHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
+  return NOTHING_TO_SEND;
+}
 
 ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
                                                          const uint8_t* commandData,
@@ -269,7 +273,7 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
       // Unknown DeviceCommand
       return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
   }
-  if (helper.getPacketCounter() == helper.getTotalPacketCounter()) {
+  if (helper.getPacketCounter() >= helper.getTotalPacketCounter()) {
     reader.finish();
     commandActive = false;
     if (id != PING) {

tmtc

@@ -1 +1 @@
-Subproject commit d82cecbe6e51e76a5b3b974b1c0d32ea22693853
+Subproject commit 9711dd9242340720e28d41eefda90666ec9af4bb