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-08-26 #59

Merged
merged 2 commits into from
Sep 1, 2020
Merged

Integration Candidate: 2020-08-26 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51197e8
Fix #56, Add header guard to to_lab_sub_table.h
skliper Aug 21, 2020
406b18f
Increase version to 2.4.0-rc1+dev6, update readme
yammajamma Sep 1, 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+dev6

- Adds header guard to `to_lab_sub_table.h`
- See <https://github.com/nasa/to_lab/pull/59>

### Development Build: 2.4.0-rc1+dev3

- Remove reference to deprecated `CFE_ES_SHELL_TLM_MID`.
Expand Down
4 changes: 4 additions & 0 deletions fsw/platform_inc/to_lab_sub_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
** Notes:
**
*************************************************************************/
#ifndef to_lab_sub_table_h_
#define to_lab_sub_table_h_

#include "cfe_msgids.h"
#include "cfe_platform_cfg.h"
Expand All @@ -43,3 +45,5 @@ typedef struct
TO_LAB_Sub_t Subs[CFE_PLATFORM_SB_MAX_MSG_IDS];
}
TO_LAB_Subs_t;

#endif /* to_lab_sub_table_h_ */
2 changes: 1 addition & 1 deletion fsw/src/to_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

/* Development Build Macro Definitions */
#define TO_LAB_BUILD_NUMBER 3 /*!< Development Build: Number of commits since baseline */
#define TO_LAB_BUILD_NUMBER 6 /*!< 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