Merge pull request #42 from fprime-community/devel

Merge devel into main for v3.5.0 release

Author: LeStarch

Components/MathReceiver/MathReceiver.cpp

@@ -95,7 +95,7 @@ namespace MathModule {
         NATIVE_UINT_TYPE context
     )
   {
-   U32 numMsgs = this->m_queue.getNumMsgs();
+   U32 numMsgs = this->m_queue.getMessagesAvailable();
     for (U32 i = 0; i < numMsgs; ++i) {
         (void) this->doDispatch();
     }

MathDeployment/Main.cpp

@@ -11,6 +11,8 @@
 #include <getopt.h>
 // Used for printf functions
 #include <cstdlib>
+// Os Console
+#include <Os/Console.hpp>
 
 /**
  * \brief print command line help message
@@ -49,7 +51,7 @@ int main(int argc, char* argv[]) {
     U32 port_number = 0;
     I32 option = 0;
     char* hostname = nullptr;
-
+    Os::Console::init();
     // Loop while reading the getopt supplied options
     while ((option = getopt(argc, argv, "hp:a:")) != -1) {
         switch (option) {

MathDeployment/Top/MathDeploymentPackets.xml

@@ -52,12 +52,7 @@
         <channel name="systemResources.NON_VOLATILE_TOTAL"/>
         <channel name="systemResources.NON_VOLATILE_FREE"/>
     </packet>
-
-    <packet name="SystemRes2" id="6" level="2">
-        <channel name="systemResources.FRAMEWORK_VERSION"/>
-        <channel name="systemResources.PROJECT_VERSION"/>
-    </packet>
-
+    
     <packet name="SystemRes3" id="7" level="2">
         <channel name="systemResources.CPU"/>
         <channel name="systemResources.CPU_00"/>

MathDeployment/Top/MathDeploymentTopology.cpp

@@ -9,7 +9,6 @@
 
 // Necessary project-specified types
 #include <Fw/Types/MallocAllocator.hpp>
-#include <Os/Log.hpp>
 #include <Svc/FramingProtocol/FprimeProtocol.hpp>
 
 // Used for 1Hz synthetic cycling
@@ -18,9 +17,6 @@
 // Allows easy reference to objects in FPP/autocoder required namespaces
 using namespace MathDeployment;
 
-// Instantiate a system logger that will handle Fw::Logger::logMsg calls
-Os::Log logger;
-
 // The reference topology uses a malloc-based allocator for components that need to allocate memory during the
 // initialization phase.
 Fw::MallocAllocator mallocator;
@@ -62,18 +58,18 @@ enum TopologyConstants {
 
 // Ping entries are autocoded, however; this code is not properly exported. Thus, it is copied here.
 Svc::Health::PingEntry pingEntries[] = {
-    {PingEntries::blockDrv::WARN, PingEntries::blockDrv::FATAL, "blockDrv"},
-    {PingEntries::tlmSend::WARN, PingEntries::tlmSend::FATAL, "chanTlm"},
-    {PingEntries::cmdDisp::WARN, PingEntries::cmdDisp::FATAL, "cmdDisp"},
-    {PingEntries::cmdSeq::WARN, PingEntries::cmdSeq::FATAL, "cmdSeq"},
-    {PingEntries::eventLogger::WARN, PingEntries::eventLogger::FATAL, "eventLogger"},
-    {PingEntries::fileDownlink::WARN, PingEntries::fileDownlink::FATAL, "fileDownlink"},
-    {PingEntries::fileManager::WARN, PingEntries::fileManager::FATAL, "fileManager"},
-    {PingEntries::fileUplink::WARN, PingEntries::fileUplink::FATAL, "fileUplink"},
-    {PingEntries::prmDb::WARN, PingEntries::prmDb::FATAL, "prmDb"},
-    {PingEntries::rateGroup1::WARN, PingEntries::rateGroup1::FATAL, "rateGroup1"},
-    {PingEntries::rateGroup2::WARN, PingEntries::rateGroup2::FATAL, "rateGroup2"},
-    {PingEntries::rateGroup3::WARN, PingEntries::rateGroup3::FATAL, "rateGroup3"},
+    {PingEntries::MathDeployment_blockDrv::WARN, PingEntries::MathDeployment_blockDrv::FATAL, "blockDrv"},
+    {PingEntries::MathDeployment_tlmSend::WARN, PingEntries::MathDeployment_tlmSend::FATAL, "chanTlm"},
+    {PingEntries::MathDeployment_cmdDisp::WARN, PingEntries::MathDeployment_cmdDisp::FATAL, "cmdDisp"},
+    {PingEntries::MathDeployment_cmdSeq::WARN, PingEntries::MathDeployment_cmdSeq::FATAL, "cmdSeq"},
+    {PingEntries::MathDeployment_eventLogger::WARN, PingEntries::MathDeployment_eventLogger::FATAL, "eventLogger"},
+    {PingEntries::MathDeployment_fileDownlink::WARN, PingEntries::MathDeployment_fileDownlink::FATAL, "fileDownlink"},
+    {PingEntries::MathDeployment_fileManager::WARN, PingEntries::MathDeployment_fileManager::FATAL, "fileManager"},
+    {PingEntries::MathDeployment_fileUplink::WARN, PingEntries::MathDeployment_fileUplink::FATAL, "fileUplink"},
+    {PingEntries::MathDeployment_prmDb::WARN, PingEntries::MathDeployment_prmDb::FATAL, "prmDb"},
+    {PingEntries::MathDeployment_rateGroup1::WARN, PingEntries::MathDeployment_rateGroup1::FATAL, "rateGroup1"},
+    {PingEntries::MathDeployment_rateGroup2::WARN, PingEntries::MathDeployment_rateGroup2::FATAL, "rateGroup2"},
+    {PingEntries::MathDeployment_rateGroup3::WARN, PingEntries::MathDeployment_rateGroup3::FATAL, "rateGroup3"},
 };
 
 /**
@@ -156,7 +152,7 @@ void setupTopology(const TopologyState& state) {
         Os::TaskString name("ReceiveTask");
         // Uplink is configured for receive so a socket task is started
         comDriver.configure(state.hostname, state.port);
-        comDriver.startSocketTask(name, true, COMM_PRIORITY, Default::STACK_SIZE);
+        comDriver.start(name, true, COMM_PRIORITY, Default::STACK_SIZE);
     }
 }
 
@@ -172,7 +168,7 @@ void startSimulatedCycle(U32 milliseconds) {
     // Main loop
     while (cycling) {
         MathDeployment::blockDrv.callIsr();
-        Os::Task::delay(milliseconds);
+        Os::Task::delay(Fw::TimeInterval(milliseconds/1000, milliseconds % 1000));
 
         cycleLock.lock();
         cycling = cycleFlag;
@@ -192,8 +188,8 @@ void teardownTopology(const TopologyState& state) {
     freeThreads(state);
 
     // Other task clean-up.
-    comDriver.stopSocketTask();
-    (void)comDriver.joinSocketTask(nullptr);
+    comDriver.stop();
+    (void)comDriver.join();
 
     // Resource deallocation
     cmdSeq.deallocateBuffer(mallocator);

MathDeployment/Top/MathDeploymentTopologyDefs.hpp

@@ -48,40 +48,40 @@ struct TopologyState {
  * ```
  */
 namespace PingEntries {
-namespace blockDrv {
+namespace MathDeployment_blockDrv {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace tlmSend {
+namespace MathDeployment_tlmSend {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace cmdDisp {
+namespace MathDeployment_cmdDisp {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace cmdSeq {
+namespace MathDeployment_cmdSeq {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace eventLogger {
+namespace MathDeployment_eventLogger {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace fileDownlink {
+namespace MathDeployment_fileDownlink {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace fileManager {
+namespace MathDeployment_fileManager {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace fileUplink {
+namespace MathDeployment_fileUplink {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace prmDb {
+namespace MathDeployment_prmDb {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace rateGroup1 {
+namespace MathDeployment_rateGroup1 {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace rateGroup2 {
+namespace MathDeployment_rateGroup2 {
 enum { WARN = 3, FATAL = 5 };
 }
-namespace rateGroup3 {
+namespace MathDeployment_rateGroup3 {
 enum { WARN = 3, FATAL = 5 };
 }
 }  // namespace PingEntries

MathDeployment/Top/topology.fpp

@@ -85,7 +85,7 @@ module MathDeployment {
 
       comStub.comStatus -> framer.comStatusIn
       framer.comStatusOut -> comQueue.comStatusIn
-      comStub.drvDataOut -> comDriver.send
+      comStub.drvDataOut -> comDriver.$send
 
     }
 

docs/creating-components-4.md

@@ -85,7 +85,7 @@ void MathReceiver ::
       NATIVE_UINT_TYPE context
   )
 {
-    U32 numMsgs = this->m_queue.getNumMsgs();
+    U32 numMsgs = this->m_queue.getMessagesAvailable();
     for (U32 i = 0; i < numMsgs; ++i) {
         (void) this->doDispatch();
     }
@@ -166,4 +166,4 @@ fprime-util build
 
 Congratulations, you have finished `MathReceiver`!
 
-**Next:** [Developing Deployments](./developing-deployments.md)
+**Next:** [Developing Deployments](./developing-deployments.md)