Merge pull request #16 from nasa-itc/nos3#370

[nasa/nos3#370] Move to used a shared folder between FSW types
nasa-itc · Oct 31, 2024 · 99c34e2 · 99c34e2
2 parents 8875ec1 + d3a3cef
commit 99c34e2
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 372 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,16 @@
+#
+# Metadata
+#
+.vagrant
+.vscode
+
+#
+# Build Files
+#
+build
 fprime/build
-support/build
+fsw/standalone/build
+tmp
+.cdskeyfile
+.reservedkeyfile
+.resetkeyfile
diff --git a/fsw/cfs/CMakeLists.txt b/fsw/cfs/CMakeLists.txt
@@ -8,12 +8,14 @@ include_directories(mission_inc)
 include_directories(platform_inc)
 include_directories(src)
 
+include_directories(../shared)
 include_directories(${hwlib_MISSION_DIR}/fsw/public_inc)
 
 aux_source_directory(src APP_SRC_FILES)
 
 # Create the app module
-add_cfe_app(sample ${APP_SRC_FILES})
+add_cfe_app(sample ${APP_SRC_FILES}
+            ../shared/sample_device.c)
 
 # If UT is enabled, then add the tests from the subdirectory
 # Note that this is an app, and therefore does not provide

diff --git a/fsw/cfs/src/sample_device.c b/fsw/cfs/src/sample_device.c
diff --git a/fsw/cfs/src/sample_device.h b/fsw/cfs/src/sample_device.h
diff --git a/fsw/cfs/unit-test/CMakeLists.txt b/fsw/cfs/unit-test/CMakeLists.txt
@@ -35,8 +35,8 @@ include_directories(${hwlib_MISSION_DIR}/fsw/public_inc)
 add_cfe_coverage_test(sample ALL 
     "coveragetest/coveragetest_sample_app.c"
     "../src/sample_app.c"
-    "../src/sample_device.c"
-    "../../../../fsw/apps/hwlib/fsw/stubs/libuart.c"
+    "../../shared/sample_device.c"
+    "../../../../../fsw/apps/hwlib/fsw/stubs/libuart.c"
 )
 
 # The sample uses library functions provided by sample_lib so must be linked

diff --git a/fsw/fprime/src/sample_device.c → fsw/shared/sample_device.c b/fsw/fprime/src/sample_device.c → fsw/shared/sample_device.c
diff --git a/fsw/fprime/src/sample_device.h → fsw/shared/sample_device.h b/fsw/fprime/src/sample_device.h → fsw/shared/sample_device.h