src/fsfw/devicehandlers/DeviceCommunicationIF.h

@@ -85,9 +85,10 @@ public:
 	 * Called by DHB in the GET_WRITE doGetWrite().
 	 * Get send confirmation that the data in sendMessage() was sent successfully.
 	 * @param cookie
-	 * @return - @c RETURN_OK if data was sent successfull
+	 * @return
-	 * 		   - Everything else triggers falure event with
+	 *  - @c RETURN_OK if data was sent successfully but a reply is expected
-	 * 		     returnvalue as parameter 1
+	 *  - NO_REPLY_EXPECTED if data was sent successfully and no reply is expected
+	 *  - Everything else to indicate failure
 	 */
 	virtual ReturnValue_t getSendSuccess(CookieIF *cookie) = 0;
 

src/fsfw/devicehandlers/DeviceHandlerBase.cpp

@@ -648,11 +648,12 @@ void DeviceHandlerBase::doGetWrite() {
             replyRawData(rawPacket, rawPacketLen, requestedRawTraffic, true);
         }
 
-        //We need to distinguish here, because a raw command never expects a reply.
+        // We need to distinguish here, because a raw command never expects a reply.
-        //(Could be done in eRIRM, but then child implementations need to be careful.
+        // This could be done in the #enableReplyInReplyMap call,
+        // but then child implementations would need to be careful.
         result = enableReplyInReplyMap(cookieInfo.pendingCommand);
-    } else {
+    } else if (result != NO_REPLY_EXPECTED) {
-        //always generate a failure event, so that FDIR knows what's up
+        // always generate a failure event, so that FDIR knows what's up
         triggerEvent(DEVICE_SENDING_COMMAND_FAILED, result,
                 cookieInfo.pendingCommand->first);
     }
@@ -1336,10 +1337,20 @@ void DeviceHandlerBase::buildInternalCommand(void) {
         DeviceCommandMap::iterator iter = deviceCommandMap.find(
                 deviceCommandId);
         if (iter == deviceCommandMap.end()) {
+#if FSFW_VERBOSE_LEVEL >= 1
+            char output[36];
+            sprintf(output, "Command 0x%08x unknown",
+                    static_cast<unsigned int>(deviceCommandId));
+            // so we can track misconfigurations
+            printWarningOrError(sif::OutputTypes::OUT_WARNING,
+                    "buildInternalCommand",
+                    COMMAND_NOT_SUPPORTED,
+                    output);
+#endif
             result = COMMAND_NOT_SUPPORTED;
         }
         else if (iter->second.isExecuting) {
-#if FSFW_DISABLE_PRINTOUT == 0
+#if FSFW_VERBOSE_LEVEL >= 1
             char output[36];
             sprintf(output, "Command 0x%08x is executing",
                     static_cast<unsigned int>(deviceCommandId));

src/fsfw/devicehandlers/DeviceHandlerBase.h

@@ -327,15 +327,17 @@ protected:
      * The existence of the command in the command map and the command size check against 0 are
      * done by the base class.
      *
+     * The base class will generate a finish reply or a step automatically as long as the
+     * send success is confirmed in the #getSendSuccess function call of the communication
+     * interface. NO_REPLY_EXPECTED should be returned for a finish reply, RETURN_OK should be
+     * returned for a step reply and everything else will trigger a step failure.
+     *
      * @param deviceCommand     The command to build, already checked against deviceCommandMap
      * @param commandData       Pointer to the data from the direct command
      * @param commandDataLen    Length of commandData
      * @return
      *  - @c RETURN_OK to send command after #rawPacket and #rawPacketLen
      *       have been set.
-     *  - @c HasActionsIF::EXECUTION_COMPLETE to generate a finish reply immediately. This can
-     *       be used if no reply is expected. Otherwise, the developer can call #actionHelper.finish
-     *       to finish the command handling.
      *  - Anything else triggers an event with the return code as a parameter as well as a
      *    step reply failed with the return code
      */

src/fsfw/devicehandlers/DeviceHandlerIF.h

@@ -120,7 +120,8 @@ public:
 	static const ReturnValue_t WRONG_MODE_FOR_COMMAND = MAKE_RETURN_CODE(0xA5);
 	static const ReturnValue_t TIMEOUT = MAKE_RETURN_CODE(0xA6);
 	static const ReturnValue_t BUSY = MAKE_RETURN_CODE(0xA7);
-	static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8); //!< Used to indicate that this is a command-only command.
+	//!< Used to indicate that this is a command-only command.
+	static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8);
 	static const ReturnValue_t NON_OP_TEMPERATURE = MAKE_RETURN_CODE(0xA9);
 	static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xAA);