From 39e557f767b0b04f24c07338573cf8e42c2da76f Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 14 Dec 2020 08:33:04 -0500 Subject: [PATCH 1/2] Fix #71, Remove all only from telemetry pipe Remove all was also removing subscriptions from the command pipe, which leaves TO inoperable. The remove all command now just removes all subscriptions to the Tlm_pipe --- fsw/src/to_lab_app.c | 13 ------------- fsw/src/to_lab_events.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index 71b5429..9d11476 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -539,19 +539,6 @@ int32 TO_LAB_RemoveAll(const TO_LAB_RemoveAllCmd_t *data) } } - /* remove commands as well */ - status = CFE_SB_Unsubscribe(TO_LAB_CMD_MID, TO_LAB_Global.Cmd_pipe); - if (status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_REMOVECMDTO_ERR_EID, CFE_EVS_EventType_ERROR, - "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__, - (unsigned int)CFE_SB_MsgIdToValue(TO_LAB_CMD_MID), (int)status); - - status = CFE_SB_Unsubscribe(TO_LAB_SEND_HK_MID, TO_LAB_Global.Cmd_pipe); - if (status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_REMOVEHKTO_ERR_EID, CFE_EVS_EventType_ERROR, - "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__, - (unsigned int)CFE_SB_MsgIdToValue(TO_LAB_CMD_MID), (int)status); - CFE_EVS_SendEvent(TO_REMOVEALLPKTS_INF_EID, CFE_EVS_EventType_INFORMATION, "L%d TO Unsubscribed to all Commands and Telemetry", __LINE__); diff --git a/fsw/src/to_lab_events.h b/fsw/src/to_lab_events.h index a133bfe..5d21a01 100644 --- a/fsw/src/to_lab_events.h +++ b/fsw/src/to_lab_events.h @@ -46,8 +46,6 @@ #define TO_ADDPKT_ERR_EID 10 #define TO_REMOVEPKT_ERR_EID 11 #define TO_REMOVEALLPTKS_ERR_EID 12 -#define TO_REMOVECMDTO_ERR_EID 13 -#define TO_REMOVEHKTO_ERR_EID 14 #define TO_ADDPKT_INF_EID 15 #define TO_REMOVEPKT_INF_EID 16 #define TO_REMOVEALLPKTS_INF_EID 17 From fdb578f3ae2fcaec5a26be47c0b3855eb14634de Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Fri, 18 Dec 2020 10:52:29 -0500 Subject: [PATCH 2/2] Bump to v2.4.0-rc1+dev21 --- README.md | 5 +++++ fsw/src/to_lab_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fd13d8..8165123 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in ## Version History +### Development Build: 2.4.0-rc1+dev21 + +- TO remains command-able after a "remove all subscriptions" command; the command now only removes all subscriptions to the Tlm_pipe +- See + ### Development Build: 2.4.0-rc1+dev17 - Aligns messages according to changes in cFE . Uses the "raw" message cmd/tlm types in definition diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index 4ca2f64..bf8ecb3 100644 --- a/fsw/src/to_lab_version.h +++ b/fsw/src/to_lab_version.h @@ -30,7 +30,7 @@ */ /* Development Build Macro Definitions */ -#define TO_LAB_BUILD_NUMBER 17 /*!< Development Build: Number of commits since baseline */ +#define TO_LAB_BUILD_NUMBER 21 /*!< Development Build: Number of commits since baseline */ #define TO_LAB_BUILD_BASELINE \ "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */