Oss repo cleanup

.gitmodules

@@ -9,45 +9,41 @@
 [submodule "psp"]
 	path = psp
 	url = ../PSP.git
-    branch = main
+	branch = main
 [submodule "apps/ci_lab"]
 	path = apps/ci_lab
-	url = ../ci_lab.git
-    branch = main
-[submodule "apps/sample_app"]
-	path = apps/sample_app
-	url = ../sample_app.git
-    branch = main
-[submodule "apps/sample_lib"]
-	path = apps/sample_lib
-	url = ../sample_lib.git
-    branch = main
+	url = ../../nasa/ci_lab.git
+	branch = main
 [submodule "apps/sch_lab"]
 	path = apps/sch_lab
 	url = ../sch_lab.git
-    branch = main
+	branch = main
 [submodule "apps/to_lab"]
 	path = apps/to_lab
 	url = ../to_lab.git
-    branch = main
+	branch = main
 [submodule "tools/cFS-GroundSystem"]
 	path = tools/cFS-GroundSystem
 	url = ../cFS-GroundSystem.git
-    branch = main
+	branch = main
 [submodule "tools/elf2cfetbl"]
 	path = tools/elf2cfetbl
 	url = ../elf2cfetbl.git
-    branch = main
+	branch = main
 [submodule "tools/tblCRCTool"]
 	path = tools/tblCRCTool
 	url = ../tblCRCTool.git
-    branch = main
+	branch = main
 [submodule "apps/sbn"]
 	path = apps/sbn
-	url = ../SBN.git
+	url = ../../nasa/SBN.git
 [submodule "apps/robot_sim"]
 	path = apps/robot_sim
 	url = ../robot_sim.git
+[submodule "apps/cf"]
+	path = apps/cf
+	url = ../CF
 [submodule "apps/ros_app"]
 	path = apps/ros_app
 	url = ../ros_app.git
+

sample_defs/config/cf_msgids.h

@@ -0,0 +1,73 @@
+/************************************************************************
+ * NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
+ * Application version 3.0.0”
+ *
+ * Copyright (c) 2019 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ************************************************************************/
+
+/**
+ * @file
+ *  The CF Application Message IDs header file
+ */
+
+#ifndef CF_MSGIDS_H
+#define CF_MSGIDS_H
+
+/**
+ * \defgroup cfscfcmdmid CFS CFDP Command Message IDs
+ * \{
+ */
+
+#define CF_CMD_MID     (0x18B3) /**< \brief Message ID for commands */
+#define CF_SEND_HK_MID (0x18B4) /**< \brief Message ID to request housekeeping telemetry */
+#define CF_WAKE_UP_MID (0x18B5) /**< \brief Message ID for waking up the processing cycle */
+
+/**\}*/
+
+/**
+ * \defgroup cfscftlmmid CFS CFDP Telemetry Message IDs
+ * \{
+ */
+
+#define CF_HK_TLM_MID  (0x08B0) /**< \brief Message ID for housekeeping telemetry */
+#define CF_EOT_TLM_MID (0x08B3) /**< \brief Message ID for end of transaction telemetry */
+
+/**\}*/
+
+/**
+ * \defgroup cfscftlmmid CFS CFDP PDUMessage IDs (originally set in default cf_def_config.c table only)
+ * \{
+ */
+
+// CFDP Entity IDs (see below for channel MID mappings)
+#define CF_ROSGSW_EID 1
+#define CF_ROSFSW_EID 2
+#define CF_FSW_EID    25
+
+// CH0: ROSGSW to FSW
+#define CF_CH0_IN_MID  0x18c8 // ROSGSW to FSW
+#define CF_CH0_OUT_MID 0x08c2 // FSW to ROSGSW
+
+// CH1: FSW to ROSFSW
+#define CF_CH1_IN_MID  0x18c9 // ROSFSW to FSW
+#define CF_CH1_OUT_MID 0x08c3 // FSW to ROSFSW
+
+// CH2: ROSFSW to ROSGSW (FSW is a pass-through only)
+#define CF_CH2_IN_MID  0x18ca  // ROSGSW to ROSFSW
+#define CF_CH2_OUT_MID 0x08c4  // ROSFSW to ROSGSW
+
+/**\}*/
+
+#endif /* !CF_MSGIDS_H */

sample_defs/config/ci_lab_msgids.h

@@ -0,0 +1,32 @@
+/************************************************************************
+ * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
+ *
+ * Copyright (c) 2020 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ************************************************************************/
+
+/**
+ * @file
+ *   Define CI Lab Message IDs
+ */
+#ifndef CI_LAB_MSGIDS_H
+#define CI_LAB_MSGIDS_H
+
+#include "cfe_msgids.h"
+
+#define CI_LAB_CMD_MID     (CFE_PLATFORM_CMD_MID_BASE + 0x84)
+#define CI_LAB_SEND_HK_MID (CFE_PLATFORM_CMD_MID_BASE + 0x85)
+#define CI_LAB_HK_TLM_MID  (CFE_PLATFORM_TLM_MID_BASE + 0x84)   
+
+#endif

sample_defs/config/sbn_msgids.h

