Skip to content

Commit

Permalink
Merge pull request #4 from nasa-itc/nos3#202
Browse files Browse the repository at this point in the history
[nasa/nos3#202] TC commanding and SSP telemetry in NOS3
  • Loading branch information
jlucas9 authored Apr 30, 2024
2 parents 42bf241 + 8bb2d90 commit db65b43
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 78 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ include_directories(${MISSION_SOURCE_DIR}/apps/hs/fsw/platform_inc)
include_directories(${MISSION_SOURCE_DIR}/apps/hk/fsw/platform_inc)
include_directories(${APPLICATION_PLATFORM_INC_LIST})

include_directories(${MISSION_SOURCE_DIR}/../components/cryptolib/include)

include_directories(fsw/examples/${TO_TRANSPORT})
aux_source_directory(fsw/src APP_SRC_FILES)
aux_source_directory(fsw/examples/${TO_TRANSPORT} APP_SRC_FILES)
Expand Down
6 changes: 6 additions & 0 deletions fsw/examples/udp/MISSION_to_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ extern "C" {
*/
#include "cfe.h"
#include "../to/fsw/src/to_hktlm.h"
#include "cop1.h"

/*
** Defines
Expand All @@ -57,6 +58,11 @@ typedef struct
CFE_MSG_CommandHeader_t ucCmdHeader;
} TO_DisableOutputCmd_t;

typedef struct
{
CFE_MSG_CommandHeader_t ucCmdHeader;
COP1_Clcw_t clcw; /**< COP-1 CLCW Data */
} TO_CustomSetOcfCmd_t;


/*************** Telemetry **************/
Expand Down
9 changes: 9 additions & 0 deletions fsw/examples/udp/to_custom.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,15 @@ void TO_CustomCleanup(void)
return;
}

/******************************************************************************/
/** \brief Set the OCF trailer with the CLCW - Internal Cmd.
*******************************************************************************/
void TO_CustomSetOcfCmd(CFE_MSG_Message_t *pCmdMsg)
{
// Do nothing, added to support TC uplink and SPP downlink
return;
}

/******************************************************************************/
/** \brief Enable Output Command Response
*******************************************************************************/
Expand Down
1 change: 1 addition & 0 deletions fsw/examples/udp/to_platform_cfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ extern "C" {
*/
#define TO_NUM_CRITICAL_MIDS 3
#define TO_DEFAULT_DEST_PORT 5011
#define TO_WAKEUP_TIMEOUT 50

#define TO_SCH_PIPE_DEPTH 32
#define TO_CMD_PIPE_DEPTH 32
Expand Down
2 changes: 2 additions & 0 deletions fsw/examples/udp_tf/MISSION_to_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ extern "C" {

#include "cop1.h"

#include "crypto.h"

/*
** Defines
*/
Expand Down
Loading

0 comments on commit db65b43

Please sign in to comment.