[#295] Created a fsw/cfs folder for components so that other FSW type…

…s can be used as well;
nasa · Jun 14, 2024 · 5c05562 · 5c05562
1 parent 18a289b
commit 5c05562
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
  fsw:
  runs-on: ubuntu-latest
  container:
- image: ivvitc/nos3-64:dev
+ image: ivvitc/nos3-64:fprime
  steps:
  - uses: actions/checkout@v4
  with:
@@ -29,7 +29,7 @@ jobs:
  sim:
  runs-on: ubuntu-latest
  container:
- image: ivvitc/nos3-64:dev
+ image: ivvitc/nos3-64:fprime
  steps:
  - uses: actions/checkout@v2
  with:

diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake
@@ -103,35 +103,38 @@ list(APPEND MISSION_GLOBAL_APPLIST
  #
  # Components
  #
- arducam/fsw
- generic_adcs/fsw
- generic_css/fsw
- generic_eps/fsw
- generic_fss/fsw
- generic_imu/fsw
- generic_mag/fsw
- generic_reaction_wheel/fsw
- generic_radio/fsw
- generic_star_tracker/fsw
- generic_torquer/fsw
- novatel_oem615/fsw
- sample/fsw
- syn/fsw
+ arducam/fsw/cfs
+ generic_adcs/fsw/cfs
+ generic_css/fsw/cfs
+ generic_eps/fsw/cfs
+ generic_fss/fsw/cfs
+ generic_imu/fsw/cfs
+ generic_mag/fsw/cfs
+ generic_reaction_wheel/fsw/cfs
+ generic_radio/fsw/cfs
+ generic_star_tracker/fsw/cfs
+ generic_torquer/fsw/cfs
+ novatel_oem615/fsw/cfs
+ sample/fsw/cfs
+ syn/fsw/cfs
 )
 
 # Create Application Platform Include List
 FOREACH(X ${MISSION_GLOBAL_APPLIST})
  LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/mission_inc)
- LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/mission_inc)
+ LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/mission_inc)
+
  LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/inc)
- LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/inc)
- LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/platform_inc)
- LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/platform_inc)
+ LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/inc)
+
  LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/platform_inc)
+ LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/platform_inc)
+
  LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/public_inc)
- LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/public_inc)
+ LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/public_inc)
+
  LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/src)
- LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/src)
+ LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/src)
 ENDFOREACH(X)
 
 # FT_INSTALL_SUBDIR indicates where the black box test data files (lua scripts) should

diff --git a/components/arducam b/components/arducam
diff --git a/components/generic_adcs b/components/generic_adcs
diff --git a/components/generic_css b/components/generic_css
diff --git a/components/generic_eps b/components/generic_eps
diff --git a/components/generic_fss b/components/generic_fss
diff --git a/components/generic_imu b/components/generic_imu
diff --git a/components/generic_mag b/components/generic_mag
diff --git a/components/generic_radio b/components/generic_radio
diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel
diff --git a/components/generic_star_tracker b/components/generic_star_tracker
diff --git a/components/generic_torquer b/components/generic_torquer
diff --git a/components/novatel_oem615 b/components/novatel_oem615
diff --git a/components/sample b/components/sample
diff --git a/components/syn b/components/syn