dhb2normal #115
@ -345,9 +345,15 @@ if(FSFW_BUILD_TESTS)
|
|||||||
DEPENDENCIES ${FSFW_TEST_TGT})
|
DEPENDENCIES ${FSFW_TEST_TGT})
|
||||||
else()
|
else()
|
||||||
setup_target_for_coverage_lcov(
|
setup_target_for_coverage_lcov(
|
||||||
NAME ${FSFW_TEST_TGT}_coverage EXECUTABLE ${FSFW_TEST_TGT}
|
NAME
|
||||||
DEPENDENCIES ${FSFW_TEST_TGT}
|
${FSFW_TEST_TGT}_coverage
|
||||||
GENHTML_ARGS --html-epilog ${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
|
EXECUTABLE
|
||||||
|
${FSFW_TEST_TGT}
|
||||||
|
DEPENDENCIES
|
||||||
|
${FSFW_TEST_TGT}
|
||||||
|
GENHTML_ARGS
|
||||||
|
--html-epilog
|
||||||
|
${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@ -581,7 +581,7 @@ void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
|
|||||||
modeChanged();
|
modeChanged();
|
||||||
setNormalDatapoolEntriesInvalid();
|
setNormalDatapoolEntriesInvalid();
|
||||||
if (!isTransitionalMode()) {
|
if (!isTransitionalMode()) {
|
||||||
//clear this flag when a non-transitional Mode is reached to be safe
|
// clear this flag when a non-transitional Mode is reached to be safe
|
||||||
continueToNormal = false;
|
continueToNormal = false;
|
||||||
modeHelper.modeChanged(newMode, newSubmode);
|
modeHelper.modeChanged(newMode, newSubmode);
|
||||||
announceMode(false);
|
announceMode(false);
|
||||||
|
@ -102,10 +102,9 @@ class DeviceHandlerBase : public DeviceHandlerIF,
|
|||||||
DeviceHandlerBase(object_id_t setObjectId, object_id_t deviceCommunication, CookieIF *comCookie,
|
DeviceHandlerBase(object_id_t setObjectId, object_id_t deviceCommunication, CookieIF *comCookie,
|
||||||
FailureIsolationBase *fdirInstance = nullptr, size_t cmdQueueSize = 20);
|
FailureIsolationBase *fdirInstance = nullptr, size_t cmdQueueSize = 20);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* extending the modes of DeviceHandler IF for internal state machine
|
* extending the modes of DeviceHandler IF for internal state machine
|
||||||
*/
|
*/
|
||||||
static constexpr uint8_t TRANSITION_MODE_CHILD_ACTION_MASK = 0x20;
|
static constexpr uint8_t TRANSITION_MODE_CHILD_ACTION_MASK = 0x20;
|
||||||
static constexpr uint8_t TRANSITION_MODE_BASE_ACTION_MASK = 0x10;
|
static constexpr uint8_t TRANSITION_MODE_BASE_ACTION_MASK = 0x10;
|
||||||
//! This is a transitional state which can not be commanded. The device
|
//! This is a transitional state which can not be commanded. The device
|
||||||
@ -735,14 +734,14 @@ class DeviceHandlerBase : public DeviceHandlerIF,
|
|||||||
* Get the current mode
|
* Get the current mode
|
||||||
*
|
*
|
||||||
* set via setMode()
|
* set via setMode()
|
||||||
*/
|
*/
|
||||||
Mode_t getMode();
|
Mode_t getMode();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the current Submode
|
* Get the current Submode
|
||||||
*
|
*
|
||||||
* set via setMode()
|
* set via setMode()
|
||||||
*/
|
*/
|
||||||
Submode_t getSubmode;
|
Submode_t getSubmode;
|
||||||
|
|
||||||
/** This is the counter value from performOperation(). */
|
/** This is the counter value from performOperation(). */
|
||||||
@ -1227,7 +1226,6 @@ class DeviceHandlerBase : public DeviceHandlerIF,
|
|||||||
*/
|
*/
|
||||||
Mode_t mode;
|
Mode_t mode;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The submode the device handler is currently in.
|
* The submode the device handler is currently in.
|
||||||
* This should not be changed directly but only with setMode()
|
* This should not be changed directly but only with setMode()
|
||||||
@ -1257,7 +1255,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
|
|||||||
*
|
*
|
||||||
* set in startTransition()
|
* set in startTransition()
|
||||||
* evaluated in setMode() to continue to NORMAL when ON is reached
|
* evaluated in setMode() to continue to NORMAL when ON is reached
|
||||||
*/
|
*/
|
||||||
bool continueToNormal;
|
bool continueToNormal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -24,7 +24,6 @@ class DeviceHandlerIF {
|
|||||||
static const DeviceCommandId_t RAW_COMMAND_ID = -1;
|
static const DeviceCommandId_t RAW_COMMAND_ID = -1;
|
||||||
static const DeviceCommandId_t NO_COMMAND_ID = -2;
|
static const DeviceCommandId_t NO_COMMAND_ID = -2;
|
||||||
|
|
||||||
|
|
||||||
using dh_heater_request_t = uint8_t;
|
using dh_heater_request_t = uint8_t;
|
||||||
using dh_thermal_state_t = int8_t;
|
using dh_thermal_state_t = int8_t;
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
||||||
|
|
||||||
#include <cinttypes>
|
#include <cinttypes>
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
|
#include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
void __attribute__((weak)) printChar(const char* character, bool errStream) {
|
void __attribute__((weak)) printChar(const char* character, bool errStream) {
|
||||||
if (errStream) {
|
if (errStream) {
|
||||||
|
Loading…
Reference in New Issue
Block a user