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

EIVE upstream #29

Merged
muellerr merged 693 commits from use-eive-upstream into develop 2023-06-30 15:44:39 +02:00
Conversation 0 Commits 693 Files Changed 188 +4 -4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6de4798805 - Show all commits

2
src/fsfw/devicehandlers/AssemblyBase.cpp
View File

@ -196,7 +196,7 @@ ReturnValue_t AssemblyBase::checkModeCommand(Mode_t mode, Submode_t submode,
} }
if ((mode != MODE_ON) && (mode != DeviceHandlerIF::MODE_NORMAL)) { if ((mode != MODE_ON) && (mode != DeviceHandlerIF::MODE_NORMAL)) {
return INVALID_MODE_RETVAL; return MOVE_IS_INVALID;
} }
if (internalState != STATE_NONE) { if (internalState != STATE_NONE) {

2
src/fsfw/devicehandlers/DeviceHandlerBase.cpp
View File

@ -403,7 +403,7 @@ ReturnValue_t DeviceHandlerBase::isModeCombinationValid(Mode_t mode, Submode_t s
return INVALID_SUBMODE; return INVALID_SUBMODE;
} }
default: default:
return HasModesIF::INVALID_MODE_RETVAL; return HasModesIF::MOVE_IS_INVALID;
} }
} }

2
src/fsfw/modes/HasModesIF.h
View File

@ -13,7 +13,7 @@ class HasModesIF {
public: public:
static const uint8_t INTERFACE_ID = CLASS_ID::HAS_MODES_IF; static const uint8_t INTERFACE_ID = CLASS_ID::HAS_MODES_IF;
static const ReturnValue_t INVALID_MODE_RETVAL = MAKE_RETURN_CODE(0x01); static const ReturnValue_t MOVE_IS_INVALID = MAKE_RETURN_CODE(0x01);
static const ReturnValue_t TRANS_NOT_ALLOWED = MAKE_RETURN_CODE(0x02); static const ReturnValue_t TRANS_NOT_ALLOWED = MAKE_RETURN_CODE(0x02);
static const ReturnValue_t IN_TRANSITION = MAKE_RETURN_CODE(0x03); static const ReturnValue_t IN_TRANSITION = MAKE_RETURN_CODE(0x03);
static const ReturnValue_t INVALID_SUBMODE = MAKE_RETURN_CODE(0x04); static const ReturnValue_t INVALID_SUBMODE = MAKE_RETURN_CODE(0x04);

2
tests/src/fsfw_tests/integration/assemblies/TestAssembly.cpp
View File

@ -125,7 +125,7 @@ ReturnValue_t TestAssembly::isModeCombinationValid(Mode_t mode, Submode_t submod
return INVALID_SUBMODE; return INVALID_SUBMODE;
} }
} }
return INVALID_MODE_RETVAL; return MOVE_IS_INVALID;
} }
ReturnValue_t TestAssembly::initialize() { ReturnValue_t TestAssembly::initialize() {