Merge pull request nasa#159 from jphickey/fix-62-default-eid-32bit

Fix nasa#62, make entity ID default to 32 bit
chillfig · Jan 12, 2022 · c31c8d9 · c31c8d9
2 parents 0b5ce38 + b62f170
commit c31c8d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/fsw/platform_inc/cf_platform_cfg.h b/fsw/platform_inc/cf_platform_cfg.h
@@ -43,7 +43,7 @@
  ** \par Limits
  **         Must be one of uint8, uint16, uint32, uint64.
  */
-typedef uint8 CF_EntityId_t;
+typedef uint32 CF_EntityId_t;
 
 /**
  ** \cfcfg transaction sequence number size

diff --git a/fsw/src/cf_msg.h b/fsw/src/cf_msg.h
@@ -230,7 +230,8 @@ typedef struct CF_TransactionCmd
     CFE_MSG_CommandHeader_t cmd_header;
     CF_TransactionSeq_t     ts;
     CF_EntityId_t           eid;
-    uint8                   chan; /* if 254, use ts. if 255, all channels */
+    uint8                   chan;     /* if 254, use ts. if 255, all channels */
+    uint8                   spare[3]; /* To make structure a multiple of uint32 */
 } CF_TransactionCmd_t;
 
 #endif /* !CF_MSG_H */