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

Integration Candidate 20190906 #13

Merged
merged 8 commits into from
Sep 16, 2019
Merged

Integration Candidate 20190906 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c6b25fb
Fix #7, Replace deprecated cfe refs
skliper Jul 26, 2019
06a5ba5
Update issue templates
skliper Sep 4, 2019
257e49e
Add pull request template
skliper Sep 4, 2019
91d01fa
Fix #1, Update to valid Perfids
avan989 Aug 28, 2019
c52696d
Fix #3, TO_subscription typo
skliper Sep 10, 2019
91598da
Fix #5, Remove classic build support
avan989 Aug 26, 2019
8fddb03
Fix #4, Remove MKS/CVS flags
avan989 Aug 23, 2019
3589e5c
CCB 2019-09-04: Merge #1 #3 #4 #5 #7
skliper Sep 10, 2019
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
112 changes: 0 additions & 112 deletions fsw/for_build/Makefile
View file
Open in desktop

This file was deleted.

16 changes: 3 additions & 13 deletions fsw/mission_inc/to_lab_perfids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,19 @@
** See the License for the specific language governing permissions and
** limitations under the License.
**
** File:
** File: to_lab_perfids.h
**
** Purpose:
** Define TO Lab Performance IDs
**
** Notes:
**
** $Log: to_lab_perfids.h $
** Revision 1.3 2010/09/20 12:28:05GMT-05:00 wmoleski
** Modified the CI_LAB, SCH_LAB and TO_LAB applications to use unique message IDs and Pipe Names. The "_LAB"
** was added to all definitions so that a mission can use these "Lab" apps as well as their own mission apps together.
** Revision 1.2 2008/04/30 14:43:01EDT rjmcgraw
** Member moved from to_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj to to_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/mission_inc/project.pj.
** Revision 1.1 2008/04/30 13:43:01ACT rjmcgraw
** Initial revision
** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj
**
*************************************************************************/
#ifndef _to_lab_perfids_h_
#define _to_lab_perfids_h_

#define TO_MAIN_TASK_PERF_ID 22
#define TO_SOCKET_SEND_PERF_ID 23
#define TO_MAIN_TASK_PERF_ID 34
#define TO_SOCKET_SEND_PERF_ID 35

#endif /* _to_lab_perfids_h_ */

Expand Down
10 changes: 1 addition & 9 deletions fsw/platform_inc/to_lab_msgids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,13 @@
** See the License for the specific language governing permissions and
** limitations under the License.
**
** File:
** File: to_lab_msgids.h
**
** Purpose:
** Define TO Lab Message IDs
**
** Notes:
**
** $Log: to_lab_msgids.h $
** Revision 1.2 2010/09/20 12:28:05GMT-05:00 wmoleski
** Modified the CI_LAB, SCH_LAB and TO_LAB applications to use unique message IDs and Pipe Names. The "_LAB"
** was added to all definitions so that a mission can use these "Lab" apps as well as their own mission apps together.
** Revision 1.1 2008/04/30 14:42:40EDT rjmcgraw
** Initial revision
** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj
**
*************************************************************************/
#ifndef _to_lab_msgids_h_
#define _to_lab_msgids_h_
Expand Down
35 changes: 15 additions & 20 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 @@ -25,12 +25,6 @@
**
** Notes:
**
** $Log: to_lab_sub_table.h $
** Revision 1.3 2014/07/16 14:44:45GMT-05:00 acudmore
** Member renamed from to_sub_table.h to to_lab_sub_table.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj.
** Revision 1.2 2014/07/16 14:44:45ACT acudmore
** Updated TO_LAB subscription table header file ( comments, clean up )
**
*************************************************************************/

/*
Expand All @@ -53,7 +47,7 @@
#include "lc_msgids.h"
#endif

static TO_subsciption_t TO_SubTable[] =
static TO_subscription_t TO_SubTable[] =
{
/* CFS App Subscriptions */
{TO_LAB_HK_TLM_MID, {0,0}, 4},
Expand All @@ -69,19 +63,20 @@ static TO_subsciption_t TO_SubTable[] =
{DS_HK_TLM_MID, {0,0}, 4},
{LC_HK_TLM_MID, {0,0}, 4},
#endif
/* cFE Core subsciptions */
{CFE_ES_HK_TLM_MID, {0,0}, 4},
{CFE_EVS_HK_TLM_MID, {0,0}, 4},
{CFE_SB_HK_TLM_MID, {0,0}, 4},
{CFE_TBL_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_DIAG_TLM_MID, {0,0}, 4},
{CFE_SB_STATS_TLM_MID, {0,0}, 4},
{CFE_TBL_REG_TLM_MID, {0,0}, 4},
{CFE_EVS_EVENT_MSG_MID, {0,0}, 32},
{CFE_ES_SHELL_TLM_MID, {0,0}, 32},
{CFE_ES_APP_TLM_MID, {0,0}, 4},
{CFE_ES_MEMSTATS_TLM_MID,{0,0}, 4},

/* cFE Core subscriptions */
{CFE_ES_HK_TLM_MID, {0,0}, 4},
{CFE_EVS_HK_TLM_MID, {0,0}, 4},
{CFE_SB_HK_TLM_MID, {0,0}, 4},
{CFE_TBL_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_DIAG_TLM_MID, {0,0}, 4},
{CFE_SB_STATS_TLM_MID, {0,0}, 4},
{CFE_TBL_REG_TLM_MID, {0,0}, 4},
{CFE_EVS_LONG_EVENT_MSG_MID, {0,0}, 32},
{CFE_ES_SHELL_TLM_MID, {0,0}, 32},
{CFE_ES_APP_TLM_MID, {0,0}, 4},
{CFE_ES_MEMSTATS_TLM_MID, {0,0}, 4},

{TO_UNUSED, {0,0}, 0},
{TO_UNUSED, {0,0}, 0},
Expand Down
Loading