Merge branch 'nasa:devel' into devel

Author: rmzmrnn

.github/actions/spelling/expect.txt

@@ -46,6 +46,7 @@ jpl
 JSO
 jsonable
 kevin
+linux
 lld
 Makefiles
 mallocator

src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/instances.fpp

@@ -13,11 +13,6 @@ module {{cookiecutter.deployment_name}} {
   # Active component instances
   # ----------------------------------------------------------------------
 
-  instance blockDrv: Drv.BlockDriver base id 0x0100 \
-    queue size Default.QUEUE_SIZE \
-    stack size Default.STACK_SIZE \
-    priority 140
-
   instance rateGroup1: Svc.ActiveRateGroup base id 0x0200 \
     queue size Default.QUEUE_SIZE \
     stack size Default.STACK_SIZE \
@@ -130,4 +125,6 @@ module {{cookiecutter.deployment_name}} {
   instance fprimeRouter: Svc.FprimeRouter base id 0x4D00
 
   instance version: Svc.Version base id 0x4E00
+
+  instance linuxTimer: Svc.LinuxTimer base id 0x4F00
 }

src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/topology.fpp

@@ -24,7 +24,6 @@ module {{cookiecutter.deployment_name}} {
     # ----------------------------------------------------------------------
 
     instance $health
-    instance blockDrv
     instance tlmSend
     instance cmdDisp
     instance cmdSeq
@@ -51,6 +50,7 @@ module {{cookiecutter.deployment_name}} {
     instance textLogger
     instance systemResources
     instance version
+    instance linuxTimer
 
     # ----------------------------------------------------------------------
     # Pattern graph specifiers
@@ -113,8 +113,8 @@ module {{cookiecutter.deployment_name}} {
     }
 
     connections RateGroups {
-      # Block driver
-      blockDrv.CycleOut -> rateGroupDriver.CycleIn
+      # LinuxTimer to drive rate group
+      linuxTimer.CycleOut -> rateGroupDriver.CycleIn
 
       # Rate group 1
       rateGroupDriver.CycleOut[Ports_RateGroups.rateGroup1] -> rateGroup1.CycleIn
@@ -130,8 +130,7 @@ module {{cookiecutter.deployment_name}} {
       # Rate group 3
       rateGroupDriver.CycleOut[Ports_RateGroups.rateGroup3] -> rateGroup3.CycleIn
       rateGroup3.RateGroupMemberOut[0] -> $health.Run
-      rateGroup3.RateGroupMemberOut[1] -> blockDrv.Sched
-      rateGroup3.RateGroupMemberOut[2] -> bufferManager.schedIn
+      rateGroup3.RateGroupMemberOut[1] -> bufferManager.schedIn
     }
 
     connections Sequencer {
@@ -169,7 +168,7 @@ module {{cookiecutter.deployment_name}} {
     }
 
     connections {{cookiecutter.deployment_name}} {
-      # Add here connections to user-defined components
+      # Add connections here to user-defined components
     }
 
   }

src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Packets.fppi

@@ -37,10 +37,6 @@ telemetry packets {{cookiecutter.deployment_name}}Packets {
     {{cookiecutter.deployment_name}}.fileManager.Errors
   }
 
-  packet DriveTlm id 3 group 1 {
-    {{cookiecutter.deployment_name}}.blockDrv.BD_Cycles
-  }
-
   packet SystemRes1 id 4 group 2 {
     {{cookiecutter.deployment_name}}.systemResources.MEMORY_TOTAL
     {{cookiecutter.deployment_name}}.systemResources.MEMORY_USED

src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp

@@ -58,7 +58,6 @@ enum TopologyConstants {
 
 // Ping entries are autocoded, however; this code is not properly exported. Thus, it is copied here.
 Svc::Health::PingEntry pingEntries[] = {
-    {PingEntries::{{cookiecutter.deployment_name}}_blockDrv::WARN, PingEntries::{{cookiecutter.deployment_name}}_blockDrv::FATAL, "blockDrv"},
     {PingEntries::{{cookiecutter.deployment_name}}_tlmSend::WARN, PingEntries::{{cookiecutter.deployment_name}}_tlmSend::FATAL, "chanTlm"},
     {PingEntries::{{cookiecutter.deployment_name}}_cmdDisp::WARN, PingEntries::{{cookiecutter.deployment_name}}_cmdDisp::FATAL, "cmdDisp"},
     {PingEntries::{{cookiecutter.deployment_name}}_cmdSeq::WARN, PingEntries::{{cookiecutter.deployment_name}}_cmdSeq::FATAL, "cmdSeq"},
@@ -183,25 +182,11 @@ Os::Mutex cycleLock;
 volatile bool cycleFlag = true;
 
 void startSimulatedCycle(Fw::TimeInterval interval) {
-    cycleLock.lock();
-    bool cycling = cycleFlag;
-    cycleLock.unLock();
-
-    // Main loop
-    while (cycling) {
-        {{cookiecutter.deployment_name}}::blockDrv.callIsr();
-        Os::Task::delay(interval);
-
-        cycleLock.lock();
-        cycling = cycleFlag;
-        cycleLock.unLock();
-    }
+    linuxTimer.startTimer(interval.getSeconds()*1000+interval.getUSeconds()/1000);
 }
 
 void stopSimulatedCycle() {
-    cycleLock.lock();
-    cycleFlag = false;
-    cycleLock.unLock();
+    linuxTimer.quit();
 }
 
 void teardownTopology(const TopologyState& state) {

src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}TopologyDefs.hpp

@@ -6,7 +6,6 @@
 #ifndef {{cookiecutter.__deployment_name_upper}}_{{cookiecutter.__deployment_name_upper}}TOPOLOGYDEFS_HPP
 #define {{cookiecutter.__deployment_name_upper}}_{{cookiecutter.__deployment_name_upper}}TOPOLOGYDEFS_HPP
 
-#include "Drv/BlockDriver/BlockDriver.hpp"
 #include "Fw/Types/MallocAllocator.hpp"
 #include "{{cookiecutter.__include_path_prefix}}{{cookiecutter.deployment_name}}/Top/FppConstantsAc.hpp"
 #include "Svc/FramingProtocol/FprimeProtocol.hpp"