Skip to content

Nos3#832 sbn cmd tlm #834

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

Merged
zlynch2 merged 10 commits into from
Mar 6, 2026
Merged

Nos3#832 sbn cmd tlm #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4428de5
Merge Release 1.7.4 nasa/dev
zlynch2 Jan 19, 2026
d2b2e2e
[nasa/nos3#832] setting up branch for SBN commanding and telemetry, s…
zlynch2 Feb 18, 2026
98714ab
[nasa/nos3#832] hk command send working, tlm stubbed out
zlynch2 Feb 18, 2026
9ac809b
[nasa/nos3#832] cmd/tlm definitons SBN working tables plus submodules
zlynch2 Feb 24, 2026
6b7039a
[nasa/nos3#832] differentiating msgids for tlm and cmd/tlm defs with …
zlynch2 Feb 24, 2026
5a8889a
[nasa/nos3#832] SBN pack endianness and extra byte fix submodule
zlynch2 Mar 4, 2026
5b69f40
[nasa/nos3#832] SBN Subs tlm block hex data, no error in cmd_tlm serv…
zlynch2 Mar 5, 2026
cb7730e
changing config back to mission
zlynch2 Mar 6, 2026
ee5513a
updating cosmos/sbn submodules before merge
zlynch2 Mar 6, 2026
6f2e4a2
Merge branch 'nos3#832_SBN_cmd_tlm' of https://github.com/nasa/nos3 i…
zlynch2 Mar 6, 2026
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
11 changes: 6 additions & 5 deletions cfg/nos3_defs/tables/to_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ extern "C" {
#include "sc_msgids.h"
#include "sch_msgids.h"
#include "to_msgids.h"
#include "sbn_msgids.h"

/*
** Component Include Files
Expand Down Expand Up @@ -163,11 +164,11 @@ TO_ConfigTable_t to_ConfigTable =
//{CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_DO_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},

/* 50 - 59 */
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HK_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKNET_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKPEER_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKPEERSUBS_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKMYSUBS_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(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
Expand Down
6 changes: 6 additions & 0 deletions cfg/nos3_defs/tables/to_lab_sub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "sc_msgids.h"
#include "sch_msgids.h"
#include "to_msgids.h"
#include "sbn_msgids.h"

/*
** Component Include Files
Expand Down Expand Up @@ -89,6 +90,11 @@ TO_LAB_Subs_t TO_LAB_Subs =
{CFE_SB_MSGID_WRAP_VALUE(SC_HK_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(DS_HK_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(LC_HK_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HK_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKNET_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKPEER_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKPEERSUBS_TLM_MID), {0,0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(SBN_HKMYSUBS_TLM_MID), {0,0}, 4},

/* cFE Core subscriptions */
{CFE_SB_MSGID_WRAP_VALUE(CFE_ES_HK_TLM_MID), {0, 0}, 4},
Expand Down
2 changes: 1 addition & 1 deletion fsw/apps/sbn
Open in desktop
Submodule sbn updated 2 files
+6 −1 fsw/platform_inc/sbn_msgids.h
+7 −6 fsw/src/sbn_cmds.c
2 changes: 1 addition & 1 deletion gsw/cosmos
Open in desktop
Submodule cosmos updated 2 files
+68 −0 config/targets/CFS/cmd_tlm/SBN_TLM.txt
+76 −0 config/targets/CFS/cmd_tlm/SBN_cmd.txt