Skip to content

Commit 4599f33

Browse files
committed
Update build baseline and bump to v7.0.0-rc4+dev39
- Set new build baseline for cFS-Caelum-rc4: v7.0.0-rc4 - Standardize development indicators in cfe_version.h to use 0xFF in MissionRev to indicate development
1 parent b2e37c8 commit 4599f33

File tree

2 files changed

+33
-7
lines changed

2 files changed

+33
-7
lines changed

README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,25 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
1010

1111
## Version History
1212

13+
### Development Build: v7.0.0-rc4+dev39
14+
15+
- Use cfe time clock state enum t in cmd/tlm and handling
16+
- EVS functional test add for different event types
17+
- Patch for recursive event loop
18+
- CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t
19+
- Avoid aliasing warnings
20+
- Message ID type improvements
21+
- CFE_SB_ValueToMsgId/MsgIdToValue wrappers
22+
- Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling
23+
- Consolidate repeated MSG stub setup in sb_UT
24+
- Return type conversions in CFE_ES_GetTaskName
25+
- Better message type pointer conversion
26+
- Replacing hardcoded message limit in TIME services
27+
- Use macro in CFE_ResourceId_IsDefined
28+
- Checking against IsNewOffset only
29+
- Set new build baseline for cFS-Caelum-rc4: v7.0.0-rc4
30+
- See <https://github.com/nasa/cFE/pull/2001> and <https://github.com/nasa/cFS/pull/390>
31+
1332
### Development Build: v6.8.0-rc1+dev1030
1433

1534
- Grammatical cleanup of requirements

modules/core_api/fsw/inc/cfe_version.h

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@
2828
#define CFE_VERSION_H
2929

3030
/* Development Build Macro Definitions */
31-
#define CFE_BUILD_NUMBER 1030 /**< @brief Development: Number of development commits since baseline */
32-
#define CFE_BUILD_BASELINE "v6.8.0-rc1" /**< @brief Development: Reference git tag for build number */
31+
#define CFE_BUILD_NUMBER 39 /**< @brief Development: Number of development commits since baseline */
32+
#define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
3333

3434
/* Version Macro Definitions updated for official releases only */
35-
#define CFE_MAJOR_VERSION 6 /**< @brief Major release version (Former for Revision == 99) */
36-
#define CFE_MINOR_VERSION 7 /**< @brief Minor release version (Former for Revision == 99) */
37-
#define CFE_REVISION 99 /**< @brief Revision, 99 indicates development */
38-
#define CFE_MISSION_REV 0 /**< @brief Mission revision, reserved for mission use */
35+
#define CFE_MAJOR_VERSION 6 /**< @brief Major release version (Former for Revision == 99) */
36+
#define CFE_MINOR_VERSION 7 /**< @brief Minor release version (Former for Revision == 99) */
37+
#define CFE_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
38+
39+
/*!
40+
* @brief Mission revision.
41+
*
42+
* Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
43+
* Values 1-254 are reserved for mission use to denote patches/customizations as needed.
44+
*/
45+
#define CFE_MISSION_REV 0xFF /**< @brief Mission revision, reserved for mission use */
3946

4047
#define CFE_STR_HELPER(x) #x /**< @brief Convert argument to string */
4148
#define CFE_STR(x) CFE_STR_HELPER(x) /**< @brief Expand macro before conversion */
@@ -55,6 +62,6 @@
5562
* and official releases.
5663
*/
5764
#define CFE_VERSION_STRING \
58-
" cFE DEVELOPMENT BUILD " CFE_SRC_VERSION " (Codename: Bootes), Last Official Release: cfe v6.7.0"
65+
" cFE DEVELOPMENT BUILD " CFE_SRC_VERSION " (Codename: Draco), Last Official Release: cfe v6.7.0"
5966

6067
#endif /* CFE_VERSION_H */

0 commit comments

Comments
 (0)