eive/eive-obsw
eive
/
eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 1 Releases 117 Wiki Activity

remove channel param from cmd
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details

This commit is contained in:
Robin Müller 2022-10-13 18:11:05 +02:00
parent 0e8a085f97
commit a4bf47499e
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -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;
}

12
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -29,25 +29,15 @@ class ManualDeploymentCommand : public SerialLinkedListAdapter<SerializeIF> {
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<DeploymentChannels>(channel.entry);
return returnvalue::OK;
}
return HasActionsIF::INVALID_PARAMETERS;
}
bool isDryRun() const { return dryRun.entry; }
private:
SerializeElement<uint32_t> burnTime;
// Deployment channel SA1 or SA2
SerializeElement<uint8_t> channel;
SerializeElement<uint8_t> dryRun;
};

2
tmtc

@ -1 +1 @@
Subproject commit 50abe69f261b7d2a3345d86bd7042514ff845fd3
Subproject commit adf2327e6dda748c627b98c857683c6f783bb78a