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

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +2 -17
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4bf47499e - Show all commits

5
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -342,11 +342,6 @@ ReturnValue_t SolarArrayDeploymentHandler::executeAction(ActionId_t actionId,
return result; return result;
} }
uint32_t burnCountdown = cmd.getBurnTime(); uint32_t burnCountdown = cmd.getBurnTime();
DeploymentChannels channel;
result = cmd.getChannel(channel);
if (result != returnvalue::OK) {
return result;
}
if (not startFsmOn(burnCountdown, cmd.isDryRun())) { if (not startFsmOn(burnCountdown, cmd.isDryRun())) {
return HasActionsIF::IS_BUSY; return HasActionsIF::IS_BUSY;
} }

12
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -29,25 +29,15 @@ class ManualDeploymentCommand : public SerialLinkedListAdapter<SerializeIF> {
void setLinks() { void setLinks() {
setStart(&burnTime); setStart(&burnTime);
burnTime.setNext(&channel); burnTime.setNext(&dryRun);
} }
uint32_t getBurnTime() const { return burnTime.entry; } 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; } bool isDryRun() const { return dryRun.entry; }
private: private:
SerializeElement<uint32_t> burnTime; SerializeElement<uint32_t> burnTime;
// Deployment channel SA1 or SA2
SerializeElement<uint8_t> channel;
SerializeElement<uint8_t> dryRun; SerializeElement<uint8_t> dryRun;
}; };

2
tmtc

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