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

314 update crypto config #329

Merged
merged 3 commits into from
Sep 23, 2024
Merged

314 update crypto config #329

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef050ad
[nasa/cryptolib#314] Update TC_FRAME_DATA_SIZE to be within bounds, a…
rjbrown6 Sep 20, 2024
efda557
[nasa/cryptolib#314] Remove Magic Numbers, Update Defines
rjbrown6 Sep 20, 2024
5ac6884
[nasa/cryptolib#314] Update Define to more descriptive name
rjbrown6 Sep 20, 2024
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
5 changes: 3 additions & 2 deletions include/crypto_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@
#define TC_SH_SIZE 8 /* bits */
#define TC_SN_SIZE 2
#define TC_SN_WINDOW 10 /* +/- value */
#define TC_FRAME_DATA_SIZE 1740 /* bytes */
#define TC_FRAME_DATA_SIZE 1019 /* bytes */ // 1024 - 5byte header
#define TC_CADU_ASM_SIZE 4

// CCSDS PUS Defines
#define TLV_DATA_SIZE 494 /* bytes */
Expand All @@ -181,7 +182,7 @@
#define TM_CADU_HAS_ASM 1 // Skip 0x1acffc1d at beginning of each frame
// TM CADU based on ASM, currently only holds non-turbo ASM
#ifdef TM_CADU_HAS_ASM
#define TM_CADU_SIZE (TM_FRAME_DATA_SIZE + 6)
#define TM_CADU_SIZE (TM_FRAME_DATA_SIZE + TC_CADU_ASM_SIZE)
#else
#define TM_CADU_SIZE TM_FRAME_DATA_SIZE
#endif
Expand Down