Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master

Merge branch 'eive/develop' into mueller/master
tweak op divider divisor
2021-09-20 18:33:03 +02:00 · 2021-09-20 18:32:28 +02:00 · 2021-09-20 18:31:52 +02:00 · 2021-09-20 18:29:57 +02:00 · 2021-09-17 07:55:57 +02:00
2 changed files with 2 additions and 1 deletions
--- a/hal/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
+++ b/hal/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
@@ -13,7 +13,7 @@ MgmRM3100Handler::MgmRM3100Handler(object_id_t objectId,
        DeviceHandlerBase(objectId, deviceCommunication, comCookie),
        primaryDataset(this), switchId(switchId), transitionDelay(transitionDelay) {
 #if FSFW_HAL_RM3100_MGM_DEBUG == 1
-    debugDivider = new PeriodicOperationDivider(1);
+    debugDivider = new PeriodicOperationDivider(3);
 #endif
 }

--- a/src/fsfw/globalfunctions/PeriodicOperationDivider.cpp
+++ b/src/fsfw/globalfunctions/PeriodicOperationDivider.cpp
@@ -12,6 +12,7 @@ bool PeriodicOperationDivider::checkAndIncrement() {
        if(resetAutomatically) {
            counter = 1;
        }
+        return opNecessary;
    }
    counter++;
    return opNecessary;
Author	SHA1	Message	Date
Robin Mueller	87b68e84be	Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master	2021-09-20 18:33:03 +02:00
Robin Müller	9948c4f31d	Merge branch 'eive/develop' into mueller/master	2021-09-20 18:32:28 +02:00
Robin Mueller	784a0140f4	tweak op divider divisor	2021-09-20 18:31:52 +02:00
Robin Mueller	635432d7ba	missing return	2021-09-20 18:29:57 +02:00
Jakob.Meier	4489a61a00	Merge pull request 'Update FSFW' (#13 ) from mueller/update-fsfw into eive/develop Reviewed-on: #13	2021-09-17 07:55:57 +02:00