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 +7 -15
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10da5cd45b - Show all commits

20
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -299,20 +299,12 @@ ReturnValue_t SolarArrayDeploymentHandler::executeAction(ActionId_t actionId,
MessageQueueId_t commandedBy, MessageQueueId_t commandedBy,
const uint8_t* data, size_t size) { const uint8_t* data, size_t size) {
ReturnValue_t result = returnvalue::OK; ReturnValue_t result = returnvalue::OK;
// if (stateMachine != WAIT_ON_DELOYMENT_COMMAND) { if (actionId == FORCE_DEPLY_ON) {
// sif::error << "SolarArrayDeploymentHandler::executeAction: Received command while not in" }
// << "waiting-on-command-state" << std::endl; if (actionId == FORCE_DEPLY_OFF) {
// return DEPLOYMENT_ALREADY_EXECUTING; }
// } if (actionId == DEPLOY_SOLAR_ARRAYS_MANUALLY) {
// if (actionId != DEPLOY_SOLAR_ARRAYS) { }
// sif::error << "SolarArrayDeploymentHandler::executeAction: Received invalid command"
// << std::endl;
// result = COMMAND_NOT_SUPPORTED;
// } else {
// stateMachine = SWITCH_8V_ON;
// rememberCommanderId = commandedBy;
// result = returnvalue::OK;
// }
return result; return result;
} }

2
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -28,7 +28,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
public HasActionsIF { public HasActionsIF {
public: public:
// Burn them for a custom amount limited by 120 secs // Burn them for a custom amount limited by 120 secs
static constexpr DeviceCommandId_t DEPLOY_SOLAR_ARRAYS_MANUALLY = 0x5; static constexpr DeviceCommandId_t DEPLOY_SOLAR_ARRAYS_MANUALLY = 0x05;
// Careful with these command, not automatic off handling! // Careful with these command, not automatic off handling!
static constexpr DeviceCommandId_t FORCE_DEPLY_ON = 0x06; static constexpr DeviceCommandId_t FORCE_DEPLY_ON = 0x06;
static constexpr DeviceCommandId_t FORCE_DEPLY_OFF = 0x07; static constexpr DeviceCommandId_t FORCE_DEPLY_OFF = 0x07;