CHESS-mission · jonathanmichel · Jan 14, 2021 · Jan 14, 2021 · Jan 14, 2021 · Jan 14, 2021
diff --git a/.gitignore b/.gitignore
@@ -74,3 +74,6 @@ GTestBase.*
 /Fw/Python/src/fprime.egg-info
 /Gds/src/fprime_gds.egg-info
 **/DefaultDict/serializable/*
+
+# Clone CHESS-mission/pusopen as "Lib" in fprime root - Due to license restriction with PUSOpen
+Lib    # disable to allow VSCode to index Lib file
diff --git a/Drv/SocketIpDriver/SocketHelper.cpp b/Drv/SocketIpDriver/SocketHelper.cpp
@@ -29,7 +29,7 @@
     #include <sysLib.h>
     #include <errnoLib.h>
     #include <string.h>
-#elif defined TGT_OS_TYPE_LINUX || TGT_OS_TYPE_DARWIN || TGT_OS_TYPE_FREERTOS_SIM
+#elif defined TGT_OS_TYPE_LINUX || TGT_OS_TYPE_DARWIN
     #include <sys/socket.h>
     #include <netdb.h>
     #include <unistd.h>

diff --git a/Drv/SocketIpDriver/SocketIpDriverComponentImpl.hpp b/Drv/SocketIpDriver/SocketIpDriverComponentImpl.hpp
@@ -24,7 +24,7 @@
 // Includes for the IP layer
 #ifdef TGT_OS_TYPE_VXWORKS
     #include <inetLib.h>
-#elif defined TGT_OS_TYPE_LINUX || TGT_OS_TYPE_DARWIN || TGT_OS_TYPE_FREERTOS_SIM
+#elif defined TGT_OS_TYPE_LINUX || TGT_OS_TYPE_DARWIN
     #include <arpa/inet.h>
 #else
     #error OS not supported for IP Socket Communications

diff --git a/Fw/Com/ComBuffer.cpp b/Fw/Com/ComBuffer.cpp
@@ -5,7 +5,7 @@ namespace Fw {
 
     ComBuffer::ComBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
         SerializeStatus stat = SerializeBufferBase::setBuff(args,size);
-        FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<NATIVE_INT_TYPE>(stat));
+        FW_ASSERT(FW_SERIALIZE_OK == stat, static_cast<NATIVE_INT_TYPE>(stat));
     }
 
     ComBuffer::ComBuffer() {

diff --git a/Fw/Types/Assert.cpp b/Fw/Types/Assert.cpp
@@ -12,9 +12,9 @@
 #else
 
 #if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
-#define fileIdFs "Assert file ID 0x%08X:%d "
+#define fileIdFs "============= Assert file ID 0x%08X:%d ============="
 #else
-#define fileIdFs "Assert file \"%s\":%d "
+#define fileIdFs "============= Assert file \"%s\":%d ============="
 #endif
 
 namespace Fw {

diff --git a/Gds/bin/helpers/run_tool.sh b/Gds/bin/helpers/run_tool.sh
@@ -34,4 +34,4 @@ export OUTPUT_DIR="`make -f ${BUILD_ROOT}/mk/makefiles/build_vars.mk BUILD=$NATI
 echo "OUTPUT_DIR: ${OUTPUT_DIR}"
 
 export PYTHONPATH="${BUILD_ROOT}/Fw/Python/src:${BUILD_ROOT}/Gds/src"
-python -m fprime_gds.common.tools."${TOOL}" "$@"
+python3 -m fprime_gds.common.tools."${TOOL}" "$@"
diff --git a/Ref/PingReceiver/PingReceiverComponentImpl.cpp b/Ref/PingReceiver/PingReceiverComponentImpl.cpp
@@ -15,7 +15,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 
 namespace Ref {
-
   // ----------------------------------------------------------------------
   // Construction, initialization, and destruction 
   // ----------------------------------------------------------------------
@@ -53,7 +52,7 @@ namespace Ref {
         U32 key
     )
   {
-    //this->log_DIAGNOSTIC_PR_PingReceived(key);
+    this->log_DIAGNOSTIC_PR_PingReceived(key);
     this->tlmWrite_PR_NumPings(this->m_pingsRecvd++);
     if (not this->m_inhibitPings) {
         PingOut_out(0,key);

diff --git a/Ref/PingReceiver/PingReceiverComponentImpl.hpp b/Ref/PingReceiver/PingReceiverComponentImpl.hpp
@@ -64,8 +64,6 @@ namespace Ref {
 
       bool m_inhibitPings;
       U32 m_pingsRecvd;
-
-
     };
 
 } // end namespace Ref

diff --git a/Svc/ActiveLogger/ActiveLoggerComponentAi.xml b/Svc/ActiveLogger/ActiveLoggerComponentAi.xml
@@ -18,7 +18,7 @@
             Telemetry input port
             </comment>
         </port>
-        <port name="LogSend" data_type="Fw::Log" kind="output" >
+        <port name="LogSend" data_type="Fw::Log" kind="output" max_number="2">
             <comment>
             Telemetry output port
             </comment>

diff --git a/Svc/ActiveLogger/ActiveLoggerImpl.cpp b/Svc/ActiveLogger/ActiveLoggerImpl.cpp
@@ -64,6 +64,9 @@ namespace Svc {
     }
 
     void ActiveLoggerImpl::LogRecv_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, Fw::LogSeverity severity, Fw::LogBuffer &args) {
+        // Filter event for demo
+        //if (id != 0x2a) 
+        //    return;
 
         // make sure ID is not zero. Zero is reserved for ID filter.
         FW_ASSERT(id != 0);
@@ -187,15 +190,22 @@ namespace Svc {
                 FW_ASSERT(0,static_cast<NATIVE_INT_TYPE>(severity));
                 return;
         }
-
-        if (this->isConnected_PktSend_OutputPort(0)) {
-            this->PktSend_out(0, this->m_comBuffer,0);
-        }
 
-        // redirect event through event output
+        // Send event to EventSequence
         if (this->isConnected_LogSend_OutputPort(0)) {
             this->LogSend_out(0, id, timeTag, static_cast<Fw::LogSeverity>(severity) , args);
+        } 
+
+#ifdef _GDS
+        if (this->isConnected_PktSend_OutputPort(0)) {
+            this->PktSend_out(0, this->m_comBuffer,0);
+        }
+#elif defined _PUS
+        // Send event to GroundInterface
+        if (this->isConnected_LogSend_OutputPort(1)) {
+            this->LogSend_out(1, id, timeTag, static_cast<Fw::LogSeverity>(severity) , args);
         }
+#endif
     }
 
     void ActiveLoggerImpl::ALOG_SET_EVENT_REPORT_FILTER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, InputFilterLevel FilterLevel, InputFilterEnabled FilterEnable) {

diff --git a/Svc/ActiveLogger/docs/sdd.md b/Svc/ActiveLogger/docs/sdd.md
@@ -93,7 +93,7 @@ Document | Link
 -------- | ----
 Design Checklist | [Link](Checklist_Design.xlsx)
 Code Checklist | [Link](Checklist_Code.xlsx)
-Unit Test Checklist | [Link](Checklist_Unit_test.xlsx)
+Unit Test Checklist | [Link](Checklist_Unit_Test.xls)
 
 ## 6. Unit Testing
 

diff --git a/Svc/ActiveTextLogger/ActiveTextLoggerImpl.cpp b/Svc/ActiveTextLogger/ActiveTextLoggerImpl.cpp
@@ -94,7 +94,7 @@ namespace Svc {
 
             stat = snprintf(textStr,
                             FW_INTERNAL_INTERFACE_STRING_MAX_SIZE,
-                            "EVENT: (%d) (%04d-%02d-%02dT%02d:%02d:%02d.%03u) %s: %s\n",
+                            "EVENT: (0x%x) (%04d-%02d-%02dT%02d:%02d:%02d.%03u) %s: %s\n",
                             id, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
                             tm.tm_min,tm.tm_sec,timeTag.getUSeconds(),
                             severityString,text.toChar());
@@ -103,7 +103,7 @@ namespace Svc {
 
             stat = snprintf(textStr,
                             FW_INTERNAL_INTERFACE_STRING_MAX_SIZE,
-                            "EVENT: (%d) (%d:%d,%d) %s: %s\n",
+                            "EVENT: (0x%x) (%d:%d,%d) %s: %s\n",
                             id,timeTag.getTimeBase(),timeTag.getSeconds(),timeTag.getUSeconds(),severityString,text.toChar());
         }
 

diff --git a/Svc/AssertFatalAdapter/AssertFatalAdapterComponentImpl.cpp b/Svc/AssertFatalAdapter/AssertFatalAdapterComponentImpl.cpp
@@ -85,7 +85,7 @@ namespace Svc {
                   arg1,arg2,arg3,arg4,arg5,arg6);
       } else {
           // Can't assert, what else can we do? Maybe somebody will see it.
-          Fw::Logger::logMsg("Svc::AssertFatalAdapter not registered!\n");
+          Fw::Logger::logMsg("============= Svc::AssertFatalAdapter not registered! =============\n");
           assert(0);
       }
   }

diff --git a/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp b/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
@@ -25,8 +25,14 @@ namespace Svc {
     void FatalHandlerComponentImpl::FatalReceive_handler(
             const NATIVE_INT_TYPE portNum,
             FwEventIdType Id) {
+
+        // @todo REMOVE FOR DEBUG PURPOSE
+        if(Id == 0x16a) {   // HLTH_PING_LATE - when EPS not connected
+            return;
+        }
+
         // for **nix, delay then exit with error code
-        Fw::Logger::logMsg("FATAL %d handled.\n",(U32)Id,0,0,0,0,0);
+        Fw::Logger::logMsg("============= FATAL event 0x%x handled ============= \n",(U32)Id,0,0,0,0,0);
         (void)Os::Task::delay(1000);
         Fw::Logger::logMsg("Exiting.\n",0,0,0,0,0,0);
         (void)raise( SIGSEGV );

diff --git a/Svc/GroundInterface/CMakeLists.txt b/Svc/GroundInterface/CMakeLists.txt
@@ -6,13 +6,23 @@
 #
 # Note: using PROJECT_NAME as EXECUTABLE_NAME
 ####
+
+SET(PUSOPEN_PATH ${FPRIME_FRAMEWORK_PATH}/Lib)
+SET(MDB_PATH ${CMAKE_CURRENT_LIST_DIR}/../../../gs/mdb)
+
 set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/GroundInterfaceComponentAi.xml"
   "${CMAKE_CURRENT_LIST_DIR}/GroundInterface.cpp"
+  "${MDB_PATH}/pusopen_onboard_mdb.c"                    # PUSOpen mission database
 )
 set(MOD_DEPS "Utils/Types")
 register_fprime_module()
 
+add_definitions(-D_LINUB1804_GCC750)
+include_directories(${PUSOPEN_PATH}/Includes)
+find_library(PUSOPEN pusopen ${PUSOPEN_PATH}/lib)
+target_link_libraries(Svc_GroundInterface ${PUSOPEN})
+
 # Rules based unit testing
 set(UT_MOD_DEPS
         STest
@@ -23,6 +33,8 @@ set(UT_SOURCE_FILES
         "${CMAKE_CURRENT_LIST_DIR}/test/ut/Tester.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/test/ut/TestMain.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/test/ut/GroundInterfaceRules.cpp"
+        "${MDB_PATH}/pusopen_onboard_mdb.c"                     # PUSOpen mission database
         )
-# STest Includes for this UT
+# Test Includes for this UT
 register_fprime_ut()
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,8 +64,6 @@ namespace Ref { @@
           bool m_inhibitPings;
           U32 m_pingsRecvd;
         };
     } // end namespace Ref
@@ Expand Down @@