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

Fix #145, updating ci_lab to use new versioning system. #171

Merged
merged 6 commits into from
Jan 18, 2024
Merged

Fix #145, updating ci_lab to use new versioning system. #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5f7682
Create icbundle.yml
dzbaker Aug 17, 2023
d381aea
Update icbundle.yml
dzbaker Aug 17, 2023
e9a7e66
Update icbundle.yml
dzbaker Aug 17, 2023
014c9d5
Update icbundle.yml
dzbaker Aug 17, 2023
92edb74
Merge branch 'nasa:main' into main
dzbaker Dec 26, 2023
9819046
Fix #145, updating ci_lab to use new versioning system.
dzbaker Dec 26, 2023
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
6 changes: 5 additions & 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 @@ -104,6 +104,7 @@ void CI_LAB_TaskInit(void)
{
int32 status;
uint16 DefaultListenPort;
char VersionString[CI_LAB_CFG_MAX_VERSION_STR_LEN];

memset(&CI_LAB_Global, 0, sizeof(CI_LAB_Global));

Expand Down Expand Up @@ -172,8 +173,11 @@ void CI_LAB_TaskInit(void)
CFE_MSG_Init(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader), CFE_SB_ValueToMsgId(CI_LAB_HK_TLM_MID),
sizeof(CI_LAB_Global.HkTlm));

CFE_Config_GetVersionString(VersionString, CI_LAB_CFG_MAX_VERSION_STR_LEN, "CI Lab App",
CI_LAB_VERSION, CI_LAB_BUILD_CODENAME, CI_LAB_LAST_OFFICIAL);

CFE_EVS_SendEvent(CI_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s",
CI_LAB_VERSION_STRING);
VersionString);
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
Expand Down
1 change: 1 addition & 0 deletions fsw/src/ci_lab_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "common_types.h"
#include "osapi.h"
#include "cfe.h"
#include "cfe_config.h"

#include "ci_lab_mission_cfg.h"
#include "ci_lab_platform_cfg.h"
Expand Down
26 changes: 16 additions & 10 deletions fsw/src/ci_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,22 @@

/* Development Build Macro Definitions */

#define CI_LAB_BUILD_NUMBER 81 /*!< 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 */
#define CI_LAB_BUILD_NUMBER 81 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_BASELINE "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
#define CI_LAB_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CI_LAB_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */

/*
* Version Macros, see \ref cfsversions for definitions.
*/
#define CI_LAB_MAJOR_VERSION 2 /*!< @brief Major version number */
#define CI_LAB_MINOR_VERSION 3 /*!< @brief Minor version number */
#define CI_LAB_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
#define CI_LAB_REVISION 0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/

/**
* @brief Last official release.
*/
#define CI_LAB_LAST_OFFICIAL "v2.3.0"

/*!
* @brief Mission revision.
Expand All @@ -54,12 +60,12 @@
*/
#define CI_LAB_VERSION CI_LAB_BUILD_BASELINE "+dev" CI_LAB_STR(CI_LAB_BUILD_NUMBER)

/*! @brief Development Build Version String.
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
* official version. @n See @ref cfsversions for format differences between development and release versions.
/**
* @brief Max Version String length.
*
* Maximum length that a CI Lab version string can be.
*
*/
#define CI_LAB_VERSION_STRING \
" CI Lab App DEVELOPMENT BUILD " CI_LAB_VERSION \
", Last Official Release: v2.3.0" /* For full support please use this version */
#define CI_LAB_CFG_MAX_VERSION_STR_LEN 256

#endif
Loading