@@ -0,0 +1,62 @@
+/*=======================================================================================
+** File Name:  sbn_msgids.h
+**
+** Title:
+**
+** $Author:    Steve Duran
+** $Revision:  $
+** $Date:      2013-06-10
+**
+** Purpose:
+**
+** Modification History:
+**   Date | Author | Description
+**   ---------------------------
+**   2013-06-10 | Steve Duran | Build #: Code Started
+**
+**=====================================================================================*/
+
+#ifndef _SBN_MSGIDS_H_
+#define _SBN_MSGIDS_H_
+
+#include "cfe_msgids.h"
+
+/*
+** Pragmas
+*/
+
+/*
+** Local Defines
+*/
+#define SBN_CMD_MID (CFE_PLATFORM_CMD_MID_BASE + 0xFA)
+
+#define SBN_TLM_MID (CFE_PLATFORM_TLM_MID_BASE + 0xFA)
+/*
+** Include Files
+*/
+
+/*
+** Local Structure Declarations
+*/
+
+/*
+** External Global Variables
+*/
+
+/*
+** Global Variables
+*/
+
+/*
+** Local Variables
+*/
+
+/*
+** Local Function Prototypes
+*/
+
+#endif /* _SBN_MSGIDS_H_ */
+
+/*=======================================================================================
+** End of file sbn_msgids.h
+**=====================================================================================*/

sample_defs/config/sbn_platform_cfg.h

@@ -0,0 +1,121 @@
+/******************************************************************************
+** File: sbn_platform_cfg.h
+**
+**      Copyright (c) 2004-2016, United States government as represented by the
+**      administrator of the National Aeronautics Space Administration.
+**      All rights reserved. This software(cFE) was created at NASA's Goddard
+**      Space Flight Center pursuant to government contracts.
+**
+**      This software may be used only pursuant to a United States government
+**      sponsored project and the United States government may not be charged
+**      for use thereof.
+**
+** Purpose:
+**      This header file contains prototypes for private functions and type
+**      definitions for the Software Bus Network Application.
+**
+** Authors:   J. Wilmot/GSFC Code582
+**            R. McGraw/SSI
+**            C. Knight/ARC Code TI
+******************************************************************************/
+#include "cfe.h"
+
+#ifndef _sbn_platform_cfg_h
+#define _sbn_platform_cfg_h
+
+/** @brief Maximum number of networks allowed. */
+#define SBN_MAX_NETS 16
+
+/** @brief Maximum number of subscriptions allowed per peer allowed. */
+#define SBN_MAX_SUBS_PER_PEER 256
+
+/** @brief Maximum number of incoming and outgoing message filters. */
+#define SBN_MAX_FILTERS 16
+
+/** @brief Maximum number of outgoing and incoming message filters for each peer. */
+#define SBN_MAX_FILTERS_PER_PEER 8
+
+/**
+ * @brief At most process this many SB messages per peer per wakeup.
+ * (To prevent starvation if a peer is babbling.)
+ */
+#define SBN_MAX_MSG_PER_WAKEUP 32
+
+/**
+ * @brief In the polling configuration, how long (in milliseconds) to wait for
+ * a SCH wakeup message before SBN times out and processes. (Note, should
+ * really be significantly longer than the expected time between SCH wakeup
+ * messages.)
+ */
+#define SBN_MAIN_LOOP_DELAY 50
+
+/**
+ * @brief For each peer, a pipe is created to receive messages that the peer has
+ * subscribed to. The pipe should be deep enough to handle all messages that
+ * will queue between wakeups.
+ */
+#define SBN_PEER_PIPE_DEPTH 32
+
+/**
+ * @brief The maximum number of messages that will be queued for a particular
+ * message ID for a particular peer.
+ */
+#define SBN_DEFAULT_MSG_LIM 8
+
+/**
+ * @brief The maximum number of subscription messages that will be queued
+ * between wakeups.
+ */
+#define SBN_SUB_PIPE_DEPTH 32
+
+/**
+ * @brief The maximum number of subscription messages for a single message ID
+ * that will be queued between wakeups. (These are received when updates occur
+ * after SBN starts up.)
+ */
+#define SBN_MAX_ONESUB_PKTS_ON_PIPE 16
+
+/**
+ * @brief The maximum number of subscription messages for all message IDs that
+ * will be queued between wakeups. (These are received on SBN startup.)
+ */
+#define SBN_MAX_ALLSUBS_PKTS_ON_PIPE 64
+
+/**
+ * @brief The maximum length of a module's name
+ * file.
+ */
+#define SBN_MAX_MOD_NAME_LEN 16
+
+/** @brief Maximum number of protocol modules. */
+#define SBN_MAX_MOD_CNT 8
+
+/** @brief Maximum number of peers. */
+#define SBN_MAX_PEER_CNT 16
+
+/**
+ * @brief SBN modules can provide status messages for housekeeping requests,
+ * this is the maximum length those messages can be.
+ */
+#define SBN_MOD_STATUS_MSG_SZ 128
+
+/**
+ * @brief The number of characters for a "peer address", this can be
+ * an IP address, a device inode path, a DTN EIN, etc. The meaning
+ * of the address field is network module-dependent.
+ */
+#define SBN_ADDR_SZ 48
+
+/**
+ * @brief If defined, remapping is enabled at boot time.
+ */
+#define SBN_REMAP_ENABLED
+
+#define SBN_REMAP_TBL_FILENAME "/cf/sbn_remap_tbl.tbl"
+
+#define SBN_CONF_TBL_FILENAME "/cf/sbn_conf_tbl.tbl"
+
+
+#define CFE_PLATFORM_CPU_NAME "CPU1"
+
+#endif /* _sbn_platform_cfg_h_ */