Merge pull request #121 from nasa/integration-candidate

ci_lab Integration candidate: Caelum-rc4+dev23
nasa · Oct 3, 2022 · 0ea953f · 0ea953f
2 parents c5aba5c + 1836e20
commit 0ea953f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac
 
 ## Changelog
 
+### Development Build: v2.5.0-rc4+dev30
+- Remove unnecessary parentheses around return values.
+- Remove 'return;' from last line of void functions.
+- See <https://github.com/nasa/ci_lab/pull/116> and <https://github.com/nasa/ci_lab/pull/118>
 
 ### Development Build: v2.5.0-rc4+dev24
 - Update cmake mimimum required to something more recent

diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -216,9 +216,6 @@ void CI_LAB_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr)
                               (unsigned int)CFE_SB_MsgIdToValue(MsgId));
             break;
     }
-
-    return;
-
 } /* End CI_LAB_ProcessCommandPacket */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
@@ -254,9 +251,6 @@ void CI_LAB_ProcessGroundCommand(CFE_SB_Buffer_t *SBBufPtr)
         default:
             break;
     }
-
-    return;
-
 } /* End of CI_LAB_ProcessGroundCommand() */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -325,9 +319,6 @@ void CI_LAB_ResetCounters_Internal(void)
     /* Status of packets ingested by CI task */
     CI_LAB_Global.HkTlm.Payload.IngestPackets = 0;
     CI_LAB_Global.HkTlm.Payload.IngestErrors  = 0;
-
-    return;
-
 } /* End of CI_LAB_ResetCounters() */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
@@ -389,9 +380,6 @@ void CI_LAB_ReadUpLink(void)
             break; /* no (more) messages */
         }
     }
-
-    return;
-
 } /* End of CI_LAB_ReadUpLink() */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
@@ -424,6 +412,6 @@ bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
         CI_LAB_Global.HkTlm.Payload.CommandErrorCounter++;
     }
 
-    return (result);
+    return result;
 
 } /* End of CI_LAB_VerifyCmdLength() */
diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h
@@ -25,7 +25,7 @@
 
 /* Development Build Macro Definitions */
 
-#define CI_LAB_BUILD_NUMBER 24 /*!< Development Build: Number of commits since baseline */
+#define CI_LAB_BUILD_NUMBER 30 /*!< Development Build: Number of commits since baseline */
 #define CI_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */