diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp index 92283749..72bcace4 100644 --- a/mission/devices/SolarArrayDeploymentHandler.cpp +++ b/mission/devices/SolarArrayDeploymentHandler.cpp @@ -342,11 +342,6 @@ ReturnValue_t SolarArrayDeploymentHandler::executeAction(ActionId_t actionId, return result; } uint32_t burnCountdown = cmd.getBurnTime(); - DeploymentChannels channel; - result = cmd.getChannel(channel); - if (result != returnvalue::OK) { - return result; - } if (not startFsmOn(burnCountdown, cmd.isDryRun())) { return HasActionsIF::IS_BUSY; } diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h index 08fd4b47..a5f56a5f 100644 --- a/mission/devices/SolarArrayDeploymentHandler.h +++ b/mission/devices/SolarArrayDeploymentHandler.h @@ -29,25 +29,15 @@ class ManualDeploymentCommand : public SerialLinkedListAdapter { void setLinks() { setStart(&burnTime); - burnTime.setNext(&channel); + burnTime.setNext(&dryRun); } uint32_t getBurnTime() const { return burnTime.entry; } - ReturnValue_t getChannel(DeploymentChannels& channel_) const { - if (channel.entry == 1 or channel.entry == 2) { - channel_ = static_cast(channel.entry); - return returnvalue::OK; - } - return HasActionsIF::INVALID_PARAMETERS; - } - bool isDryRun() const { return dryRun.entry; } private: SerializeElement burnTime; - // Deployment channel SA1 or SA2 - SerializeElement channel; SerializeElement dryRun; }; diff --git a/tmtc b/tmtc index 50abe69f..adf2327e 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 50abe69f261b7d2a3345d86bd7042514ff845fd3 +Subproject commit adf2327e6dda748c627b98c857683c6f783bb78a