Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration candidate 2020-10-13 #56

Merged
merged 3 commits into from
Oct 13, 2020
Merged

Integration candidate 2020-10-13 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c15c1b
Fix #54, Update CI to use osal_id_t
jphickey Sep 8, 2020
671357c
Merge pull request #55 from jphickey/fix-54-osal-id-type
astrogeco Oct 12, 2020
ddbabad
Bump to v2.4.0-rc1+dev2 and update ReadMe
astrogeco Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac

## Version History


### Development Build: 2.4.0-rc1+dev2

- Update the SocketID field to be `osal_id_t` instead of uint32
- Set Revision number to 99 for development version identifier in telemetry
- See <https://github.com/nasa/ci_lab/pull/56>


### Development Build: 2.3.0+dev36

- Add build name and build number to version reporting
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/ci_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ typedef struct
bool SocketConnected;
CFE_SB_PipeId_t CommandPipe;
CFE_SB_MsgPtr_t MsgPtr;
uint32 SocketID;
osal_id_t SocketID;
OS_SockAddr_t SocketAddress;

CI_LAB_HkTlm_Buffer_t HkBuffer;
Expand Down
13 changes: 7 additions & 6 deletions fsw/src/ci_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@

/* Development Build Macro Definitions */

#define CI_LAB_BUILD_NUMBER 36 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_BASELINE "v2.3.0" /*!< Development Build: git tag that is the base for the current development */
#define CI_LAB_BUILD_NUMBER 2 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_BASELINE \
"v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */

/* Version Macro Definitions */

#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define CI_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
#define CI_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define CI_LAB_REVISION 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
#define CI_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */

#define CI_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
#define CI_LAB_STR(x) CI_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */
Expand Down