Merge pull request 'Update package 2' (#380) from KSat/fsfw:mueller/update-package-2 into development

Reviewed-on: fsfw/fsfw#380

action/ActionHelper.cpp

@@ -46,7 +46,7 @@ void ActionHelper::step(uint8_t step, MessageQueueId_t reportTo,
 void ActionHelper::finish(bool success, MessageQueueId_t reportTo, ActionId_t commandId,
         ReturnValue_t result) {
     CommandMessage reply;
-    ActionMessage::setCompletionReply(success, &reply, commandId, result);
+    ActionMessage::setCompletionReply(&reply, commandId, success, result);
     queueToUse->sendMessage(reportTo, &reply);
 }
 
@@ -69,7 +69,7 @@ void ActionHelper::prepareExecution(MessageQueueId_t commandedBy,
     ipcStore->deleteData(dataAddress);
     if(result == HasActionsIF::EXECUTION_FINISHED) {
         CommandMessage reply;
-        ActionMessage::setCompletionReply(true, &reply, actionId, result);
+        ActionMessage::setCompletionReply(&reply, actionId, true, result);
         queueToUse->sendMessage(commandedBy, &reply);
     }
     if (result != HasReturnvaluesIF::RETURN_OK) {

action/ActionMessage.cpp

@@ -53,8 +53,8 @@ void ActionMessage::setDataReply(CommandMessage* message, ActionId_t actionId,
     message->setParameter2(data.raw);
 }
 
-void ActionMessage::setCompletionReply(bool success, CommandMessage* message,
+void ActionMessage::setCompletionReply(CommandMessage* message,
-        ActionId_t fid, ReturnValue_t result) {
+        ActionId_t fid, bool success, ReturnValue_t result) {
     if (success) {
         message->setCommand(COMPLETION_SUCCESS);
     }

action/ActionMessage.h

@@ -38,8 +38,8 @@ public:
     static ReturnValue_t getReturnCode(const CommandMessage* message );
     static void setDataReply(CommandMessage* message, ActionId_t actionId,
             store_address_t data);
-    static void setCompletionReply(bool success, CommandMessage* message, ActionId_t fid,
+    static void setCompletionReply(CommandMessage* message, ActionId_t fid,
-            ReturnValue_t result = HasReturnvaluesIF::RETURN_OK);
+            bool success, ReturnValue_t result = HasReturnvaluesIF::RETURN_OK);
 
     static void clear(CommandMessage* message);
 };

action/SimpleActionHelper.cpp

@@ -62,8 +62,8 @@ void SimpleActionHelper::prepareExecution(MessageQueueId_t commandedBy,
         stepCount++;
         break;
     case HasActionsIF::EXECUTION_FINISHED:
-        ActionMessage::setCompletionReply(true, &reply, actionId,
+        ActionMessage::setCompletionReply(&reply, actionId,
-                HasReturnvaluesIF::RETURN_OK);
+                true, HasReturnvaluesIF::RETURN_OK);
         queueToUse->sendMessage(commandedBy, &reply);
         break;
     default:

datapoollocal/LocalPoolDataSetBase.cpp

@@ -36,7 +36,7 @@ LocalPoolDataSetBase::LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner,
     this->sid.objectId = hkOwner->getObjectId();
     this->sid.ownerSetId = setId;
 
-    // Data creators get a periodic helper for periodic HK data generation.
+    /* Data creators get a periodic helper for periodic HK data generation. */
     if(periodicHandling) {
         periodicHelper = new PeriodicHousekeepingHelper(this);
     }

datapoollocal/LocalPoolVariable.tpp

@@ -98,7 +98,6 @@ inline ReturnValue_t LocalPoolVariable<T>::commitWithoutLock() {
     }
 
     PoolEntry<T>* poolEntry = nullptr;
-    //ReturnValue_t result = hkManager->fetchPoolEntry(localPoolId, &poolEntry);
     ReturnValue_t result = LocalDpManagerAttorney::fetchPoolEntry(*hkManager, localPoolId,
             &poolEntry);
     if(result != RETURN_OK) {

ipc/MutexHelper.h

@@ -39,6 +39,9 @@ public:
             sif::printError("MutexHelper: Lock of Mutex failed with code %d\n", status);
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
         }
+#else
+        /* To avoid unused variable warning */
+        static_cast<void>(status);
 #endif /* FSFW_VERBOSE_LEVEL >= 1 */
     }
 

osal/rtems/Clock.cpp

@@ -105,20 +105,28 @@ ReturnValue_t Clock::getClock_usecs(uint64_t* time) {
 
 ReturnValue_t Clock::getDateAndTime(TimeOfDay_t* time) {
     /* For all but the last field, the struct will be filled with the correct values */
-	rtems_time_of_day* timeRtems = reinterpret_cast<rtems_time_of_day*>(time);
+    rtems_time_of_day timeRtems;
-	rtems_status_code status = rtems_clock_get_tod(timeRtems);
+    rtems_status_code status = rtems_clock_get_tod(&timeRtems);
-	/* The last field now contains the RTEMS ticks of the seconds from 0
-    to rtems_clock_get_ticks_per_second() minus one. We calculate the microseconds accordingly */
-	timeRtems->ticks = static_cast<float>(timeRtems->ticks) /
-	        rtems_clock_get_ticks_per_second() * 1e6;
     switch (status) {
-	case RTEMS_SUCCESSFUL:
+    case RTEMS_SUCCESSFUL: {
+        /* The last field now contains the RTEMS ticks of the seconds from 0
+        to rtems_clock_get_ticks_per_second() minus one.
+        We calculate the microseconds accordingly */
+        time->day = timeRtems.day;
+        time->hour = timeRtems.hour;
+        time->minute = timeRtems.minute;
+        time->month = timeRtems.month;
+        time->second = timeRtems.second;
+        time->usecond = static_cast<float>(timeRtems.ticks) /
+                rtems_clock_get_ticks_per_second() * 1e6;
+        time->year = timeRtems.year;
         return HasReturnvaluesIF::RETURN_OK;
+    }
     case RTEMS_NOT_DEFINED:
-		//system date and time is not set
+        /* System date and time is not set */
         return HasReturnvaluesIF::RETURN_FAILED;
     case RTEMS_INVALID_ADDRESS:
-		//time_buffer is NULL
+        /* time_buffer is NULL */
         return HasReturnvaluesIF::RETURN_FAILED;
     default:
         return HasReturnvaluesIF::RETURN_FAILED;