From 4114fe9b061b50e1b22983141247e11ead9f0cbd Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 15 May 2024 12:16:15 -0400 Subject: [PATCH 01/33] Fix botched merge. --- fsw/psp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/psp b/fsw/psp index 6699a3df..1159205e 160000 --- a/fsw/psp +++ b/fsw/psp @@ -1 +1 @@ -Subproject commit 6699a3df30985d825d0743f531eb710600f47bc8 +Subproject commit 1159205edc17db5806ec89c6c2d97125d294c836 From 6a04655cd81a6c18af74753c3472ecf829cac572 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 12 Jun 2024 18:25:26 -0400 Subject: [PATCH 02/33] [nasa/nos3#231] Change over to use new version of nos3-64:dev that supports both amd64 and arm64 architectures; --- scripts/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/env.sh b/scripts/env.sh index 426d55f9..6bf3791a 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -40,7 +40,7 @@ OPENC3_PATH=$OPENC3_DIR/openc3.sh DNETWORK="docker network" #fi -DBOX="ivvitc/nos3-64:20240430" +DBOX="ivvitc/nos3-64:dev" # Debugging #echo "Script directory = " $SCRIPT_DIR From 5ec004cbb7fd3e84369e28cead736fdc44bad757 Mon Sep 17 00:00:00 2001 From: "John P. Lucas" Date: Fri, 14 Jun 2024 07:33:52 -0400 Subject: [PATCH 03/33] [nasa/nos3#216] Added CI to NOS3 for FSW and SIM (#316) * [nasa/nos3#216] First attempt at build workflow; * [nasa/nos3#216] Removed specific branches from build workflow; * [nasa/nos3#216] Removed sudo and added make prep; * [nasa/nos3#216] Added missing docker dependency; * [nasa/nos3#216] Break config and fsw into different runs in build.yml; * [nasa/nos3#216] Avoid docker in docker and run build-fsw; * [nasa/nos3#216] Attempt to get submodules recursively; * [nasa/nos3#216] Added sim job to build workflow; * [nasa/nos3#216] Attempt to use checkout@v4; --- .github/workflows/build.yml | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..28419fdf --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,48 @@ +name: Build + +on: + push: + pull_request: + +jobs: + fsw: + runs-on: ubuntu-latest + container: + image: ivvitc/nos3-64:dev + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: Update + run: apt-get update + - name: Install dependencies + run: apt-get install -y python3 docker docker.io + - name: prep + run: make prep + - name: config + run: make config + - name: build directory + run: mkdir ./fsw/build + - name: build + run: make build-fsw + + sim: + runs-on: ubuntu-latest + container: + image: ivvitc/nos3-64:dev + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Update + run: apt-get update + - name: Install dependencies + run: apt-get install -y python3 docker docker.io + - name: prep + run: make prep + - name: config + run: make config + - name: build directory + run: mkdir ./sims/build + - name: build + run: make build-sim From f34d439a2e95478698c22ca07cfbf64dec4fecd0 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Tue, 18 Jun 2024 10:56:53 -0400 Subject: [PATCH 04/33] [nasa/nos3#231] Use new nos3-64:20240618 container and added notes to prep script; --- scripts/env.sh | 2 +- scripts/prepare.sh | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/env.sh b/scripts/env.sh index 6bf3791a..3030e8d1 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -40,7 +40,7 @@ OPENC3_PATH=$OPENC3_DIR/openc3.sh DNETWORK="docker network" #fi -DBOX="ivvitc/nos3-64:dev" +DBOX="ivvitc/nos3-64:20240618" # Debugging #echo "Script directory = " $SCRIPT_DIR diff --git a/scripts/prepare.sh b/scripts/prepare.sh index 03371dc6..7c75b276 100755 --- a/scripts/prepare.sh +++ b/scripts/prepare.sh @@ -39,9 +39,26 @@ $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NO echo "" echo "" -echo "Prepare Igniter..." +echo "NOS3 required preparations complete!" +echo "Proceeding to optional additions." +echo "" +echo "" + +echo "Prepare Igniter (optional)..." pip3 install pyside6 xmltodict cd $BASE_DIR python3 $BASE_DIR/cfg/gui/cfg_gui_main.py & echo "" echo "" + +sleep 3 +echo "" +echo "" + +echo "NOS3 prep script complete:" +echo " Some above optional installations may have failed, that's ok. You just may not have those extra features." +echo " You can choose to use the Igniter GUI or close it in favor of the command line." +echo " To launch igniter again simply run the following in the terminal:" +echo " make igniter" +echo "" +echo "" From 9497f4c0bc245d724c4eecd2f7ad4f9522db1e53 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Tue, 18 Jun 2024 11:00:35 -0400 Subject: [PATCH 05/33] [nasa/nos3#231] Update CI to use new nos3-64:20240618 container; --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28419fdf..25b42f98 100644 --- 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:20240618 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:20240618 steps: - uses: actions/checkout@v2 with: From 7c6fc4d0c3cc37f1bdf9506f1943a98fe4551f27 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 19 Jun 2024 16:57:59 -0400 Subject: [PATCH 06/33] [nasa/nos3#315] Created RTS3 (safe mode) and edited RTS1 run safe mode; --- cfg/nos3_defs/tables/sc_rts001.c | 30 +++++----- cfg/nos3_defs/tables/sc_rts003.c | 98 ++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 15 deletions(-) create mode 100644 cfg/nos3_defs/tables/sc_rts003.c diff --git a/cfg/nos3_defs/tables/sc_rts001.c b/cfg/nos3_defs/tables/sc_rts001.c index 2c4ddec3..f3a5cba6 100644 --- a/cfg/nos3_defs/tables/sc_rts001.c +++ b/cfg/nos3_defs/tables/sc_rts001.c @@ -23,18 +23,21 @@ /* Custom table structure, modify as needed to add desired commands */ typedef struct { + /* 1 - Enable DS */ SC_RtsEntryHeader_t hdr1; DS_AppStateCmd_t cmd1; + /* 2 - Enable Debug */ SC_RtsEntryHeader_t hdr2; TO_LAB_EnableOutputCmd_t cmd2; + /* 3 - Enable RTS 3-64 */ SC_RtsEntryHeader_t hdr3; SC_RtsGrpCmd_t cmd3; + /* 4 - Enable LC */ SC_RtsEntryHeader_t hdr4; - SAMPLE_NoArgs_cmd_t cmd4; + LC_SetLCState_t cmd4; + /* 5 - Start RTS 3 (Safe Mode) */ SC_RtsEntryHeader_t hdr5; - SAMPLE_NoArgs_cmd_t cmd5; - SC_RtsEntryHeader_t hdr6; - LC_SetLCState_t cmd6; + SC_RtsCmd_t cmd5; } SC_RtsStruct001_t; /* Define the union to size the table correctly */ @@ -67,21 +70,18 @@ SC_RtsTable001_t SC_Rts001 = { .cmd3.FirstRtsId = 3, .cmd3.LastRtsId = 64, - /* 4 - Sample NOOP */ + /* 4 - Enable LC */ .hdr4.TimeTag = 1, - .cmd4.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd4), SAMPLE_NOOP_CC, 0x00), + .cmd4.CmdHeader = CFE_MSG_CMD_HDR_INIT(LC_CMD_MID, SC_MEMBER_SIZE(cmd4), LC_SET_LC_STATE_CC, 0x00), + .cmd4.NewLCState = LC_STATE_ACTIVE, + .cmd4.Padding = 0x0000, - /* 5 - Sample Enable */ + /* 5 - Start RTS 3 (Safe Mode) */ .hdr5.TimeTag = 1, - .cmd5.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd5), SAMPLE_ENABLE_CC, 0x00), - - /* 6 - Enable LC */ - .hdr6.TimeTag = 1, - .cmd6.CmdHeader = CFE_MSG_CMD_HDR_INIT(LC_CMD_MID, SC_MEMBER_SIZE(cmd6), LC_SET_LC_STATE_CC, 0x00), - .cmd6.NewLCState = LC_STATE_ACTIVE, - .cmd6.Padding = 0x0000, + .cmd5.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd5), SC_START_RTS_CC, 0x00), + .cmd5.RtsId = 3, } }; /* Macro for table structure */ -CFE_TBL_FILEDEF(SC_Rts001, SC.RTS_TBL001, SC Example RTS_TBL001, sc_rts001.tbl) +CFE_TBL_FILEDEF(SC_Rts001, SC.RTS_TBL001, POR RTS001, sc_rts001.tbl) diff --git a/cfg/nos3_defs/tables/sc_rts003.c b/cfg/nos3_defs/tables/sc_rts003.c new file mode 100644 index 00000000..5080fa49 --- /dev/null +++ b/cfg/nos3_defs/tables/sc_rts003.c @@ -0,0 +1,98 @@ +#include "cfe.h" +#include "cfe_tbl_filedef.h" + +#include "sc_tbldefs.h" /* defines SC table headers */ +#include "sc_platform_cfg.h" /* defines table buffer size */ +#include "sc_msgdefs.h" /* defines SC command code values */ +#include "sc_msgids.h" /* defines SC packet msg ID's */ +#include "sc_msg.h" /* defines SC message structures */ + +/* Command Includes */ +#include "generic_css_msg.h" +#include "generic_css_msgids.h" +#include "generic_fss_msg.h" +#include "generic_fss_msgids.h" +#include "generic_imu_msg.h" +#include "generic_imu_msgids.h" +#include "generic_mag_msg.h" +#include "generic_mag_msgids.h" +#include "generic_torquer_msg.h" +#include "generic_torquer_msgids.h" +#include "novatel_oem615_msg.h" +#include "novatel_oem615_msgids.h" +#include "generic_adcs_msg.h" +#include "generic_adcs_msgids.h" +#include "generic_adcs_adac.h" + +/* Custom table structure, modify as needed to add desired commands */ +typedef struct +{ + /* 1 - Enable CSS */ + SC_RtsEntryHeader_t hdr1; + GENERIC_CSS_NoArgs_cmd_t cmd1; + /* 2 - Enable FSS */ + SC_RtsEntryHeader_t hdr2; + GENERIC_FSS_NoArgs_cmd_t cmd2; + /* 3 - Enable IMU */ + SC_RtsEntryHeader_t hdr3; + GENERIC_IMU_NoArgs_cmd_t cmd3; + /* 4 - Enable MAG */ + SC_RtsEntryHeader_t hdr4; + GENERIC_MAG_NoArgs_cmd_t cmd4; + /* 5 - Enable torquers */ + SC_RtsEntryHeader_t hdr5; + GENERIC_TORQUER_NoArgs_cmd_t cmd5; + /* 6 - Enable GPS */ + SC_RtsEntryHeader_t hdr6; + NOVATEL_OEM615_NoArgs_cmd_t cmd6; + /* 7 - Set ADCS to SUNSAFE_MODE */ + SC_RtsEntryHeader_t hdr7; + Generic_ADCS_Mode_cmd_t cmd7; +} SC_RtsStruct003_t; + +/* Define the union to size the table correctly */ +typedef union +{ + SC_RtsStruct003_t rts; + uint16 buf[SC_RTS_BUFF_SIZE]; +} SC_RtsTable003_t; + +/* Helper macro to get size of structure elements */ +#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct003_t *)0)->member)) + +/* Used designated intializers to be verbose, modify as needed/desired */ +SC_RtsTable003_t SC_Rts003 = { +.rts = { + /* 1 - Enable CSS */ + .hdr1.TimeTag = 1, + .cmd1.CmdHeader = CFE_MSG_CMD_HDR_INIT(GENERIC_CSS_CMD_MID, SC_MEMBER_SIZE(cmd1), GENERIC_CSS_ENABLE_CC, 0x00), + + /* 2 - Enable FSS */ + .hdr2.TimeTag = 1, + .cmd2.CmdHeader = CFE_MSG_CMD_HDR_INIT(GENERIC_FSS_CMD_MID, SC_MEMBER_SIZE(cmd2), GENERIC_FSS_ENABLE_CC, 0x00), + + /* 3 - Enable IMU */ + .hdr3.TimeTag = 1, + .cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(GENERIC_IMU_CMD_MID, SC_MEMBER_SIZE(cmd3), GENERIC_IMU_ENABLE_CC, 0x00), + + /* 4 - Enable MAG */ + .hdr4.TimeTag = 1, + .cmd4.CmdHeader = CFE_MSG_CMD_HDR_INIT(GENERIC_MAG_CMD_MID, SC_MEMBER_SIZE(cmd4), GENERIC_MAG_ENABLE_CC, 0x00), + + /* 5 - Enable torquers */ + .hdr5.TimeTag = 1, + .cmd5.CmdHeader = CFE_MSG_CMD_HDR_INIT(GENERIC_TORQUER_CMD_MID, SC_MEMBER_SIZE(cmd5), GENERIC_TORQUER_ENABLE_CC, 0x00), + + /* 6 - Enable GPS */ + .hdr6.TimeTag = 1, + .cmd6.CmdHeader = CFE_MSG_CMD_HDR_INIT(NOVATEL_OEM615_CMD_MID, SC_MEMBER_SIZE(cmd6), NOVATEL_OEM615_ENABLE_CC, 0x00), + + /* 7 - Set ADCS to SUNSAFE_MODE */ + .hdr7.TimeTag = 5, + .cmd7.CmdHeader = CFE_MSG_CMD_HDR_INIT(GENERIC_ADCS_CMD_MID, SC_MEMBER_SIZE(cmd7), GENERIC_ADCS_SET_MODE_CC, 0x00), + .cmd7.Mode = SUNSAFE_MODE, + } +}; + +/* Macro for table structure */ +CFE_TBL_FILEDEF(SC_Rts003, SC.RTS_TBL003, Safe Mode RTS003, sc_rts003.tbl) From 4edf97e4407955c52b6c66efb27baf00810d35ef Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 25 Jun 2024 08:00:19 -0400 Subject: [PATCH 07/33] [nasa/nos3#285] Attempted to implemented suggestions from sdunlap-afit and resolved issue with running minimal-config; --- cfg/sc-minimal-config.xml | 2 +- scripts/configure.py | 12 ++++++------ sims/nos_time_driver | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 07b9d3ab..cc1d0974 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -61,7 +61,7 @@ - true + false 0.1 diff --git a/scripts/configure.py b/scripts/configure.py index efd0c737..fe14b233 100755 --- a/scripts/configure.py +++ b/scripts/configure.py @@ -263,7 +263,7 @@ rw1_from_index = 999 rw2_to_index = 999 rw2_from_index = 999 - sample_index = 999 + #sample_index = 999 st_index = 999 torquer_index = 999 @@ -303,9 +303,9 @@ if line.find('RW 2 from 42') != -1: if (lines.index(line)) < rw2_from_index: rw2_from_index = lines.index(line) + 1 - if line.find('Sample IPC') != -1: - if (lines.index(line)) < sample_index: - sample_index = lines.index(line) + 1 + #if line.find('Sample IPC') != -1: + # if (lines.index(line)) < sample_index: + # sample_index = lines.index(line) + 1 if line.find('Star Tracker IPC') != -1: if (lines.index(line)) < st_index: st_index = lines.index(line) + 1 @@ -331,8 +331,8 @@ lines[rw1_from_index] = ipc_off lines[rw2_to_index] = ipc_off lines[rw2_from_index] = ipc_off - if (sc_sample_en != 'true'): - lines[sample_index] = ipc_off + #if (sc_sample_en != 'true'): + # lines[sample_index] = ipc_off if (sc_st_en != 'true'): lines[st_index] = ipc_off if (sc_torquer_en != 'true'): diff --git a/sims/nos_time_driver b/sims/nos_time_driver index da2d3b09..baaa1636 160000 --- a/sims/nos_time_driver +++ b/sims/nos_time_driver @@ -1 +1 @@ -Subproject commit da2d3b09c2b1868090b99fbf2507fd24f04043a7 +Subproject commit baaa16362b4ad28aa28dacd44aaf530a967ed0a6 From 9834c8570ce35831821c861e49b8da1f0cd528cd Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 25 Jun 2024 13:46:56 -0400 Subject: [PATCH 08/33] [nasa/nos3#176] Added test-fsw command to makefile; --- Makefile | 7 ++++++- components/sample | 2 +- fsw/psp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 95ea8b5b..84847472 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ endif # The "LOCALTGTS" defines the top-level targets that are implemented in this makefile # Any other target may also be given, in that case it will simply be passed through. -LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw +LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw test-fsw OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS)) # As this makefile does not build any real files, treat everything as a PHONY target @@ -118,5 +118,10 @@ stop: stop-gsw: ./scripts/stop_gsw.sh +test-fsw: + mkdir -p $(FSWBUILDDIR) + cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe + $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install + igniter: ./scripts/igniter_launch.sh diff --git a/components/sample b/components/sample index 34260dd8..bf8dd3df 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 34260dd8a8d929b6d36c8805f08754aa847d6e97 +Subproject commit bf8dd3df09d4542b8784ca6e7b91dfef646aea10 diff --git a/fsw/psp b/fsw/psp index 1159205e..cd5546b9 160000 --- a/fsw/psp +++ b/fsw/psp @@ -1 +1 @@ -Subproject commit 1159205edc17db5806ec89c6c2d97125d294c836 +Subproject commit cd5546b9b873fb50a5a7154d4072356dc6ba042e From ab4b58d11a903316bc9c5e1d97f87681c2267215 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 26 Jun 2024 14:25:51 -0400 Subject: [PATCH 09/33] [nasa/nos3#176] Building test-fsw and trying to run ctest; --- .gitignore | 3 +++ Makefile | 1 + fsw/osal | 2 +- scripts/docker_debug.sh | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0f32a7a8..f0f562f0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ build support/nos3_install.log tmp core.* +.cdskeyfile +.reservedkeyfile +.resetkeyfile diff --git a/Makefile b/Makefile index 84847472..4d106a14 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,7 @@ test-fsw: mkdir -p $(FSWBUILDDIR) cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install + cd $(FSWBUILDDIR)/amd64-linux-gnu/default_cpu1 && ctest -O ctest.log igniter: ./scripts/igniter_launch.sh diff --git a/fsw/osal b/fsw/osal index 570ad091..452824c4 160000 --- a/fsw/osal +++ b/fsw/osal @@ -1 +1 @@ -Subproject commit 570ad0913daf57ad2a62c92f6a0daef5a94f72ba +Subproject commit 452824c4fa54cf956c5ac745ea6db6773c72cc60 diff --git a/scripts/docker_debug.sh b/scripts/docker_debug.sh index 87c541a7..05f479db 100755 --- a/scripts/docker_debug.sh +++ b/scripts/docker_debug.sh @@ -9,4 +9,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source $SCRIPT_DIR/env.sh mkdir -p $BASE_DIR/fsw/build -$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $BASE_DIR --name "nos3_debug" $DBOX bash +$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $BASE_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice --name "nos3_debug" $DBOX bash From c6e2bf3b319b1bf7db65eadc1290c833392741ee Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 1 Jul 2024 13:21:32 -0400 Subject: [PATCH 10/33] https://github.com/nasa/nos3/issues/227 - Start at generic thruster component. Code is from sample app for now. --- cfg/InOut/Inp_IPC.txt | 10 ++++++++++ cfg/gui/cfg_gui_main.py | 2 +- cfg/nos3_defs/cpu1_cfe_es_startup.scr | 1 + cfg/nos3_defs/targets.cmake | 1 + cfg/sims/nos3-simulator.xml | 23 +++++++++++++++++++++++ gsw/cosmos | 2 +- scripts/configure.py | 18 ++++++++++++++++++ scripts/docker_launch.sh | 1 + scripts/launch.sh | 1 + 9 files changed, 57 insertions(+), 2 deletions(-) diff --git a/cfg/InOut/Inp_IPC.txt b/cfg/InOut/Inp_IPC.txt index 1e2bc0d8..d0644602 100644 --- a/cfg/InOut/Inp_IPC.txt +++ b/cfg/InOut/Inp_IPC.txt @@ -70,6 +70,16 @@ FALSE ! Allow Blocking (i.e. wait on RX) FALSE ! Echo to stdout 1 ! Number of TX prefixes "SC" ! Prefix 0 +********************************** Thruster IPC **************************** +RX ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE) +1 ! AC.ID for ACS mode +"Thruster.Rx" ! File name for WRITE or READ +SERVER ! Socket Role (SERVER,CLIENT,GMSEC_CLIENT) +fortytwo 4280 ! Server Host Name, Port +FALSE ! Allow Blocking (i.e. wait on RX) +FALSE ! Echo to stdout +1 ! Number of TX prefixes +"SC" ! Prefix 0 ********************************** GPS IPC ***************************** TX ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE) 0 ! AC.ID for ACS mode diff --git a/cfg/gui/cfg_gui_main.py b/cfg/gui/cfg_gui_main.py index 232bfacb..0e49b8f3 100644 --- a/cfg/gui/cfg_gui_main.py +++ b/cfg/gui/cfg_gui_main.py @@ -90,7 +90,7 @@ def saveText(self, layout:QLayout, config_value:int): # TODO: change to dynamically pull apps/components from xml file or directory, but how? applications = ['cf', 'ds', 'fm', 'lc', 'sc'] - components = ['adcs', 'cam', 'css', 'eps', 'fss', 'gps', 'imu', 'mag', 'radio', 'rw', 'sample', 'st', 'syn', 'torquer'] + components = ['adcs', 'cam', 'css', 'eps', 'fss', 'gps', 'imu', 'mag', 'radio', 'rw', 'sample', 'st', 'syn', 'torquer', 'thruster'] i = 0 while layout.itemAt(i) != None: diff --git a/cfg/nos3_defs/cpu1_cfe_es_startup.scr b/cfg/nos3_defs/cpu1_cfe_es_startup.scr index 7a21cddb..db551d53 100644 --- a/cfg/nos3_defs/cpu1_cfe_es_startup.scr +++ b/cfg/nos3_defs/cpu1_cfe_es_startup.scr @@ -32,6 +32,7 @@ CFE_APP, novatel_oem615, NOVATEL_AppMain, NAV, CFE_APP, sample, SAMPLE_AppMain, SAMPLE, 71, 32768, 0x0, 0; CFE_APP, generic_st, ST_AppMain, ST, 71, 32768, 0x0, 0; CFE_APP, syn, SYN_AppMain, SYN, 72, 32768, 0x0, 0; +CFE_APP, generic_thruster, GENERIC_THR_AppMain, THRUSTER, 73, 32768, 0x0, 0; CFE_LIB, cfs_lib, CFS_LibInit, CFS_LIB, 0, 0, 0x0, 0; CFE_APP, cs, CS_AppMain, CS, 55, 16384, 0x0, 0; diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake index b670344d..80d2d25a 100644 --- a/cfg/nos3_defs/targets.cmake +++ b/cfg/nos3_defs/targets.cmake @@ -113,6 +113,7 @@ list(APPEND MISSION_GLOBAL_APPLIST generic_reaction_wheel/fsw generic_radio/fsw generic_star_tracker/fsw + generic_thruster/fsw generic_torquer/fsw novatel_oem615/fsw sample/fsw diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 69461bce..9250ce55 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -422,6 +422,29 @@ + + generic_thruster_sim + true + libgeneric_thruster_sim.so + + GENERIC_THRUSTER + + + command + command + thruster-command + + + + GENERIC_THRUSTER_42_PROVIDER + fortytwo + 4280 + 30 + 1 + + + + truth42sim true diff --git a/gsw/cosmos b/gsw/cosmos index 50c889a4..31c72319 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 50c889a4f6ad21bd0dbc6e32254252a435e57770 +Subproject commit 31c72319b0db734cb1ee641e068bfd0858e58a65 diff --git a/scripts/configure.py b/scripts/configure.py index efd0c737..836b5c52 100755 --- a/scripts/configure.py +++ b/scripts/configure.py @@ -79,6 +79,7 @@ sc_st_en = sc_root.find('components/st/enable').text sc_syn_en = sc_root.find('components/syn/enable').text sc_torquer_en = sc_root.find('components/torquer/enable').text + sc_thruster_en = sc_root.find('components/thruster/enable').text sc_gui_en = sc_root.find('gui/enable').text sc_orbit_tipoff_x = sc_root.find('orbit/tipoff_x').text @@ -114,6 +115,7 @@ st_line = "" syn_line = "" torquer_line = "" + thruster_line = "" # Parse lines for line in lines: @@ -177,10 +179,14 @@ if line.find('TORQUER,') != -1: if (sc_torquer_en == 'true'): torquer_line = line + if line.find('THRUSTER,') != -1: + if (sc_thruster_en == 'true'): + thruster_line = line # Modify startup script per spacecraft configuration lines.insert(sc_startup_eof, "\n") lines.insert(sc_startup_eof, torquer_line) + lines.insert(sc_startup_eof, thruster_line) lines.insert(sc_startup_eof, syn_line) lines.insert(sc_startup_eof, st_line) lines.insert(sc_startup_eof, sample_line) @@ -266,6 +272,7 @@ sample_index = 999 st_index = 999 torquer_index = 999 + thruster_index = 999 with open('./cfg/InOut/Inp_IPC.txt', 'r') as fp: lines = fp.readlines() @@ -312,6 +319,9 @@ if line.find('Torquer IPC') != -1: if (lines.index(line)) < torquer_index: torquer_index = lines.index(line) + 1 + if line.find('Thruster IPC') != -1: + if (lines.index(line)) < thruster_index: + thruster_index = lines.index(line) + 1 ipc_off = 'OFF ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)\n' if (sc_css_en != 'true'): @@ -337,6 +347,8 @@ lines[st_index] = ipc_off if (sc_torquer_en != 'true'): lines[torquer_index] = ipc_off + if (sc_thruster_en != 'true'): + lines[thruster_index] = ipc_off with open('./cfg/build/InOut/Inp_IPC.txt', 'w') as fp: lines = "".join(lines) @@ -359,6 +371,7 @@ sample_index = 999 st_index = 999 torquer_index = 999 + thruster_index = 999 with open('./cfg/build/sims/nos3-simulator.xml', 'r') as fp: lines = fp.readlines() @@ -405,6 +418,9 @@ if line.find('generic_torquer_sim') != -1: if (lines.index(line)) < torquer_index: torquer_index = lines.index(line) + 1 + if line.find('generic_thruster_sim') != -1: + if (lines.index(line)) < thruster_index: + thruster_index = lines.index(line) + 1 sim_disabled = ' false\n' if (sc_cam_en != 'true'): @@ -433,6 +449,8 @@ lines[st_index] = sim_disabled if (sc_torquer_en != 'true'): lines[torquer_index] = sim_disabled + if (sc_thruster_en != 'true'): + lines[thruster_index] = sim_disabled with open('./cfg/build/sims/nos3-simulator.xml', 'w') as fp: lines = "".join(lines) diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh index 5d1caec7..c095f9b7 100755 --- a/scripts/docker_launch.sh +++ b/scripts/docker_launch.sh @@ -130,6 +130,7 @@ do gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim + gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim echo "" done diff --git a/scripts/launch.sh b/scripts/launch.sh index 662056ac..b55e6efd 100755 --- a/scripts/launch.sh +++ b/scripts/launch.sh @@ -50,6 +50,7 @@ gnome-terminal --tab --title='RW 1 Sim' -- $SIM_BIN/nos3-single-simula gnome-terminal --tab --title='RW 2 Sim' -- $SIM_BIN/nos3-single-simulator generic-reactionwheel-sim2 gnome-terminal --tab --title='Sample Sim' -- $SIM_BIN/nos3-single-simulator sample_sim gnome-terminal --tab --title='Torquer Sim' -- $SIM_BIN/nos3-single-simulator generic_torquer_sim +gnome-terminal --tab --title='Thruster Sim' -- $SIM_BIN/nos3-single-simulator generic_thruster_sim gnome-terminal --tab --title="NOS Time Driver" -- $SIM_BIN/nos3-single-simulator time gnome-terminal --tab --title="SYNOPSIS Sim" -- $SIM_BIN/nos3-single-simulator synopsis From 05095c54d9b4404d9fc6ecd6e02126cc26f1f8aa Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 1 Jul 2024 13:28:41 -0400 Subject: [PATCH 11/33] https://github.com/nasa/nos3/issues/227 - Start at generic thruster component. Code is from sample app for now. --- .gitmodules | 3 +++ components/generic_thruster | 1 + 2 files changed, 4 insertions(+) create mode 160000 components/generic_thruster diff --git a/.gitmodules b/.gitmodules index fb53a08b..bba13436 100644 --- a/.gitmodules +++ b/.gitmodules @@ -131,3 +131,6 @@ path = components/syn url = https://github.com/nasa-itc/syn.git branch = main +[submodule "components/generic_thruster"] + path = components/generic_thruster + url = https://github.com/nasa-itc/generic_thruster.git diff --git a/components/generic_thruster b/components/generic_thruster new file mode 160000 index 00000000..8ca7cc38 --- /dev/null +++ b/components/generic_thruster @@ -0,0 +1 @@ +Subproject commit 8ca7cc38626e3749e2f2dfb64591271d304d977d From f447be1b23dc2a70961ce3802a4c268cfcae1481 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 1 Jul 2024 13:33:09 -0400 Subject: [PATCH 12/33] https://github.com/nasa/nos3/issues/227 - Start at generic thruster component. Code is from sample app for now. --- components/generic_thruster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_thruster b/components/generic_thruster index 8ca7cc38..c6c7e826 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 8ca7cc38626e3749e2f2dfb64591271d304d977d +Subproject commit c6c7e8265f0175c90a2c7c3a97c7729d2babc8ce From b7cd635c528730ed14c876e9ae5000faa9fba2fd Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 1 Jul 2024 13:43:21 -0400 Subject: [PATCH 13/33] https://github.com/nasa/nos3/issues/227 - Start at generic thruster component. Code is from sample app for now. --- cfg/sc-full-config.xml | 3 +++ cfg/sc-minimal-config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cfg/sc-full-config.xml b/cfg/sc-full-config.xml index c2213c53..67a2917e 100644 --- a/cfg/sc-full-config.xml +++ b/cfg/sc-full-config.xml @@ -59,6 +59,9 @@ true + + true + true diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 07b9d3ab..0772fa94 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -59,6 +59,9 @@ false + + false + true From 6a5804ff2dd2eaab69aa8e63060d9ad33c6c0c61 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 1 Jul 2024 13:58:56 -0400 Subject: [PATCH 14/33] https://github.com/nasa/nos3/issues/227 - Tweaks --- cfg/sims/nos3-simulator.xml | 2 +- sims/sim_common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 9250ce55..be389cbf 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -439,7 +439,7 @@ GENERIC_THRUSTER_42_PROVIDER fortytwo 4280 - 30 + 0 1 diff --git a/sims/sim_common b/sims/sim_common index 5c804f64..8cb9ddcb 160000 --- a/sims/sim_common +++ b/sims/sim_common @@ -1 +1 @@ -Subproject commit 5c804f64834e41f02c0660275daca9778f065c24 +Subproject commit 8cb9ddcb5915ee7e286aee0d5e3e0e458f8110a8 From 9c7b61b42e463a4e3beb7dbb0cf34747fb405f25 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Mon, 1 Jul 2024 14:54:39 -0400 Subject: [PATCH 15/33] [nasa/nos3#176] Created posix and nos3 toolchains and use targets.cmake to detect if building unit tests; --- Makefile | 2 +- cfg/nos3_defs/targets.cmake | 6 +++- ...x-gnu.cmake => toolchain-amd64-nos3.cmake} | 0 cfg/nos3_defs/toolchain-amd64-posix.cmake | 34 +++++++++++++++++++ fsw/apps/hwlib | 2 +- fsw/osal | 2 +- 6 files changed, 42 insertions(+), 4 deletions(-) rename cfg/nos3_defs/{toolchain-amd64-linux-gnu.cmake => toolchain-amd64-nos3.cmake} (100%) create mode 100644 cfg/nos3_defs/toolchain-amd64-posix.cmake diff --git a/Makefile b/Makefile index 4d106a14..5f85a585 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ test-fsw: mkdir -p $(FSWBUILDDIR) cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install - cd $(FSWBUILDDIR)/amd64-linux-gnu/default_cpu1 && ctest -O ctest.log + cd $(FSWBUILDDIR)/amd64-posix/default_cpu1 && ctest -O ctest.log igniter: ./scripts/igniter_launch.sh diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake index b670344d..e1871f9f 100644 --- a/cfg/nos3_defs/targets.cmake +++ b/cfg/nos3_defs/targets.cmake @@ -145,7 +145,11 @@ SET(MISSION_CPUNAMES cpu1) SET(cpu1_PROCESSORID 1) SET(cpu1_APPLIST) # Note: Using all ${MISSION_GLOBAL_APPLIST} automatically SET(cpu1_FILELIST cfe_es_startup.scr) -SET(cpu1_SYSTEM amd64-linux-gnu) +if (ENABLE_UNIT_TESTS) + SET(cpu1_SYSTEM amd64-posix) +else() + SET(cpu1_SYSTEM amd64-nos3) +endif() # USER Supplied #SET(cpu2_PROCESSORID 2) diff --git a/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake b/cfg/nos3_defs/toolchain-amd64-nos3.cmake similarity index 100% rename from cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake rename to cfg/nos3_defs/toolchain-amd64-nos3.cmake diff --git a/cfg/nos3_defs/toolchain-amd64-posix.cmake b/cfg/nos3_defs/toolchain-amd64-posix.cmake new file mode 100644 index 00000000..d5356637 --- /dev/null +++ b/cfg/nos3_defs/toolchain-amd64-posix.cmake @@ -0,0 +1,34 @@ +# This example toolchain file describes the cross compiler to use for +# the target architecture indicated in the configuration file. + +# Basic cross system configuration +SET(CMAKE_SYSTEM_NAME Linux) +SET(CMAKE_SYSTEM_VERSION 1) +SET(CMAKE_SYSTEM_PROCESSOR amd64) + +# Specify the cross compiler executables +# Typically these would be installed in a home directory or somewhere +# in /opt. However in this example the system compiler is used. +SET(CMAKE_C_COMPILER "/usr/bin/gcc") +SET(CMAKE_CXX_COMPILER "/usr/bin/g++") + +# Configure the find commands +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) + +# These variable settings are specific to cFE/OSAL and determines which +# abstraction layers are built when using this toolchain +SET(CFE_SYSTEM_PSPNAME "pc-linux") +SET(OSAL_SYSTEM_OSTYPE "posix") + +#SET(CMAKE_C_FLAGS_INIT "" CACHE STRING "C Flags required by platform") +#SET(CMAKE_SHARED_LINKER_FLAGS "-pg") + +# Build Specific +add_definitions(-DBYTE_ORDER_LE) +add_definitions(-D_LINUX_OS_) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +set(CI_TRANSPORT udp_tf) +set(TO_TRANSPORT udp) # Note udp_tf used for Transfer Frames required for CryptoLib diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index cf82b544..f3143f23 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit cf82b54413a007e79f534234733f113359660eb3 +Subproject commit f3143f23926c64a8683a89991b263f0c9b1c8aeb diff --git a/fsw/osal b/fsw/osal index 452824c4..570ad091 160000 --- a/fsw/osal +++ b/fsw/osal @@ -1 +1 @@ -Subproject commit 452824c4fa54cf956c5ac745ea6db6773c72cc60 +Subproject commit 570ad0913daf57ad2a62c92f6a0daef5a94f72ba From da1335107e13a1d85468a2a42d196cf1d80680d1 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 2 Jul 2024 06:53:02 -0400 Subject: [PATCH 16/33] [nasa/nos3#285] Update nos_time_driver after merge; --- sims/nos_time_driver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/nos_time_driver b/sims/nos_time_driver index baaa1636..5c2787a3 160000 --- a/sims/nos_time_driver +++ b/sims/nos_time_driver @@ -1 +1 @@ -Subproject commit baaa16362b4ad28aa28dacd44aaf530a967ed0a6 +Subproject commit 5c2787a35c904c1d4f49b01f23acabc3ac37a079 From 1a9f6f3761b263fe761ec7336b41d85e597480c4 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 3 Jul 2024 13:41:55 -0400 Subject: [PATCH 17/33] https://github.com/nasa/nos3/issues/227 - Submodule updates. --- components/generic_thruster | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/generic_thruster b/components/generic_thruster index c6c7e826..86b9738f 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit c6c7e8265f0175c90a2c7c3a97c7729d2babc8ce +Subproject commit 86b9738fc66acaed4592f632ba2474b5f6947412 diff --git a/gsw/cosmos b/gsw/cosmos index 31c72319..a8d96bc4 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 31c72319b0db734cb1ee641e068bfd0858e58a65 +Subproject commit a8d96bc426554cd09ee332e78ea4d5e3982f4623 From bd82995ebc6d712124c559a31ee9f06050355c56 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Fri, 12 Jul 2024 11:06:34 -0400 Subject: [PATCH 18/33] https://github.com/nasa/nos3/issues/227 - Add thruster MIDs to TO output tables. Submodule update. --- cfg/nos3_defs/tables/to_config.c | 3 ++- cfg/nos3_defs/tables/to_lab_sub.c | 2 ++ components/generic_thruster | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cfg/nos3_defs/tables/to_config.c b/cfg/nos3_defs/tables/to_config.c index af9cd704..e2f1b863 100644 --- a/cfg/nos3_defs/tables/to_config.c +++ b/cfg/nos3_defs/tables/to_config.c @@ -69,6 +69,7 @@ extern "C" { #include "generic_mag_msgids.h" #include "generic_radio_msgids.h" #include "generic_reaction_wheel_msgids.h" +#include "generic_thruster_msgids.h" #include "generic_torquer_msgids.h" #include "novatel_oem615_msgids.h" #include "sample_msgids.h" @@ -150,7 +151,7 @@ TO_ConfigTable_t to_ConfigTable = {CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_HK_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_HK_TLM_MID),{0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_DEVICE_TLM_MID),{0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, + {CFE_SB_MSGID_WRAP_VALUE(GENERIC_THRUSTER_HK_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, // Commented out to limited ADCS messages sent via radio diff --git a/cfg/nos3_defs/tables/to_lab_sub.c b/cfg/nos3_defs/tables/to_lab_sub.c index 9c082dc7..11327d2f 100644 --- a/cfg/nos3_defs/tables/to_lab_sub.c +++ b/cfg/nos3_defs/tables/to_lab_sub.c @@ -58,6 +58,7 @@ #include "generic_radio_msgids.h" #include "generic_reaction_wheel_msgids.h" #include "generic_torquer_msgids.h" +#include "generic_thruster_msgids.h" #include "novatel_oem615_msgids.h" #include "sample_msgids.h" #include "generic_adcs_msgids.h" @@ -127,6 +128,7 @@ TO_LAB_Subs_t TO_LAB_Subs = {CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_DO_MID), {0,0}, 32}, {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_HK_TLM_MID),{0,0}, 32}, {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_DEVICE_TLM_MID),{0,0}, 32}, + {CFE_SB_MSGID_WRAP_VALUE(GENERIC_THRUSTER_HK_TLM_MID), {0,0}, 32}, {CFE_SB_MSGID_WRAP_VALUE(SYN_HK_TLM_MID), {0,0}, 32}, diff --git a/components/generic_thruster b/components/generic_thruster index 86b9738f..ba9f0c8d 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 86b9738fc66acaed4592f632ba2474b5f6947412 +Subproject commit ba9f0c8d88eeb48cf81072d53b3201ccca5a7ef5 From 01177b5e273b469a0244fd2c9df9ee70b3e966ea Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Fri, 12 Jul 2024 12:16:53 -0400 Subject: [PATCH 19/33] https://github.com/nasa/nos3/issues/227 - Submodule update. --- components/generic_thruster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_thruster b/components/generic_thruster index ba9f0c8d..bc14e74e 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit ba9f0c8d88eeb48cf81072d53b3201ccca5a7ef5 +Subproject commit bc14e74e126ddb9a56548f76e546f9746f5750a0 From 88ecc2e48b4c9fe6dbf09afbbaca3de0186bf907 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Fri, 12 Jul 2024 16:16:29 -0400 Subject: [PATCH 20/33] https://github.com/nasa/nos3/issues/227 - Add missing connection block for thruster sim to sim config. Submodule update. --- cfg/sims/nos3-simulator.xml | 4 ++++ components/generic_thruster | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index be389cbf..f6587b44 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -434,6 +434,10 @@ command thruster-command + usart + usart_29 + 29 + GENERIC_THRUSTER_42_PROVIDER diff --git a/components/generic_thruster b/components/generic_thruster index bc14e74e..6af599bd 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit bc14e74e126ddb9a56548f76e546f9746f5750a0 +Subproject commit 6af599bd339aabc065ea209ee9a377296e151e3c From ce7ce685f7c5b34baa4b04d6a5afc8916e2b16fd Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 17 Jul 2024 14:06:09 -0400 Subject: [PATCH 21/33] https://github.com/nasa/nos3/issues/227 - Add thrusters to 42 spacecraft file. Submodule update. --- cfg/InOut/SC_NOS3.txt | 18 +++++++++++++++--- components/generic_thruster | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cfg/InOut/SC_NOS3.txt b/cfg/InOut/SC_NOS3.txt index 442e8e95..10bf7654 100644 --- a/cfg/InOut/SC_NOS3.txt +++ b/cfg/InOut/SC_NOS3.txt @@ -99,11 +99,23 @@ NONE ! Drag/Jitter Input File Name 0.0 0.0 1.0 ! MTB Axis Components, [X, Y, Z] 0 ! Flex Node Index ************************* Thruster Parameters ************************** -0 ! Number of Thrusters +3 ! Number of Thrusters ============================== Thr 0 ================================= -PULSED ! Mode (PULSED or PROPORTIONAL) +PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 1.0 ! Thrust Force (N) --1.0 0.0 0.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis +0 ! Body +0 ! Node +============================== Thr 0 ================================= +PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) + 1.0 ! Thrust Force (N) +0.0 1.0 0.0 ! Thrust Axis +0 ! Body +0 ! Node +============================== Thr 0 ================================= +PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) + 1.0 ! Thrust Force (N) +0.0 0.0 1.0 ! Thrust Axis 0 ! Body 0 ! Node ******************************* Gyro ************************************ diff --git a/components/generic_thruster b/components/generic_thruster index 6af599bd..6d5a1a4c 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 6af599bd339aabc065ea209ee9a377296e151e3c +Subproject commit 6d5a1a4c3a5d19d5a1051143d823781c53336d18 From 449fef1543ca987ce2d0fe98fde7b25707271b25 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 17 Jul 2024 15:27:29 -0400 Subject: [PATCH 22/33] https://github.com/nasa/nos3/issues/227 - Submodule pointer update. --- components/generic_thruster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_thruster b/components/generic_thruster index 6d5a1a4c..0942dd15 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 6d5a1a4c3a5d19d5a1051143d823781c53336d18 +Subproject commit 0942dd159bb38f24787d49f38d04b3a4791aade1 From 350995cc26b8517503acd2c80eda0868d03715c0 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 17 Jul 2024 20:44:37 -0400 Subject: [PATCH 23/33] [nasa/nos3#176] OSAL updates from cppcheck; --- fsw/osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/osal b/fsw/osal index 570ad091..31210d1f 160000 --- a/fsw/osal +++ b/fsw/osal @@ -1 +1 @@ -Subproject commit 570ad0913daf57ad2a62c92f6a0daef5a94f72ba +Subproject commit 31210d1f9b193ae201d6174b15e23c14c77b5e8a From 2ebd3e4637e13bad78b1c0563fbfbd742e262406 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Fri, 19 Jul 2024 14:28:05 -0400 Subject: [PATCH 24/33] https://github.com/nasa/nos3/issues/227 - Configure S/C with 6 thrusters and modified the full thrust value. --- cfg/InOut/SC_NOS3.txt | 32 +++++++++++++++++++++++++------- components/generic_thruster | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/cfg/InOut/SC_NOS3.txt b/cfg/InOut/SC_NOS3.txt index 10bf7654..86f728ce 100644 --- a/cfg/InOut/SC_NOS3.txt +++ b/cfg/InOut/SC_NOS3.txt @@ -11,7 +11,7 @@ CM ! Pos of CM or ORIGIN, wrt F 0.0 0.0 0.0 ! Vel wrt Formation (m/s), expressed in F *************************** Initial Attitude *************************** NAN ! Ang Vel wrt [NL], Att [QA] wrt [NLF] -0.3 0.4 0.5 ! Ang Vel (deg/sec) +0.0 0.0 0.0 ! Ang Vel (deg/sec) 0.0 0.0 0.0 1.0 ! Quaternion 60.0 40.0 20.0 213 ! Angles (deg) & Euler Sequence *************************** Dynamics Flags *************************** @@ -99,25 +99,43 @@ NONE ! Drag/Jitter Input File Name 0.0 0.0 1.0 ! MTB Axis Components, [X, Y, Z] 0 ! Flex Node Index ************************* Thruster Parameters ************************** -3 ! Number of Thrusters +6 ! Number of Thrusters ============================== Thr 0 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) - 1.0 ! Thrust Force (N) +0.01 ! Thrust Force (N) 1.0 0.0 0.0 ! Thrust Axis 0 ! Body 0 ! Node -============================== Thr 0 ================================= +============================== Thr 1 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) - 1.0 ! Thrust Force (N) +0.01 ! Thrust Force (N) 0.0 1.0 0.0 ! Thrust Axis 0 ! Body 0 ! Node -============================== Thr 0 ================================= +============================== Thr 2 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) - 1.0 ! Thrust Force (N) +0.01 ! Thrust Force (N) 0.0 0.0 1.0 ! Thrust Axis 0 ! Body 0 ! Node +============================== Thr 3 ================================= +PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) +0.01 ! Thrust Force (N) +-1.0 0.0 0.0 ! Thrust Axis +0 ! Body +0 ! Node +============================== Thr 4 ================================= +PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) +0.01 ! Thrust Force (N) +0.0 -1.0 0.0 ! Thrust Axis +0 ! Body +0 ! Node +============================== Thr 5 ================================= +PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) +0.01 ! Thrust Force (N) +0.0 0.0 -1.0 ! Thrust Axis +0 ! Body +0 ! Node ******************************* Gyro ************************************ 3 ! Number of Gyro Axes ============================== Axis 0 =================================== diff --git a/components/generic_thruster b/components/generic_thruster index 0942dd15..7dcd3843 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 0942dd159bb38f24787d49f38d04b3a4791aade1 +Subproject commit 7dcd384392b0ea02fcca1120660e91c2d2d58a1e From 13d079a21c5bfcf89853ffaafe74d7d7f6794c0f Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 22 Jul 2024 12:51:10 -0400 Subject: [PATCH 25/33] https://github.com/nasa/nos3/issues/227 - Tweak the thrusters. --- cfg/InOut/Nodes_Simple.txt | 8 ++++++++ cfg/InOut/SC_NOS3.txt | 28 ++++++++-------------------- components/generic_thruster | 2 +- 3 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 cfg/InOut/Nodes_Simple.txt diff --git a/cfg/InOut/Nodes_Simple.txt b/cfg/InOut/Nodes_Simple.txt new file mode 100644 index 00000000..038e50d4 --- /dev/null +++ b/cfg/InOut/Nodes_Simple.txt @@ -0,0 +1,8 @@ +<<<<<<<<<<<<<<<< Body Node Inputs for 42 >>>>>>>>>>>>>>>>>>>>> +Simple Nodes ! Description +4 ! Number of Nodes +******************* Node Location, Comment ********************* + 0.1 -0.4 0.25 "Thrusters" + 0.1 -0.1 0.25 "Thrusters" + 0.1 -0.4 0.15 "Thrusters" + 0.1 -0.1 0.15 "Thrusters" diff --git a/cfg/InOut/SC_NOS3.txt b/cfg/InOut/SC_NOS3.txt index 86f728ce..9338b4b7 100644 --- a/cfg/InOut/SC_NOS3.txt +++ b/cfg/InOut/SC_NOS3.txt @@ -34,7 +34,7 @@ NONE ! Shaker File Name 0.0 0.0 0.0 ! Constant Embedded Momentum (Nms) 0.0 0.0 0.0 ! Constant Embedded Magnetic Dipole (A-m^2) stf1_red.obj ! Geometry Input File Name -NONE ! Node File Name +Nodes_Simple.txt ! Node File Name NONE ! Flex File Name ************************************************************************ *************************** Joint Parameters *************************** @@ -99,7 +99,7 @@ NONE ! Drag/Jitter Input File Name 0.0 0.0 1.0 ! MTB Axis Components, [X, Y, Z] 0 ! Flex Node Index ************************* Thruster Parameters ************************** -6 ! Number of Thrusters +4 ! Number of Thrusters ============================== Thr 0 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) @@ -109,33 +109,21 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) ============================== Thr 1 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) -0.0 1.0 0.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis 0 ! Body -0 ! Node +1 ! Node ============================== Thr 2 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) -0.0 0.0 1.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis 0 ! Body -0 ! Node +2 ! Node ============================== Thr 3 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) --1.0 0.0 0.0 ! Thrust Axis -0 ! Body -0 ! Node -============================== Thr 4 ================================= -PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) -0.01 ! Thrust Force (N) -0.0 -1.0 0.0 ! Thrust Axis -0 ! Body -0 ! Node -============================== Thr 5 ================================= -PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) -0.01 ! Thrust Force (N) -0.0 0.0 -1.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis 0 ! Body -0 ! Node +3 ! Node ******************************* Gyro ************************************ 3 ! Number of Gyro Axes ============================== Axis 0 =================================== diff --git a/components/generic_thruster b/components/generic_thruster index 7dcd3843..0c552ae9 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 7dcd384392b0ea02fcca1120660e91c2d2d58a1e +Subproject commit 0c552ae92fb1bea21a800016dbe59b510e0dce95 From 0b80b66c0d63f4049eb4ef5c7de0859470f53253 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 23 Jul 2024 10:32:41 -0400 Subject: [PATCH 26/33] [nasa/nos3#176] Updated CI to test-fsw, ds to resolve failing tests, and sc to comment out invalid tests as functionality disabled in NOS3; --- .github/workflows/build.yml | 2 +- fsw/apps/ds | 2 +- fsw/apps/sc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25b42f98..d0c69d1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - name: build directory run: mkdir ./fsw/build - name: build - run: make build-fsw + run: make test-fsw sim: runs-on: ubuntu-latest diff --git a/fsw/apps/ds b/fsw/apps/ds index 3f273f6a..1427a22c 160000 --- a/fsw/apps/ds +++ b/fsw/apps/ds @@ -1 +1 @@ -Subproject commit 3f273f6a552c1fb408b989ac0d78743452d3dbc3 +Subproject commit 1427a22cf1e419cf212193e65f6269a97d43040b diff --git a/fsw/apps/sc b/fsw/apps/sc index 37e919b7..6276cfb2 160000 --- a/fsw/apps/sc +++ b/fsw/apps/sc @@ -1 +1 @@ -Subproject commit 37e919b76b1a34fc93917d636dfc5f238de72945 +Subproject commit 6276cfb24456e68cc3da4f59517f8e52a49104de From fae88c8bcbcd94317b93efbda7bbb559dc4cb6e9 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Tue, 23 Jul 2024 10:41:02 -0400 Subject: [PATCH 27/33] https://github.com/nasa/nos3/issues/227 - Submodule update. --- components/generic_thruster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_thruster b/components/generic_thruster index 0c552ae9..361bfea0 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 0c552ae92fb1bea21a800016dbe59b510e0dce95 +Subproject commit 361bfea0c1b47de0544dae0c1221c3ac6180ba2e From e3c30fdff2ec631fcdfd75c78ed860b8d9c5e412 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 23 Jul 2024 10:44:11 -0400 Subject: [PATCH 28/33] [nasa/nos3#176] Revert to build-fsw instead of test-fsw in CI for now due to issues; --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0c69d1d..25b42f98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - name: build directory run: mkdir ./fsw/build - name: build - run: make test-fsw + run: make build-fsw sim: runs-on: ubuntu-latest From f8e273fb8ca206962991866f8d29606981c9b8c0 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Thu, 25 Jul 2024 13:45:54 -0400 Subject: [PATCH 29/33] https://github.com/nasa/nos3/issues/227 - Submodule update. --- components/generic_thruster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_thruster b/components/generic_thruster index 361bfea0..0091f573 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 361bfea0c1b47de0544dae0c1221c3ac6180ba2e +Subproject commit 0091f573d5a1762bf5b0884b2d2d9e7a39a0b092 From e253e9c03cb4e05b7dbe4ee0ff93346a5c2b2171 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 31 Jul 2024 14:35:59 -0400 Subject: [PATCH 30/33] [nasa/nos3#176] Added hwlib stubs to CMakeLists for unit-tests, resolved errors in current tests, added build-test command to iterate faster on specific tests; --- Makefile | 10 ++++++---- components/sample | 2 +- fsw/apps/hwlib | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5f85a585..b7c8c3bf 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ endif # The "LOCALTGTS" defines the top-level targets that are implemented in this makefile # Any other target may also be given, in that case it will simply be passed through. -LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw test-fsw +LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS)) # As this makefile does not build any real files, treat everything as a PHONY target @@ -61,6 +61,11 @@ build-sim: cd $(SIMBUILDDIR) && cmake -DCMAKE_INSTALL_PREFIX=$(SIMBUILDDIR) .. $(MAKE) --no-print-directory -C $(SIMBUILDDIR) install +build-test: + mkdir -p $(FSWBUILDDIR) + cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe + $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install + checkout: ./scripts/docker_checkout.sh @@ -119,9 +124,6 @@ stop-gsw: ./scripts/stop_gsw.sh test-fsw: - mkdir -p $(FSWBUILDDIR) - cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe - $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install cd $(FSWBUILDDIR)/amd64-posix/default_cpu1 && ctest -O ctest.log igniter: diff --git a/components/sample b/components/sample index bf8dd3df..75e69a93 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit bf8dd3df09d4542b8784ca6e7b91dfef646aea10 +Subproject commit 75e69a935ebc69fe0543dcce0fa82a792c4401f9 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index f3143f23..f2e180cc 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit f3143f23926c64a8683a89991b263f0c9b1c8aeb +Subproject commit f2e180cc30a883660ec70a3fb5391f4eb86a2f29 From 6c8d59a64a864d3ff9464a2c06639d3075eeac12 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Fri, 2 Aug 2024 07:07:05 -0400 Subject: [PATCH 31/33] [nasa/nos3#176] Resolved issue with Test_SAMPLE_ProcessCommandPacket; --- components/sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/sample b/components/sample index 75e69a93..51c88a38 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 75e69a935ebc69fe0543dcce0fa82a792c4401f9 +Subproject commit 51c88a38f8c20a97392c5de0579e30744e79dec7 From 354cbcda540ca2bf6e73a327fb1c85ced8a86c2f Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 6 Aug 2024 17:17:06 -0400 Subject: [PATCH 32/33] [nasa/nos3#176] Updates after submodule merges; --- components/sample | 2 +- fsw/apps/ds | 2 +- fsw/apps/hwlib | 2 +- fsw/apps/sc | 2 +- fsw/osal | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/sample b/components/sample index 51c88a38..7845664c 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 51c88a38f8c20a97392c5de0579e30744e79dec7 +Subproject commit 7845664c3ed42e4aa83d04fae1b507099ae21b55 diff --git a/fsw/apps/ds b/fsw/apps/ds index 1427a22c..d17e750b 160000 --- a/fsw/apps/ds +++ b/fsw/apps/ds @@ -1 +1 @@ -Subproject commit 1427a22cf1e419cf212193e65f6269a97d43040b +Subproject commit d17e750bec8ec9a2cfbcd32f5633dafaf919bc40 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index f2e180cc..9c4dc2a1 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit f2e180cc30a883660ec70a3fb5391f4eb86a2f29 +Subproject commit 9c4dc2a169f220c515629e5e8cc1a60929605035 diff --git a/fsw/apps/sc b/fsw/apps/sc index 6276cfb2..bb3e6945 160000 --- a/fsw/apps/sc +++ b/fsw/apps/sc @@ -1 +1 @@ -Subproject commit 6276cfb24456e68cc3da4f59517f8e52a49104de +Subproject commit bb3e6945830b7e6cd7a3d25fa00969ac2c4f7be6 diff --git a/fsw/osal b/fsw/osal index 31210d1f..9c9b9f6d 160000 --- a/fsw/osal +++ b/fsw/osal @@ -1 +1 @@ -Subproject commit 31210d1f9b193ae201d6174b15e23c14c77b5e8a +Subproject commit 9c9b9f6dd75b7b3adaf9021040db3d112ef709e5 From 5048aada3c44b71df32ca576f5a768e1e8467d31 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 6 Aug 2024 19:50:44 -0400 Subject: [PATCH 33/33] [nasa/nos3#227] Added thruster HK request to SCH table at 1Hz; --- cfg/nos3_defs/tables/sch_def_msgtbl.c | 10 ++++---- cfg/nos3_defs/tables/sch_def_schtbl.c | 34 +++++++++++++-------------- components/generic_thruster | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/cfg/nos3_defs/tables/sch_def_msgtbl.c b/cfg/nos3_defs/tables/sch_def_msgtbl.c index b542284d..90266f3f 100644 --- a/cfg/nos3_defs/tables/sch_def_msgtbl.c +++ b/cfg/nos3_defs/tables/sch_def_msgtbl.c @@ -47,6 +47,7 @@ ** Component Include Files */ #include "cam_msgids.h" +#include "generic_adcs_msgids.h" #include "generic_css_msgids.h" #include "generic_eps_msgids.h" #include "generic_fss_msgids.h" @@ -54,12 +55,11 @@ #include "generic_mag_msgids.h" #include "generic_radio_msgids.h" #include "generic_reaction_wheel_msgids.h" +#include "generic_star_tracker_msgids.h" +#include "generic_thruster_msgids.h" #include "generic_torquer_msgids.h" #include "novatel_oem615_msgids.h" #include "sample_msgids.h" -#include "generic_adcs_msgids.h" -#include "generic_star_tracker_msgids.h" - #include "syn_msgids.h" /* @@ -326,8 +326,8 @@ SCH_MessageEntry_t SCH_DefaultMessageTable[SCH_MAX_MESSAGES] = { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } }, /* command ID #104 */ { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } }, - /* command ID #105 */ - { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } }, + /* command ID #105 - Thruster HK */ + { { CFE_MAKE_BIG16(GENERIC_THRUSTER_REQ_HK_MID), CFE_MAKE_BIG16(0xC000), CFE_MAKE_BIG16(0x0001), CFE_MAKE_BIG16(0x0000) } }, /* command ID #106 */ { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } }, /* command ID #107 */ diff --git a/cfg/nos3_defs/tables/sch_def_schtbl.c b/cfg/nos3_defs/tables/sch_def_schtbl.c index c54407d4..b9f161d1 100644 --- a/cfg/nos3_defs/tables/sch_def_schtbl.c +++ b/cfg/nos3_defs/tables/sch_def_schtbl.c @@ -114,9 +114,9 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #3 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 2, SCH_GROUP_CFE_HK }, /* EVS HK Request */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, - { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, - { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, /* slot #4 */ /*{ SCH_DISABLED, SCH_ACTIVITY_SEND_MSG, 4, 1, 6, SCH_GROUP_CFS_HK }, */ /* CS HK Request */ @@ -187,7 +187,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #13 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 3, SCH_GROUP_CFE_HK }, /* SB HK Request */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -201,7 +201,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #15 - Component HK */ /*{ SCH_DISABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 24, SCH_GROUP_MD_WAKEUP }, */ /* MD Wakeup */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 45, SCH_GROUP_NONE }, /* RW HK Request */ - { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, + { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST HK Request */ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -261,7 +261,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #23 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 4, SCH_GROUP_CFE_HK }, /* TIME HK Request */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -287,7 +287,6 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, - { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, /* slot #27 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 90, SCH_GROUP_NONE }, /* ADCS ADAC Request */ @@ -335,7 +334,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #33 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 5, SCH_GROUP_CFE_HK }, /* TBL HK Request */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -361,7 +360,6 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, - { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, /* slot #37 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 90, SCH_GROUP_NONE }, /* ADCS ADAC Request */ @@ -410,7 +408,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #43 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 1, SCH_GROUP_CFE_HK }, /* ES HK Request */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -424,7 +422,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #45 - Component HK */ /*{ SCH_DISABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 24, SCH_GROUP_MD_WAKEUP }, */ /* MD Wakeup */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 5, 1, 60, SCH_GROUP_CFS_HK }, /* FSS HK Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 61, SCH_GROUP_CFS_HK }, /* FSS Data Request */ + { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,105, SCH_GROUP_NONE }, /* Thruster HK Request */ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -483,7 +481,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #53 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -555,7 +553,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #63 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -627,7 +625,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #73 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -699,7 +697,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #83 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -775,7 +773,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = /* slot #93 */ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ - { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, @@ -820,8 +818,8 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, - //{ SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, - //{ SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE} + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, + { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE} }; /* diff --git a/components/generic_thruster b/components/generic_thruster index 0091f573..feb2d655 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 0091f573d5a1762bf5b0884b2d2d9e7a39a0b092 +Subproject commit feb2d6555fb09e0f1b33a3993819799ad42ce0d5