corrected merge errors

Author: ineskhou

FprimeZephyrReference/Components/CMakeLists.txt

@@ -11,8 +11,4 @@ add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/ImuManager/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/NullPrmDb/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/PowerMonitor/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Watchdog")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Burnwire/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/BootloaderTrigger/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LoadSwitch/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/AntennaDeployer/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/FsSpace/")

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

@@ -70,6 +70,7 @@ telemetry packets ReferenceDeploymentPackets {
     ReferenceDeployment.face5LoadSwitch.IsOn
     ReferenceDeployment.payloadPowerLoadSwitch.IsOn
     ReferenceDeployment.payloadBatteryLoadSwitch.IsOn
+  }
 
   packet PowerMonitor id 10 group 4 {
     ReferenceDeployment.ina219SysManager.Voltage

FprimeZephyrReference/ReferenceDeployment/Top/instances.fpp

@@ -123,8 +123,6 @@ module ReferenceDeployment {
 
   instance payloadBatteryLoadSwitch: Components.LoadSwitch base id 0x1003A000
 
-  instance fsSpace: Components.FsSpace base id 0x1003B000
-
   instance powerMonitor: Components.PowerMonitor base id 0x1003C000
 
   instance ina219SysManager: Drv.Ina219Manager base id 0x1003D000