-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #355 from nasa/dev
Release 1.7.1
- Loading branch information
Showing
37 changed files
with
374 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: Build | ||
|
|
||
| on: | ||
| push: | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| fsw: | ||
| runs-on: ubuntu-latest | ||
| container: | ||
| image: ivvitc/nos3-64:20240618 | ||
| 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:20240618 | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,6 @@ build | |
| support/nos3_install.log | ||
| tmp | ||
| core.* | ||
| .cdskeyfile | ||
| .reservedkeyfile | ||
| .resetkeyfile | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.