Merge remote-tracking branch 'upstream/mueller/master' into mueller/master

small format change for event to test
Merge remote-tracking branch 'origin/development' into mueller/master
2021-05-05 22:48:29 +02:00 · 2021-04-30 23:59:45 +02:00 · 2021-04-28 22:18:08 +02:00 · 2021-04-27 14:18:15 +02:00 · 2021-04-27 14:17:27 +02:00 · 2021-04-26 16:19:57 +02:00
3 changed files with 7 additions and 3 deletions
--- a/datalinklayer/DataLinkLayer.h
+++ b/datalinklayer/DataLinkLayer.h
@@ -19,7 +19,8 @@ class VirtualChannelReception;
 class DataLinkLayer : public CCSDSReturnValuesIF {
 public:
 	static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::SYSTEM_1;
-	static const Event RF_AVAILABLE = MAKE_EVENT(0, severity::INFO); //!< A RF available signal was detected. P1: raw RFA state, P2: 0
+	//! [EXPORT] : [COMMENT] A RF available signal was detected. P1: raw RFA state, P2: 0
+	static const Event RF_AVAILABLE = MAKE_EVENT(0, severity::INFO);
 	static const Event RF_LOST = MAKE_EVENT(1, severity::INFO); //!< A previously found RF available signal was lost. P1: raw RFA state, P2: 0
 	static const Event BIT_LOCK = MAKE_EVENT(2, severity::INFO); //!< A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0
 	static const Event BIT_LOCK_LOST = MAKE_EVENT(3, severity::INFO); //!< A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0
--- a/devicehandlers/DeviceHandlerBase.cpp
+++ b/devicehandlers/DeviceHandlerBase.cpp
@@ -308,11 +308,11 @@ void DeviceHandlerBase::doStateMachine() {
        uint32_t currentUptime;
        Clock::getUptime(&currentUptime);
        if (currentUptime - timeoutStart >= childTransitionDelay) {
-#if FSFW_VERBOSE_LEVEL >= 1
+#if FSFW_VERBOSE_LEVEL >= 1 && FSFW_OBJ_EVENT_TRANSLATION == 0
            char printout[60];
            sprintf(printout, "Transition timeout (%lu) occured !",
                    static_cast<unsigned long>(childTransitionDelay));
-            /* Very common configuration error, so print it */
+            /* Common configuration error for development, so print it */
            printWarningOrError(sif::OutputTypes::OUT_WARNING, "doStateMachine",
                    RETURN_FAILED, printout);
 #endif
--- a/parameters/ParameterHelper.cpp
+++ b/parameters/ParameterHelper.cpp
@@ -65,6 +65,9 @@ ReturnValue_t ParameterHelper::handleParameterMessage(CommandMessage *message) {
        ParameterWrapper ownerWrapper;
        result = owner->getParameter(domain, uniqueIdentifier, &ownerWrapper,
                &streamWrapper, linearIndex);
+        if(result != HasReturnvaluesIF::RETURN_OK) {
+            return result;
+        }

        result = ownerWrapper.copyFrom(&streamWrapper, linearIndex);
        if (result != HasReturnvaluesIF::RETURN_OK) {
Author	SHA1	Message	Date
Robin Mueller	d7d24bd9aa	Merge remote-tracking branch 'upstream/mueller/master' into mueller/master	2021-05-05 22:48:29 +02:00
Robin Mueller	f3530d3c7e	small format change for event to test	2021-04-30 23:59:45 +02:00
Robin Mueller	5c9b1769c1	Merge remote-tracking branch 'origin/development' into mueller/master	2021-04-28 22:18:08 +02:00
gaisser	9f83739771	Merge pull request 'dhb multiple replies support' (#416 ) from eive/fsfw:meier/multipleRepliesDhb into development Reviewed-on: fsfw/fsfw#416	2021-04-27 14:18:15 +02:00
Robin Mueller	054de9781b	avoid duplicate printout	2021-04-27 14:17:27 +02:00
gaisser	20e7fe6cb1	Merge branch 'development' into meier/multipleRepliesDhb	2021-04-26 16:19:57 +02:00
gaisser	f8cd8e1e7d	Merge pull request 'ParameterHelper: Returnvalue not checked' (#417 ) from KSat/fsfw:mueller/parameter-bugfix into development Reviewed-on: fsfw/fsfw#417	2021-04-26 16:19:31 +02:00
Robin Mueller	818634755d	checking returnvalue now	2021-04-26 15:47:49 +02:00
Jakob.Meier	87fee9bd0e	dhb multiple replies support	2021-04-25 11:40:04 +02:00