Skip to content

Commit

Permalink
[#339] Started getting submodules updated to latest and reworking ait…
Browse files Browse the repository at this point in the history 
… - needs special container currently;
  • Loading branch information
@jlucas9
jlucas9 committed Sep 13, 2024
1 parent 963cbcd commit 52bdb40
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 36 deletions.
4 changes: 2 additions & 2 deletions cfg/nos3-mission.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<nos3-mission-cfg>
<start-time>814048200.0</start-time>
<gsw>cosmos</gsw>
<gsw>ait</gsw>
<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
2 changes: 1 addition & 1 deletion components/sample
Submodule sample updated 5 files
+8 −0 fsw/CMakeLists.txt
+46 −0 fsw/unit-test/CMakeLists.txt
+467 −0 fsw/unit-test/coveragetest/coveragetest_sample_app.c
+67 −0 fsw/unit-test/coveragetest/sample_app_coveragetest_common.h
+51 −0 fsw/unit-test/inc/ut_sample_app.h
2 changes: 1 addition & 1 deletion fsw/apps/ds
Submodule ds updated 21 files
+0 −2 fsw/inc/ds_extern_typedefs.h
+0 −2 fsw/inc/ds_msg.h
+4 −3 fsw/src/ds_app.c
+2 −0 fsw/src/ds_app.h
+1 −1 fsw/src/ds_appdefs.h
+28 −28 fsw/src/ds_cmds.c
+1 −1 fsw/src/ds_dispatch.c
+121 −128 fsw/src/ds_file.c
+1 −3 fsw/src/ds_file.h
+31 −29 fsw/src/ds_table.c
+10 −10 fsw/src/ds_table.h
+0 −32 fsw/tables/ds_file_tbl.c
+11 −11 unit-test/ds_app_tests.c
+63 −64 unit-test/ds_cmds_tests.c
+45 −45 unit-test/ds_dispatch_tests.c
+118 −159 unit-test/ds_file_tests.c
+5 −4 unit-test/ds_table_tests.c
+3 −3 unit-test/stubs/ds_file_stubs.c
+30 −30 unit-test/stubs/ds_table_stubs.c
+0 −1 unit-test/stubs/stub_basetypes.h
+2 −2 unit-test/utilities/ds_test_utils.h
2 changes: 1 addition & 1 deletion fsw/apps/hwlib
Submodule hwlib updated 17 files
+1 −1 fsw/linux/libcan.c
+3 −3 fsw/linux/libgpio.c
+24 −24 fsw/linux/libi2c.c
+0 −4 fsw/linux/libsocket.c
+0 −1 fsw/linux/libspi.c
+12 −15 fsw/linux/libtrq.c
+13 −13 fsw/linux/libuart.c
+2 −0 fsw/public_inc/hwlib.h
+7 −2 fsw/src/hwlib.c
+58 −0 fsw/stubs/libcan.c
+38 −0 fsw/stubs/libgpio.c
+50 −0 fsw/stubs/libi2c.c
+83 −0 fsw/stubs/libsocket.c
+60 −0 fsw/stubs/libspi.c
+116 −0 fsw/stubs/libtrq.c
+42 −0 fsw/stubs/libtrq_ioctl.h
+48 −0 fsw/stubs/libuart.c
2 changes: 1 addition & 1 deletion fsw/apps/sc
Submodule sc updated 1 files
+309 −309 unit-test/sc_cmds_tests.c
2 changes: 1 addition & 1 deletion fsw/osal
Submodule osal updated 5 files
+1 −1 src/os/nos/inc/NOS-time.h
+1 −1 src/os/nos/src/NOS-time.c
+7 −7 src/os/nos/src/os-impl-tasks.c
+2 −2 src/tests/timer-add-api-test/timer-add-api-test.c
+2 −2 src/tests/timer-test/timer-test.c
2 changes: 1 addition & 1 deletion fsw/psp
Submodule psp updated 1 files
+0 −9 .github/pull_request_template.md
2 changes: 1 addition & 1 deletion gsw/ait
Submodule ait updated from 478a6c to 000540
2 changes: 1 addition & 1 deletion gsw/cosmos
Submodule cosmos updated 2 files
+2 −0 config/system/system.txt
+2 −0 config/tools/cmd_tlm_server/cmd_tlm_server.txt
20 changes: 10 additions & 10 deletions scripts/docker_launch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ do
$DNETWORK create $SC_NETNAME 2> /dev/null
echo ""

alias="cosmos"
if [ "${GSW:-cosmos_openc3-operator_1}" == "ait" ]; then
alias="ait"
docker run --rm -d -h influxdb --name influxdb -p 8086:8086 -e INFLUXDB_DB=$INFLUXDB_DB -e INFLUXDB_ADMIN_USER=$INFLUXDB_ADMIN_USER -e INFLUXDB_ADMIN_PASSWORD=$INFLUXDB_ADMIN_PASSWORD --network=nos3_core influxdb:1.8
docker run --rm -d --name ttc-command -p 80:80 --network=nos3_core ghcr.io/sphinxdefense/ttc-command:main
fi

echo $SC_NUM " - Connect GSW " "${GSW:-cosmos_openc3-operator_1}" " to spacecraft network..."
$DNETWORK connect $SC_NETNAME "${GSW:-cosmos_openc3-operator_1}" --alias $alias --alias active-gs
echo ""
#alias="cosmos"
#if [ "${GSW:-cosmos_openc3-operator_1}" == "ait" ]; then
# alias="ait"
# docker run --rm -d -h influxdb --name influxdb -p 8086:8086 -e INFLUXDB_DB=$INFLUXDB_DB -e INFLUXDB_ADMIN_USER=$INFLUXDB_ADMIN_USER -e INFLUXDB_ADMIN_PASSWORD=$INFLUXDB_ADMIN_PASSWORD --network=nos3_core influxdb:1.8
# docker run --rm -d --name ttc-command -p 80:80 --network=nos3_core ghcr.io/sphinxdefense/ttc-command:main
#fi

#echo $SC_NUM " - Connect GSW " "${GSW:-cosmos_openc3-operator_1}" " to spacecraft network..."
#$DNETWORK connect $SC_NETNAME "${GSW:-cosmos_openc3-operator_1}" --alias $alias --alias active-gs
#echo ""

echo $SC_NUM " - 42..."
rm -rf $USER_NOS3_DIR/42/NOS3InOut
Expand Down
6 changes: 1 addition & 5 deletions scripts/env.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ USER_NOS3_DIR=$(cd ~/ && pwd)/.nos3
OPENC3_DIR=$USER_NOS3_DIR/cosmos
OPENC3_PATH=$OPENC3_DIR/openc3.sh

INFLUXDB_DB=ait
INFLUXDB_ADMIN_USER=ait
INFLUXDB_ADMIN_PASSWORD=admin_password

###
### Notes:
### Podman and/or Docker on RHEL not yet supported
Expand All @@ -44,7 +40,7 @@ INFLUXDB_ADMIN_PASSWORD=admin_password
DNETWORK="docker network"
#fi

DBOX="ivvitc/nos3-64:20240618"
DBOX="ivvitc/nos3-64:dev"

# Debugging
#echo "Script directory = " $SCRIPT_DIR
Expand Down
9 changes: 8 additions & 1 deletion scripts/gsw_ait_launch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ source $SCRIPT_DIR/env.sh
export GSW="ait"

echo "AIT launch..."
gnome-terminal --tab --title="AIT" -- docker run --rm -it -v $BASE_DIR:$BASE_DIR -v /tmp/nos3:/tmp/nos3 --name ait -h ait -p 8001:8001 --network=nos3_core ghcr.io/sphinxdefense/gsw-ait:main "source ~/.bashrc && ait-server"
cd $BASE_DIR/gsw/ait
gnome-terminal --window-with-profile=KeepOpen --title="AIT" -- $DFLAGS -v $BASE_DIR:$BASE_DIR -v /tmp/nos3:/tmp/nos3 -w $BASE_DIR/gsw/ait --name ait -h ait -p 8001:8001 --network=nos3_core $DBOX "export AIT_CONFIG=$BASE_DIR/gsw/ait ; ait-server"

pidof firefox > /dev/null
if [ $? -eq 1 ]
then
firefox localhost:80 &
fi
16 changes: 8 additions & 8 deletions scripts/prepare.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ $DCALL image pull ballaerospace/cosmos:4.5.0
echo ""
echo ""

echo "Prepare ait docker container..."
$DCALL image pull ghcr.io/sphinxdefense/gsw-ait:main
echo ""
echo ""
#echo "Prepare ait docker container..."
#$DCALL image pull ghcr.io/sphinxdefense/gsw-ait:main
#echo ""
#echo ""

echo "Prepare ttc docker container..."
$DCALL image pull ghcr.io/sphinxdefense/ttc-command:main
echo ""
echo ""
#echo "Prepare ttc docker container..."
#$DCALL image pull ghcr.io/sphinxdefense/ttc-command:main
#echo ""
#echo ""

echo "Prepare nos3 docker container..."
$DCALL image pull $DBOX
Expand Down
2 changes: 1 addition & 1 deletion sims/nos_time_driver
Submodule nos_time_driver updated 2 files
+1 −0 inc/time_driver.hpp
+34 −26 src/time_driver.cpp
2 changes: 1 addition & 1 deletion sims/sim_common
Submodule sim_common updated 1 files
+1 −1 src/sim_data_42socket_provider.cpp

0 comments on commit 52bdb40

Please sign in to comment.