Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #44, Update table comments/instructions #45

Merged
merged 3 commits into from
Aug 5, 2020
Merged

Fix #44, Update table comments/instructions #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e8c267
Merge pull request #41 from nasa/integration-candidate
astrogeco May 29, 2020
fdc1ed1
Update README.md
skliper Jun 29, 2020
ca95abc
Fix #44, Update table comments/instructions
skliper Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo

- Minor updates (see <https://github.com/nasa/sch_lab/pull/16>)

### _**OFFICIAL RELEASE: 2.3.0**_
### _**OFFICIAL RELEASE: 2.3.0 - Aquila**_

- Minor updates (see <https://github.com/nasa/sch_lab/pull/13>)
- Not backwards compatible with OSAL 4.2.1
Expand Down
18 changes: 9 additions & 9 deletions fsw/src/sch_lab_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
/*
** SCH Lab schedule table
** When populating this table:
** 1. Make sure the table is terminated by the SCH_LAB_END_OF_TABLE entry
** 2. You can have commented out entries, but a zero MID will terminate the table processing,
** skipping the remaining entries.
** 1. The entire table is processed (SCH_LAB_MAX_SCHEDULE_ENTRIES) but entries with a
** packet rate of 0 are skipped
** 2. You can have commented out entries or entries with a packet rate of 0
** 3. If the table grows too big, increase SCH_LAB_MAX_SCHEDULE_ENTRIES
*/

Expand All @@ -43,12 +43,12 @@ SCH_LAB_ScheduleTable_t SCH_TBL_Structure = {.Config = {
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 4},
{CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 4},
#if 0
{ SC_SEND_HK_MID, 4, 0 },
{ SC_1HZ_WAKEUP_MID, 1, 0 }, /* Example of a 1hz packet */
{ HS_SEND_HK_MID, 4, 0 },
{ FM_SEND_HK_MID, 4, 0 },
{ DS_SEND_HK_MID, 4, 0 },
{ LC_SEND_HK_MID, 4, 0 },
{CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 4},
{CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 1}, /* Example of a 1hz packet */
{CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 0}, /* Example of a message that wouldn't be sent */
{CFE_SB_MSGID_WRAP_VALUE(FM_SEND_HK_MID), 4},
{CFE_SB_MSGID_WRAP_VALUE(DS_SEND_HK_MID), 4},
{CFE_SB_MSGID_WRAP_VALUE(LC_SEND_HK_MID), 4},
#endif
}};

Expand Down