Fixing RPI build

nasa · May 6, 2024 · 4c29fdb · 4c29fdb
1 parent cb9122b
commit 4c29fdb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/RPI/Main.cpp b/RPI/Main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[]) {
     // Time to exit the program.
     // Give time for threads to exit.
     (void) printf("Waiting for threads...\n");
-    Os::Task::delay(1000);
+    Os::Task::delay(Fw::Time(1,0));
 
     (void) printf("Exiting...\n");
 

diff --git a/RPI/Top/Topology.cpp b/RPI/Top/Topology.cpp
@@ -240,14 +240,14 @@ void constructApp(U32 port_number, char* hostname) {
         return;
     }
 
-    uartDrv.startReadThread();
+    uartDrv.start();
 
     // Initialize socket server if and only if there is a valid specification
     if (hostname != nullptr && port_number != 0) {
         Os::TaskString name("ReceiveTask");
         // Uplink is configured for receive so a socket task is started
         comm.configure(hostname, port_number);
-        comm.startSocketTask(name);
+        comm.start(name);
     }
 }
 
@@ -265,7 +265,7 @@ void exitTasks() {
     cmdSeq.exit();
     rpiDemo.exit();
     comm.stopSocketTask();
-    (void) comm.joinSocketTask(nullptr);
+    (void) comm.join();
     cmdSeq.deallocateBuffer(mallocator);
     fileUplinkBufferManager.cleanup();
 }

diff --git a/RPI/Top/instances.fpp b/RPI/Top/instances.fpp
@@ -258,7 +258,7 @@ module RPI {
         Os::TaskString name("ReceiveTask");
         // Uplink is configured for receive so a socket task is started
         comm.configure(state.hostName, state.portNumber);
-        comm.startSocketTask(
+        comm.start(
             name,
             ConfigConstants::comm::PRIORITY,
             ConfigConstants::comm::STACK_SIZE
@@ -267,11 +267,11 @@ module RPI {
     """
 
     phase Fpp.ToCpp.Phases.stopTasks """
-    comm.stopSocketTask();
+    comm.stop();
     """
 
     phase Fpp.ToCpp.Phases.freeThreads """
-    (void) comm.joinSocketTask(nullptr);
+    (void) comm.join();
     """
 
   }
@@ -323,7 +323,7 @@ module RPI {
 
     phase Fpp.ToCpp.Phases.startTasks """
     if (Init::status) {
-      uartDrv.startReadThread();
+      uartDrv.start();
     }
     else {
       Fw::Logger::logMsg("[ERROR] Initialization failed; not starting UART driver\\n");