From 0204e2dc85a95d43ee3c439889ecdbdbfaa1f6b2 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 12 Mar 2021 10:44:28 -0500 Subject: [PATCH 1/4] Fix #133, Use quotes for local includes --- .../coveragetest/sample_app_coveragetest_common.h | 14 +++++++------- unit-test/inc/ut_sample_app.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/unit-test/coveragetest/sample_app_coveragetest_common.h b/unit-test/coveragetest/sample_app_coveragetest_common.h index 0366374..8412c14 100644 --- a/unit-test/coveragetest/sample_app_coveragetest_common.h +++ b/unit-test/coveragetest/sample_app_coveragetest_common.h @@ -32,14 +32,14 @@ * Includes */ -#include -#include -#include +#include "utassert.h" +#include "uttest.h" +#include "utstubs.h" -#include -#include -#include -#include +#include "cfe.h" +#include "sample_app_events.h" +#include "sample_app.h" +#include "sample_app_table.h" /* * Macro to call a function and check its int32 return code diff --git a/unit-test/inc/ut_sample_app.h b/unit-test/inc/ut_sample_app.h index 3d55ecb..b1ae884 100644 --- a/unit-test/inc/ut_sample_app.h +++ b/unit-test/inc/ut_sample_app.h @@ -39,8 +39,8 @@ * Necessary to include these here to get the definition of the * "SAMPLE_APP_Data_t" typedef. */ -#include -#include +#include "sample_app_events.h" +#include "sample_app.h" /* * Allow UT access to the global "SAMPLE_APP_Data" object. From ba6148ad4b902034dd7a4191765632cd7484e14a Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Tue, 16 Mar 2021 09:25:41 -0400 Subject: [PATCH 2/4] Fix #131, add context to the values for MsgIDs --- fsw/platform_inc/sample_app_msgids.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fsw/platform_inc/sample_app_msgids.h b/fsw/platform_inc/sample_app_msgids.h index 4efdf2b..2c8ead4 100644 --- a/fsw/platform_inc/sample_app_msgids.h +++ b/fsw/platform_inc/sample_app_msgids.h @@ -24,15 +24,20 @@ ** Define Sample App Message IDs ** ** Notes: -** +** Message ID bits relate to the message header based on which version +** of the message id implementation is being used ** *************************************************************************/ #ifndef _sample_app_msgids_h_ #define _sample_app_msgids_h_ +/* The Sample App assumes default configuration which uses V1 of message id implementation */ + +/* V1 Command Message IDs must be 0x18xx */ #define SAMPLE_APP_CMD_MID 0x1882 #define SAMPLE_APP_SEND_HK_MID 0x1883 -#define SAMPLE_APP_HK_TLM_MID 0x0883 +/* V1 Telemetry Message IDs must be 0x08xx */ +#define SAMPLE_APP_HK_TLM_MID 0x0883 #endif /* _sample_app_msgids_h_ */ From 3a1b39ca424121e1b14c3925c25ee81773889ce5 Mon Sep 17 00:00:00 2001 From: Ariel Adams Date: Tue, 16 Mar 2021 13:10:47 -0500 Subject: [PATCH 3/4] Fix #135, Add Contributing Guide --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..2da34ba --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Contributing Guide + +Please see our [top-level contributing guide](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md) for more information on how to contribute. \ No newline at end of file From a60d98c609cfcf7a731cb5414206a6833da42690 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Mon, 22 Mar 2021 15:14:27 -0400 Subject: [PATCH 4/4] IC:2021-03-23, Bump to v1.2.0-rc1+dev54 --- README.md | 7 +++++++ fsw/src/sample_app_version.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a0b1855..391d689 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,13 @@ sample_app is an example for how to build and link an application in cFS. See al ## Version History +### Development Build: 1.2.0-rc1+dev56 + +- Replaces <> with " in local includes +- Adds CONTRIBUTIING.md that links to the main cFS contributing guide. +- Adds a description for the requirements of command and telemetry Message IDs to explain why the Msg IDs have those requirements in documentation. +- See + ### Development Build: 1.2.0-rc1+dev48 - Fix #126, simplify build to use wrappers and interface libs diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index 6643d33..a1ebd12 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -32,7 +32,7 @@ /* Development Build Macro Definitions */ -#define SAMPLE_APP_BUILD_NUMBER 48 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_APP_BUILD_NUMBER 56 /*!< Development Build: Number of commits since baseline */ #define SAMPLE_APP_BUILD_BASELINE \ "v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */