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 #157, adjust padding in msg structs #158

Merged
merged 1 commit into from
Jan 12, 2022
Merged

Fix #157, adjust padding in msg structs #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions fsw/src/cf_msg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ typedef struct CF_HkChannel_Data
uint16 q_size[CF_QueueIdx_NUM];
uint8 poll_counter;
uint8 playback_counter;
uint8 frozen; /* NOTE: this could be more than one flag if we ever need it */
uint8 spare[3];
uint8 frozen; /* NOTE: this could be more than one flag if we ever need it */
uint8 spare[7]; /* Structure has uint64 values in the counters, so size should be multiple of 8 */
} CF_HkChannel_Data_t;

typedef struct CF_HkPacket
Expand All @@ -95,6 +95,8 @@ typedef struct CF_HkPacket
/* app HK */
CF_HkCmdCounters_t counters;

uint8 spare[4]; /* CF_HkCmdCounters_t is 4 bytes, and CF_HkChannel_Data_t uses uint64 values */

/* per-channel HK */
CF_HkChannel_Data_t channel_hk[CF_NUM_CHANNELS];
} CF_HkPacket_t;
Expand Down Expand Up @@ -196,6 +198,7 @@ typedef struct CF_SetParamCmd
uint32 value;
uint8 key;
uint8 chan_num;
uint8 spare[2]; /* Required to make the size a multiple of uint32 */
} CF_SetParamCmd_t;

typedef struct CF_TxFileCmd
Expand Down