Merge branch 'eive/develop' into mueller/extend-version-class-fork

hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.cpp

@@ -375,7 +375,7 @@ float MgmLIS3MDLHandler::getSensitivityFactor(MGMLIS3MDL::Sensitivies sens) {
 
 ReturnValue_t MgmLIS3MDLHandler::enableTemperatureSensor(const uint8_t *commandData,
                                                          size_t commandDataLen) {
-  if (commandData == nullptr) {
+  if(commandData == nullptr) {
     return INVALID_COMMAND_PARAMETER;
   }
   triggerEvent(CHANGE_OF_SETUP_PARAMETER);

src/fsfw/devicehandlers/DeviceHandlerBase.h

@@ -620,7 +620,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
    * @param[out] numberOfSwitches length of returned array
    * @return
    *      - @c RETURN_OK if the parameters were set
-   *      - @c RETURN_FAILED or DeviceHandlerBase::NO_SWITCH if no switches exist
+   *      - @c RETURN_FAILED if no switches exist
    */
   virtual ReturnValue_t getSwitches(const uint8_t **switches, uint8_t *numberOfSwitches);
 

src/fsfw/power/PowerSwitcher.h

@@ -18,8 +18,7 @@ class PowerSwitcher : public HasReturnvaluesIF {
   static const uint8_t INTERFACE_ID = CLASS_ID::POWER_SWITCHER;
   static const ReturnValue_t IN_POWER_TRANSITION = MAKE_RETURN_CODE(1);
   static const ReturnValue_t SWITCH_STATE_MISMATCH = MAKE_RETURN_CODE(2);
-  PowerSwitcher(PowerSwitchIF* switcher, power::Switch_t setSwitch1,
-                power::Switch_t setSwitch2 = power::NO_SWITCH,
+  PowerSwitcher(PowerSwitchIF* switcher, uint8_t setSwitch1, uint8_t setSwitch2 = power::NO_SWITCH,
                 State_t setStartState = SWITCH_IS_OFF);
   void turnOn(bool checkCurrentState = true);
   void turnOff(bool checkCurrentState = true);

src/fsfw/tasks/FixedSlotSequence.cpp

@@ -138,23 +138,23 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
 }
 
 ReturnValue_t FixedSlotSequence::intializeSequenceAfterTaskCreation() const {
-  std::set<ExecutableObjectIF*> uniqueObjects = {};
-  uint32_t failedCount = 0;
+  std::set<ExecutableObjectIF*> uniqueObjects;
+  uint32_t count = 0;
   for (const auto& slot : slotList) {
     // Ensure that each unique object is initialized once.
     if (uniqueObjects.find(slot.executableObject) == uniqueObjects.end()) {
       ReturnValue_t result = slot.executableObject->initializeAfterTaskCreation();
       if (result != HasReturnvaluesIF::RETURN_OK) {
-        failedCount++;
+        count++;
       }
       uniqueObjects.emplace(slot.executableObject);
     }
   }
-  if (failedCount > 0) {
+  if (count > 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::error << "FixedSlotSequence::intializeSequenceAfterTaskCreation:"
                   "Counted "
-               << failedCount << " failed initializations" << std::endl;
+               << count << " failed initializations!" << std::endl;
 #endif
     return HasReturnvaluesIF::RETURN_FAILED;
   }