From 1183e5739d73da42978e0ab3218b3ca53fff4489 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 18 Aug 2021 11:23:45 +0200
Subject: [PATCH] using upstream action helper

Will be merged upstream soon
---
 src/fsfw/action/ActionHelper.cpp | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/fsfw/action/ActionHelper.cpp b/src/fsfw/action/ActionHelper.cpp
index 85c39f05..3dfe8b50 100644
--- a/src/fsfw/action/ActionHelper.cpp
+++ b/src/fsfw/action/ActionHelper.cpp
@@ -32,17 +32,6 @@ ReturnValue_t ActionHelper::initialize(MessageQueueIF* queueToUse_) {
         setQueueToUse(queueToUse_);
     }
 
-    if(queueToUse == nullptr) {
-#if FSFW_VERBOSE_LEVEL >= 1
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::warning << "ActionHelper::initialize: No queue set" << std::endl;
-#else
-        sif::printWarning("ActionHelper::initialize: No queue set\n");
-#endif
-#endif /* FSFW_VERBOSE_LEVEL >= 1 */
-        return HasReturnvaluesIF::RETURN_FAILED;
-    }
-
     return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -66,19 +55,7 @@ void ActionHelper::setQueueToUse(MessageQueueIF* queue) {
 
 void ActionHelper::prepareExecution(MessageQueueId_t commandedBy,
         ActionId_t actionId, store_address_t dataAddress) {
-    if(ipcStore == nullptr) {
-#if FSFW_VERBOSE_LEVEL >= 1
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::warning << "ActionHelper::prepareExecution: IPC Store not set. Call initialize first"
-                << std::endl;
-#else
-        sif::printWarning("ActionHelper::prepareExecution: "
-                "IPC Store not set. Call initialize first\n");
-#endif
-#endif /* FSFW_VERBOSE_LEVEL >= 1 */
-        return;
-    }
-    const uint8_t* dataPtr = nullptr;
+    const uint8_t* dataPtr = NULL;
     size_t size = 0;
     ReturnValue_t result = ipcStore->getData(dataAddress, &dataPtr, &size);
     if (result != HasReturnvaluesIF::RETURN_OK) {