Skip to content

Commit

Permalink
[#84] Sample runnning, build with docker container, switch between fp…
Browse files Browse the repository at this point in the history
…rime and cosmos/cfs
  • Loading branch information
zlynch2 committed Sep 30, 2024
1 parent 77bb328 commit 3392e2e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
1 change: 0 additions & 1 deletion Makefile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ fprime:

fsw:
./scripts/docker_build_fsw.sh
# ./cfg/build/fsw_build.sh

gsw:
./scripts/docker_build_cryptolib.sh
Expand Down
3 changes: 3 additions & 0 deletions cfg/nos3-mission.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<nos3-mission-cfg>
<start-time>814048200.0</start-time>
<!-- <gsw>cosmos</gsw>
<fsw>cfs</fsw> -->
<gsw>fprime</gsw>
<fsw>fprime</fsw>
<number-spacecraft>1</number-spacecraft>
<!-- <sc-1-cfg>sc-full-config.xml</sc-1-cfg> -->
<sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
<!--
<sc-2-cfg>sc-minimal-config.xml</sc-2-cfg>
Expand Down
5 changes: 5 additions & 0 deletions cfg/nos3_defs/targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,23 @@ list(APPEND MISSION_GLOBAL_APPLIST
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/cfs/mission_inc)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/mission_inc)

LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/inc)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/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/cfs/platform_inc)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/platform_inc)

LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/public_inc)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/public_inc)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/public_inc)

LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/src)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/src)
LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/src)
ENDFOREACH(X)

# FT_INSTALL_SUBDIR indicates where the black box test data files (lua scripts) should
Expand Down
Empty file modified components/ComponentSettings.cmake
100644 → 100755
Empty file.

0 comments on commit 3392e2e

Please sign in to comment.