Merge branch 'develop' into eggert/acs-ctrl-action-cmds

CHANGELOG.md

@@ -19,6 +19,8 @@ will consitute of a breaking change warranting a new major release:
 ## Fixed
 
 - ADIS1650X: Added missing MDL_RANG pool entry for configuration set
+- Bumped FSFW for bugfix in health service: No execution complete for targeted health announce
+  command.
 - Removed matrix determinant calculation as part of the `MEKF`, which would take about
   300ms of runtime
 - Resetting the `MEKF` now also actually resets its stored state
@@ -32,6 +34,7 @@ will consitute of a breaking change warranting a new major release:
 
 ## Added
 
+- `ExecutableComIfDummy` class to have a dummy for classes like the RTD polling class.
 - Added `AcsController` action command to confirm solar array deployment, which then deletes
   two files
 - Added `AcsController` action command to reset `MEKF`

dummies/CMakeLists.txt

@@ -20,6 +20,7 @@ target_sources(
          GyroL3GD20Dummy.cpp
          MgmLIS3MDLDummy.cpp
          PlPcduDummy.cpp
+         ExecutableComIfDummy.cpp
          ScexDummy.cpp
          CoreControllerDummy.cpp
          PlocMpsocDummy.cpp

dummies/ExecutableComIfDummy.cpp

@@ -0,0 +1,27 @@
+#include <dummies/ExecutableComIfDummy.h>
+
+ExecutableComIfDummy::ExecutableComIfDummy(object_id_t objectId) : SystemObject(objectId) {}
+
+ReturnValue_t ExecutableComIfDummy::initializeInterface(CookieIF *cookie) {
+  return returnvalue::OK;
+}
+
+ReturnValue_t ExecutableComIfDummy::sendMessage(CookieIF *cookie, const uint8_t *sendData,
+                                                size_t sendLen) {
+  return returnvalue::OK;
+}
+
+ReturnValue_t ExecutableComIfDummy::getSendSuccess(CookieIF *cookie) { return returnvalue::OK; }
+
+ReturnValue_t ExecutableComIfDummy::requestReceiveMessage(CookieIF *cookie, size_t requestLen) {
+  return returnvalue::OK;
+}
+
+ReturnValue_t ExecutableComIfDummy::performOperation(uint8_t operationCode) {
+  return returnvalue::OK;
+}
+
+ReturnValue_t ExecutableComIfDummy::readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
+                                                        size_t *size) {
+  return returnvalue::OK;
+}

dummies/ExecutableComIfDummy.h

@@ -0,0 +1,21 @@
+#ifndef DUMMIES_EXECUTABLECOMIFDUMMY_H_
+#define DUMMIES_EXECUTABLECOMIFDUMMY_H_
+
+#include <fsfw/devicehandlers/DeviceCommunicationIF.h>
+#include <fsfw/objectmanager/SystemObject.h>
+#include <fsfw/tasks/ExecutableObjectIF.h>
+
+class ExecutableComIfDummy : public ExecutableObjectIF,
+                             public DeviceCommunicationIF,
+                             public SystemObject {
+ public:
+  ExecutableComIfDummy(object_id_t objectId);
+  ReturnValue_t performOperation(uint8_t operationCode = 0) override;
+  ReturnValue_t initializeInterface(CookieIF *cookie) override;
+  ReturnValue_t sendMessage(CookieIF *cookie, const uint8_t *sendData, size_t sendLen) override;
+  ReturnValue_t getSendSuccess(CookieIF *cookie) override;
+  ReturnValue_t requestReceiveMessage(CookieIF *cookie, size_t requestLen) override;
+  ReturnValue_t readReceivedMessage(CookieIF *cookie, uint8_t **buffer, size_t *size) override;
+};
+
+#endif /* DUMMIES_EXECUTABLECOMIFDUMMY_H_ */

dummies/helpers.cpp

@@ -5,6 +5,7 @@
 #include <dummies/ComCookieDummy.h>
 #include <dummies/ComIFDummy.h>
 #include <dummies/CoreControllerDummy.h>
+#include <dummies/ExecutableComIfDummy.h>
 #include <dummies/GpsCtrlDummy.h>
 #include <dummies/GpsDhbDummy.h>
 #include <dummies/GyroAdisDummy.h>
@@ -45,7 +46,7 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio
     new CoreControllerDummy(objects::CORE_CONTROLLER);
   }
   if (cfg.addRtdComIFDummy) {
-    new ComIFDummy(objects::SPI_RTD_COM_IF);
+    new ExecutableComIfDummy(objects::SPI_RTD_COM_IF);
   }
   std::array<object_id_t, 4> rwIds = {objects::RW1, objects::RW2, objects::RW3, objects::RW4};
   std::array<DeviceHandlerBase*, 4> rws;

fsfw

@@ -1 +1 @@
-Subproject commit bd208038dd85a94dce8c763397ad5ac7eae76402
+Subproject commit abcf1b29b2002e05b8a3974a9bc27f69531b8668