Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Integration Candidate: 2020-08-19 #58

Merged
merged 3 commits into from
Aug 25, 2020
Merged

Integration Candidate: 2020-08-19 #58

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
801e8e5
Fix #54, remove reference to CFE_ES_SHELL_TLM
jphickey Aug 18, 2020
439d167
Merge pull request #55 from jphickey/fix-54-remove-deprecated
yammajamma Aug 19, 2020
9358cba
Increase version to 2.4.0-rc1+dev3
yammajamma Aug 24, 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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+dev3

- Remove reference to deprecated `CFE_ES_SHELL_TLM_MID`.
- See <https://github.com/nasa/to_lab/pull/58>

### Development Build: 2.3.0+dev45

- Fixes bug where an unset address values caused subscriptions to MsgId 0 over 200 times. Added a `TO_UNUSED` entry at the end of the subscription list and a break in the subscription loop when `TO_UNUSED` found. No more subscriptions on the unused table slots (no MsgId 0 subscriptions).
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/to_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
*/

/* Development Build Macro Definitions */
#define TO_LAB_BUILD_NUMBER 44 /*!< Development Build: Number of commits since baseline */
#define TO_LAB_BUILD_BASELINE "v2.3.0" /*!< Development Build: git tag that is the base for the current development */
#define TO_LAB_BUILD_NUMBER 3 /*!< 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 */

/* Version Macro Definitions */

Expand Down
4 changes: 0 additions & 4 deletions fsw/tables/to_lab_sub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ TO_LAB_Subs_t TO_LAB_Subs =
{CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_REG_TLM_MID), {0, 0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_LONG_EVENT_MSG_MID), {0, 0}, 32},

#ifndef CFE_OMIT_DEPRECATED_6_7
{CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SHELL_TLM_MID), {0, 0}, 32},
#endif

{CFE_SB_MSGID_WRAP_VALUE(CFE_ES_APP_TLM_MID), {0, 0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(CFE_ES_MEMSTATS_TLM_MID), {0, 0}, 4},

Expand Down