From e2b80fbe6cdf188785555f2eaea17ac34be0550a Mon Sep 17 00:00:00 2001 From: Avi Date: Mon, 26 Sep 2022 18:37:36 +1000 Subject: [PATCH 1/4] Fix #176, Misaligned comments --- fsw/src/sample_app.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index 7c3e884..2501533 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -43,6 +43,7 @@ SAMPLE_APP_Data_t SAMPLE_APP_Data; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ +/* */ /* SAMPLE_APP_Main() -- Application entry point and main process loop */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ @@ -305,7 +306,7 @@ void SAMPLE_APP_ProcessGroundCommand(CFE_SB_Buffer_t *SBBufPtr) } /* End of SAMPLE_APP_ProcessGroundCommand() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ -/* Name: SAMPLE_APP_ReportHousekeeping */ +/* Name: SAMPLE_APP_ReportHousekeeping */ /* */ /* Purpose: */ /* This function is triggered in response to a task telemetry request */ @@ -343,7 +344,7 @@ int32 SAMPLE_APP_ReportHousekeeping(const CFE_MSG_CommandHeader_t *Msg) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ /* */ -/* SAMPLE_APP_Noop -- SAMPLE NOOP commands */ +/* SAMPLE_APP_Noop -- SAMPLE NOOP commands */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ int32 SAMPLE_APP_Noop(const SAMPLE_APP_NoopCmd_t *Msg) @@ -359,7 +360,7 @@ int32 SAMPLE_APP_Noop(const SAMPLE_APP_NoopCmd_t *Msg) } /* End of SAMPLE_APP_Noop */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ -/* Name: SAMPLE_APP_ResetCounters */ +/* Name: SAMPLE_APP_ResetCounters */ /* */ /* Purpose: */ /* This function resets all the global counter variables that are */ @@ -379,7 +380,7 @@ int32 SAMPLE_APP_ResetCounters(const SAMPLE_APP_ResetCountersCmd_t *Msg) } /* End of SAMPLE_APP_ResetCounters() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ -/* Name: SAMPLE_APP_Process */ +/* Name: SAMPLE_APP_Process */ /* */ /* Purpose: */ /* This function Process Ground Station Command */ @@ -421,7 +422,7 @@ int32 SAMPLE_APP_Process(const SAMPLE_APP_ProcessCmd_t *Msg) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ /* */ -/* SAMPLE_APP_VerifyCmdLength() -- Verify command packet length */ +/* SAMPLE_APP_VerifyCmdLength() -- Verify command packet length */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ bool SAMPLE_APP_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) @@ -457,7 +458,7 @@ bool SAMPLE_APP_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ -/* SAMPLE_APP_TblValidationFunc -- Verify contents of First Table */ +/* SAMPLE_APP_TblValidationFunc -- Verify contents of First Table */ /* buffer contents */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -481,8 +482,7 @@ int32 SAMPLE_APP_TblValidationFunc(void *TblData) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ -/* SAMPLE_APP_GetCrc -- Output CRC */ -/* */ +/* SAMPLE_APP_GetCrc -- Output CRC */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void SAMPLE_APP_GetCrc(const char *TableName) From 7955272618e61359d236af0548d33808f1a8373a Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 27 Sep 2022 14:54:58 +1000 Subject: [PATCH 2/4] Fix #178, Remove unnecessary parentheses around return values. --- fsw/src/sample_app.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index 7c3e884..ae6bf79 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -157,7 +157,7 @@ int32 SAMPLE_APP_Init(void) if (status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("Sample App: Error Registering Events, RC = 0x%08lX\n", (unsigned long)status); - return (status); + return status; } /* @@ -172,7 +172,7 @@ int32 SAMPLE_APP_Init(void) if (status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("Sample App: Error creating pipe, RC = 0x%08lX\n", (unsigned long)status); - return (status); + return status; } /* @@ -182,7 +182,7 @@ int32 SAMPLE_APP_Init(void) if (status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("Sample App: Error Subscribing to HK request, RC = 0x%08lX\n", (unsigned long)status); - return (status); + return status; } /* @@ -193,7 +193,7 @@ int32 SAMPLE_APP_Init(void) { CFE_ES_WriteToSysLog("Sample App: Error Subscribing to Command, RC = 0x%08lX\n", (unsigned long)status); - return (status); + return status; } /* @@ -205,7 +205,7 @@ int32 SAMPLE_APP_Init(void) { CFE_ES_WriteToSysLog("Sample App: Error Registering Table, RC = 0x%08lX\n", (unsigned long)status); - return (status); + return status; } else { @@ -215,7 +215,7 @@ int32 SAMPLE_APP_Init(void) CFE_EVS_SendEvent(SAMPLE_APP_STARTUP_INF_EID, CFE_EVS_EventType_INFORMATION, "SAMPLE App Initialized.%s", SAMPLE_APP_VERSION_STRING); - return (CFE_SUCCESS); + return CFE_SUCCESS; } /* End of SAMPLE_APP_Init() */ @@ -451,7 +451,7 @@ bool SAMPLE_APP_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength SAMPLE_APP_Data.ErrCounter++; } - return (result); + return result; } /* End of SAMPLE_APP_VerifyCmdLength() */ From 29d301c7cfaaeeaa6dba96bb3a10d47032634972 Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 28 Sep 2022 14:43:15 +1000 Subject: [PATCH 3/4] Fix #180, Remove 'return;' from last line of void functions. --- fsw/src/sample_app.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index 377a8ec..f4a8e89 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -227,9 +227,6 @@ void SAMPLE_APP_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr) "SAMPLE: invalid command packet,MID = 0x%x", (unsigned int)CFE_SB_MsgIdToValue(MsgId)); break; } - - return; - } /* End SAMPLE_APP_ProcessCommandPacket */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ @@ -278,9 +275,6 @@ void SAMPLE_APP_ProcessGroundCommand(CFE_SB_Buffer_t *SBBufPtr) "Invalid ground command code: CC = %d", CommandCode); break; } - - return; - } /* End of SAMPLE_APP_ProcessGroundCommand() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ @@ -480,7 +474,4 @@ void SAMPLE_APP_GetCrc(const char *TableName) Crc = TblInfoPtr.Crc; CFE_ES_WriteToSysLog("Sample App: CRC: 0x%08lX\n\n", (unsigned long)Crc); } - - return; - } /* End of SAMPLE_APP_GetCrc */ From ec6ed865901429c0cf43e767dd13d135aed85999 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 3 Oct 2022 16:51:07 -0400 Subject: [PATCH 4/4] Bump to v1.3.0-rc4+dev27 --- README.md | 6 ++++++ fsw/src/sample_app_version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ab637c..0f2b5da 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ sample_app is an example for how to build and link an application in cFS. See al ## Version History +### Development Build: v1.3.0-rc4+dev27 +- Misaligned comments +- Remove unnecessary parentheses around return values. +- Remove 'return;' from last line of void functions. +- See , , and + ### Development Build: v1.3.0-rc4+dev21 - Remove registration of empty event filters diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index 6702fec..f7065d8 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -27,7 +27,7 @@ /* Development Build Macro Definitions */ -#define SAMPLE_APP_BUILD_NUMBER 21 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_APP_BUILD_NUMBER 27 /*!< Development Build: Number of commits since baseline */ #define SAMPLE_APP_BUILD_BASELINE \ "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */