Skip to content

Commit

Permalink
Merge IC:Caelum-rc4+dev11, ci_lab v2.5.0-rc4+dev22
Browse files Browse the repository at this point in the history
- Remove registration of empty EVS filters
- Update codeql workflow for reusable updates
- See <nasa/cFS#505>
  • Loading branch information
astrogeco committed Jun 22, 2022
2 parents 1903273 + 5c780dc commit 9a70ffa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ This lab application is a non-flight utility to send commands to the cFS Bundle.

ci_lab is a simple command uplink application that accepts CCSDS telecommand packets over a UDP/IP port. It does not provide a full CCSDS Telecommand stack implementation.

## Version History
## Changelog


### Development Build: v2.5.0-rc4+dev22

- Remove registration of empty EVS filters
- Update codeql workflow for reusable updates
- See <https://github.com/nasa/cFS/pull/505>

### Development Build: v2.5.0-rc4+dev17

Expand Down
10 changes: 1 addition & 9 deletions fsw/src/ci_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ typedef struct

CI_LAB_GlobalData_t CI_LAB_Global;

static CFE_EVS_BinFilter_t CI_LAB_EventFilters[] =
{/* Event ID mask */
{CI_LAB_SOCKETCREATE_ERR_EID, 0x0000}, {CI_LAB_SOCKETBIND_ERR_EID, 0x0000}, {CI_LAB_STARTUP_INF_EID, 0x0000},
{CI_LAB_COMMAND_ERR_EID, 0x0000}, {CI_LAB_COMMANDNOP_INF_EID, 0x0000}, {CI_LAB_COMMANDRST_INF_EID, 0x0000},
{CI_LAB_INGEST_INF_EID, 0x0000}, {CI_LAB_INGEST_LEN_ERR_EID, 0x0000}, {CI_LAB_INGEST_ALLOC_ERR_EID, 0x0000},
{CI_LAB_INGEST_SEND_ERR_EID, 0x0000}};

/*
* Individual message handler function prototypes
*
Expand Down Expand Up @@ -142,8 +135,7 @@ void CI_LAB_TaskInit(void)

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

CFE_EVS_Register(CI_LAB_EventFilters, sizeof(CI_LAB_EventFilters) / sizeof(CFE_EVS_BinFilter_t),
CFE_EVS_EventFilter_BINARY);
CFE_EVS_Register(NULL, 0, CFE_EVS_EventFilter_BINARY);

CFE_SB_CreatePipe(&CI_LAB_Global.CommandPipe, CI_LAB_PIPE_DEPTH, "CI_LAB_CMD_PIPE");
CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CI_LAB_CMD_MID), CI_LAB_Global.CommandPipe);
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/ci_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/* Development Build Macro Definitions */

#define CI_LAB_BUILD_NUMBER 17 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_NUMBER 22 /*!< 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 */

Expand Down

0 comments on commit 9a70ffa

Please sign in to comment.