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

small fixes

Browse Source
This commit is contained in:
Ulrich Mohr 2022-09-07 10:54:49 +02:00
parent c7e6f01f9b
commit 0e6e124eab
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/action/ActionHelper.cpp
View File

@ -83,7 +83,7 @@ void ActionHelper::prepareExecution(MessageQueueId_t commandedBy, ActionId_t act
} }
Action* action = actionIter->second; Action* action = actionIter->second;
result = action->deSerialize(&dataPtr, &size, SerializeIF::Endianness::NETWORK); result = action->deSerialize(&dataPtr, &size, SerializeIF::Endianness::NETWORK);
if ((result != HasReturnvaluesIF::RETURN_OK) || (size != 0)){ //TODO write unittest for second condition if ((result != HasReturnvaluesIF::RETURN_OK)){
CommandMessage reply; CommandMessage reply;
ActionMessage::setStepReply(&reply, actionId, 0, HasActionsIF::INVALID_PARAMETERS); ActionMessage::setStepReply(&reply, actionId, 0, HasActionsIF::INVALID_PARAMETERS);
queueToUse->sendMessage(commandedBy, &reply); queueToUse->sendMessage(commandedBy, &reply);

2
src/fsfw/controller/ControllerBase.cpp
View File

@ -107,8 +107,6 @@ const ModeHelper * ControllerBase::getModeHelper() const {
return &modeHelper; return &modeHelper;
} }
void ControllerBase::modeChanged(Mode_t mode, Submode_t submode) { return; }
ReturnValue_t ControllerBase::setHealth(HealthState health) { ReturnValue_t ControllerBase::setHealth(HealthState health) {
switch (health) { switch (health) {
case HEALTHY: case HEALTHY:

2
src/fsfw/introspection/Types.h
View File

@ -4,5 +4,5 @@
// Note: some DBs (Postgress, Mongo) only support signed 64bit integers. To have a common denominator, all integers are int64_t. // Note: some DBs (Postgress, Mongo) only support signed 64bit integers. To have a common denominator, all integers are int64_t.
// As such, ther is no unsigned Type, as there can not be a uint64_t and uint32_t completely fits into int64_t // As such, ther is no unsigned Type, as there can not be a uint64_t and uint32_t completely fits into int64_t
namespace Types { namespace Types {
enum ParameterType { SIGNED, FLOATING, ENUM, UNSUPPORTED }; enum ParameterType { SIGNED, FLOATING, ENUM, STRING, BYTEARRAY, UNSUPPORTED };
} // namespace Types } // namespace Types

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

@ -36,7 +36,6 @@ class HasModesIF {
//! A mode command was rejected by the called object. Par1: called object id, Par2: return code. //! A mode command was rejected by the called object. Par1: called object id, Par2: return code.
static const Event MODE_CMD_REJECTED = MAKE_EVENT(7, severity::LOW); static const Event MODE_CMD_REJECTED = MAKE_EVENT(7, severity::LOW);
<<<<<<< HEAD
//! The device is powered and ready to perform operations. In this mode, no commands are //! The device is powered and ready to perform operations. In this mode, no commands are
//! sent by the device handler itself, but direct commands can be commanded and will be //! sent by the device handler itself, but direct commands can be commanded and will be
//! interpreted //! interpreted