Add in prmDb

Author: LeStarch

FprimeZephyrReference/ReferenceDeployment/Main.cpp

@@ -9,7 +9,6 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <Os/File.hpp>
 
 const struct device* serial = DEVICE_DT_GET(DT_NODELABEL(cdc_acm_uart0));
 const struct device* lora = DEVICE_DT_GET(DT_NODELABEL(lora0));
@@ -20,25 +19,6 @@ int main(int argc, char* argv[]) {
     // This sleep is necessary to allow the USB CDC ACM interface to initialize before
     // the application starts writing to it.
     k_sleep(K_MSEC(3000));
-    Os::File file;
-    U8 message[] = "Hello Ines\n";
-    U8 message1[sizeof(message) + 1] = {0};
-    Os::File::Status status;
-    FwSizeType size;
-    // = file.open("/tmp1", Os::File::Mode::OPEN_CREATE);
-    // Os::File::Status status = file.open("/tmp1", Os::File::Mode::OPEN_CREATE);
-    // FwSizeType size = static_cast<FwSignedSizeType>(sizeof(message));
-    // printk("Status: %d - open\n", static_cast<int>(status));
-    // status = file.write(message, size);
-    // printk("Status: %d - write %" PRI_FwSizeType "\n", static_cast<int>(status), size);
-    // file.close();
-    status = file.open("/tmp1", Os::File::Mode::OPEN_READ);
-    printk("Status: %d - open (R)\n", static_cast<int>(status));
-    size = static_cast<FwSignedSizeType>(sizeof(message));
-    status = file.read(message1, size);
-    printk("Status: %d - read %" PRI_FwSizeType "\n", static_cast<int>(status), size);
-    message1[sizeof(message)] = 0;
-    printk("Message: %s\n", message1);
     Os::init();
     // Object for communicating state to the topology
     ReferenceDeployment::TopologyState inputs;

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopology.cpp

@@ -50,6 +50,7 @@ U32 rateGroup1HzContext[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {getRateGr
  * desired, but is extracted here for clarity.
  */
 void configureTopology() {
+    prmDb.configure("/prmDb.dat");
     // Rate group driver needs a divisor list
     rateGroupDriver.configure(rateGroupDivisorsSet);
     // Rate groups require context arrays.
@@ -77,6 +78,7 @@ void setupTopology(const TopologyState& state) {
     // Project-specific component configuration. Function provided above. May be inlined, if desired.
     configureTopology();
     // Autocoded parameter loading. Function provided by autocoder.
+    prmDb.readParamFile();
     loadParameters();
     // Autocoded task kick-off (active components). Function provided by autocoder.
     startTasks(state);

FprimeZephyrReference/ReferenceDeployment/Top/instances.fpp

@@ -37,6 +37,11 @@ module ReferenceDeployment {
     stack size Default.STACK_SIZE \
     priority 4
 
+  instance prmDb: Svc.PrmDb base id 0x10003000 \
+    queue size Default.QUEUE_SIZE \
+    stack size Default.STACK_SIZE \
+    priority 5
+
   # ----------------------------------------------------------------------
   # Queued component instances
   # ----------------------------------------------------------------------
@@ -73,8 +78,6 @@ module ReferenceDeployment {
 
   instance gpioBurnwire1: Zephyr.ZephyrGpioDriver base id 0x10023000
 
-  instance prmDb: Components.NullPrmDb base id 0x10024000
-
   instance comDelay: Components.ComDelay base id 0x10025000
 
   instance lora: Zephyr.LoRa base id 0x10026000