Bump to v4.0.0 (#6)

* Remove old deployment

* Upgrade to v4.0.0

* Bump sub repo pointer

* Update to telemetry packetizer

* Runs to main loop

* Add comment, remove unnecessary config

* Fix review suggestions

* Bump pointer

Author: LeStarch

.gitmodules

@@ -6,4 +6,4 @@
 	url = https://github.com/zephyrproject-rtos/zephyr.git
 [submodule "lib/fprime-zephyr"]
 	path = lib/fprime-zephyr
-	url = https://github.com/lestarch/fprime-zephyr.git
+	url = https://github.com/fprime-community/fprime-zephyr.git

CMakeLists.txt

@@ -24,7 +24,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/lib/fprime/cmake/FPrime.cmake")
 fprime_setup_included_code()
 
 # This includes project-wide objects
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/fprime-zephyr-reference")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/FprimeZephyrReference")
 
 set_target_properties(Svc_FatalHandler PROPERTIES EXCLUDE_FROM_ALL TRUE)
 set_target_properties(fprime-zephyr_Drv_ZephyrSpiDriver PROPERTIES EXCLUDE_FROM_ALL TRUE)

fprime-zephyr-reference/CMakeLists.txt renamed to FprimeZephyrReference/CMakeLists.txt

@@ -11,7 +11,7 @@
 // ======================================================================
 
 #include <Fw/Logger/Logger.hpp>
-#include <fprime-zephyr-reference/Components/FatalHandler/FatalHandler.hpp>
+#include <FprimeZephyrReference/Components/FatalHandler/FatalHandler.hpp>
 #include <Fw/FPrimeBasicTypes.hpp>
 #include <zephyr/sys/reboot.h>
 
@@ -45,9 +45,8 @@ namespace Components {
         asm("bkpt #251");
       }
   #endif
-      // Otherwise, use Zephyr to reboot the system
-      sys_reboot(SYS_REBOOT_COLD);
-      while(1) {}
+    // Otherwise, use Zephyr to reboot the system
+    sys_reboot(SYS_REBOOT_COLD);
   }
 
   void FatalHandler::FatalReceive_handler(

fprime-zephyr-reference/Components/CMakeLists.txt renamed to FprimeZephyrReference/Components/CMakeLists.txt

@@ -13,7 +13,7 @@
 #ifndef FatalHandler_HPP
 #define FatalHandler_HPP
 
-#include "fprime-zephyr-reference/Components/FatalHandler/FatalHandlerComponentAc.hpp"
+#include "FprimeZephyrReference/Components/FatalHandler/FatalHandlerComponentAc.hpp"
 
 namespace Components {
 

fprime-zephyr-reference/Components/FatalHandler/CMakeLists.txt renamed to FprimeZephyrReference/Components/FatalHandler/CMakeLists.txt

@@ -10,10 +10,8 @@
 ###
 # Topology and Components
 ###
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Top/")
 
-# Add custom components to this specific deployment here
-# add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/MyComponent/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Top/")
 
 if (FPRIME_PLATFORM STREQUAL "Zephyr")
    register_fprime_zephyr_deployment(
@@ -23,13 +21,4 @@ if (FPRIME_PLATFORM STREQUAL "Zephyr")
         DEPENDS
             ${FPRIME_CURRENT_MODULE}_Top
     )
-else()
-    # In non-Zephyr targets, register a deployment as usual
-    register_fprime_deployment(
-        SOURCES
-            "${CMAKE_CURRENT_LIST_DIR}/Main.cpp"
-        DEPENDS
-            ${FPRIME_CURRENT_MODULE}_Top
-    )
 endif()
-

fprime-zephyr-reference/Components/FatalHandler/FatalHandler.cpp renamed to FprimeZephyrReference/Components/FatalHandler/FatalHandler.cpp

@@ -0,0 +1,31 @@
+// ======================================================================
+// \title  Main.cpp
+// \brief main program for the F' application. Intended for CLI-based systems (Linux, macOS)
+//
+// ======================================================================
+// Used to access topology functions
+#include <FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopology.hpp>
+#include <zephyr/sys/printk.h>
+#include <zephyr/kernel.h>
+
+const struct device *serial = DEVICE_DT_GET(DT_NODELABEL(cdc_acm_uart0));
+
+int main(int argc, char* argv[]) {
+    // ** DO NOT REMOVE **//
+    //
+    // 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::init();
+    // Object for communicating state to the topology
+    ReferenceDeployment::TopologyState inputs;
+    inputs.uartDevice = serial;
+    inputs.baudRate = 115200;
+ 
+    // Setup, cycle, and teardown topology
+    ReferenceDeployment::setupTopology(inputs);
+    ReferenceDeployment::startRateGroups(); // Program loop
+    ReferenceDeployment::teardownTopology(inputs);
+    return 0;
+}