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 #12

Merged
merged 5 commits into from
Sep 16, 2019
+85 −286
Merged

Integration Candidate 20190906 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f57ec8
Fix #3, Update to valid Perfid
avan989 Aug 28, 2019
f74b9a0
Fix #5, Remove classic build support
avan989 Aug 26, 2019
4ad503c
Fix #4, Remove CVS flags
avan989 Aug 23, 2019
faaa6d5
Fix #7, Remove deprecated dependencies
skliper Aug 29, 2019
87a65fd
CCB 2019-09-04: Merge #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.

17 changes: 3 additions & 14 deletions fsw/mission_inc/ci_lab_perfids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,20 @@
** See the License for the specific language governing permissions and
** limitations under the License.
**
** File:
** $Id: ci_lab_perfids.h 1.3 2010/09/20 12:27:19GMT-05:00 wmoleski Exp $
** File: ci_lab_perfids.h
**
** Purpose:
** Define CI Lab Performance IDs
**
** Notes:
**
** $Log: ci_lab_perfids.h $
** Revision 1.3 2010/09/20 12:27:19GMT-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 13:07:44EDT rjmcgraw
** Member moved from ci_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/ci_lab/fsw/platform_inc/project.pj to ci_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/ci_lab/fsw/mission_inc/project.pj.
** Revision 1.1 2008/04/30 12:07:44ACT rjmcgraw
** Initial revision
** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/ci_lab/fsw/platform_inc/project.pj
**
*************************************************************************/
#ifndef _ci_lab_perfids_h_
#define _ci_lab_perfids_h_


#define CI_MAIN_TASK_PERF_ID 21
#define CI_SOCKET_RCV_PERF_ID 24
#define CI_MAIN_TASK_PERF_ID 32
#define CI_SOCKET_RCV_PERF_ID 33

#endif /* _ci_lab_perfids_h_ */

Expand Down
11 changes: 1 addition & 10 deletions fsw/platform_inc/ci_lab_msgids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,13 @@
** See the License for the specific language governing permissions and
** limitations under the License.
**
** File:
** $Id: ci_lab_msgids.h 1.2 2010/09/20 12:27:18GMT-05:00 wmoleski Exp $
** File: ci_lab_msgids.h
**
** Purpose:
** Define CI Lab Message IDs
**
** Notes:
**
** $Log: ci_lab_msgids.h $
** Revision 1.2 2010/09/20 12:27:18GMT-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 13:07:18EDT rjmcgraw
** Initial revision
** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/ci_lab/fsw/platform_inc/project.pj
**
*************************************************************************/
#ifndef _ci_lab_msgids_h_
#define _ci_lab_msgids_h_
Expand Down
Loading