eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged

Browse Source
This commit is contained in:
Robin Müller
2022-08-24 17:13:41 +02:00
parent 7881f5bab8 a46d8c34d9
commit f91ad84bdc
455 changed files with 2989 additions and 3192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/fsfw_hal/linux/CommandExecutor.cpp
View File

@ -23,7 +23,7 @@ ReturnValue_t CommandExecutor::load(std::string command, bool blocking, bool pri
if (state == States::IDLE) {
state = States::COMMAND_LOADED;
}
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
ReturnValue_t CommandExecutor::execute() {
@ -37,7 +37,7 @@ ReturnValue_t CommandExecutor::execute() {
currentCmdFile = popen(currentCmd.c_str(), "r");
if (currentCmdFile == nullptr) {
lastError = errno;
return HasReturnvaluesIF::RETURN_FAILED;
return returnvalue::FAILED;
}
if (blocking) {
ReturnValue_t result = executeBlocking();
@ -48,7 +48,7 @@ ReturnValue_t CommandExecutor::execute() {
waiter.fd = currentFd;
}
state = States::PENDING;
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
ReturnValue_t CommandExecutor::close() {
@ -58,7 +58,7 @@ ReturnValue_t CommandExecutor::close() {
pclose(currentCmdFile);
}
}
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
void CommandExecutor::printLastError(std::string funcName) const {
@ -81,7 +81,7 @@ void CommandExecutor::setRingBuffer(SimpleRingBuffer* ringBuffer,
ReturnValue_t CommandExecutor::check(bool& replyReceived) {
if (blocking) {
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
switch (state) {
case (States::IDLE):
@ -96,7 +96,7 @@ ReturnValue_t CommandExecutor::check(bool& replyReceived) {
int result = poll(&waiter, 1, 0);
switch (result) {
case (0): {
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
break;
}
case (1): {
@ -153,7 +153,7 @@ ReturnValue_t CommandExecutor::check(bool& replyReceived) {
ReturnValue_t retval = EXECUTION_FINISHED;
if (result != 0) {
lastError = result;
retval = HasReturnvaluesIF::RETURN_FAILED;
retval = returnvalue::FAILED;
}
state = States::IDLE;
currentCmdFile = nullptr;
@ -163,7 +163,7 @@ ReturnValue_t CommandExecutor::check(bool& replyReceived) {
break;
}
}
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
void CommandExecutor::reset() {
@ -203,9 +203,9 @@ ReturnValue_t CommandExecutor::executeBlocking() {
int result = pclose(currentCmdFile);
if (result != 0) {
lastError = result;
return HasReturnvaluesIF::RETURN_FAILED;
return returnvalue::FAILED;
}
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
const std::vector<char>& CommandExecutor::getReadVector() const { return readVec; }