Index: firmware/App/Common.h
===================================================================
diff -u -r3a0dc476f0f42bb7ebadc7d6109a0b5b6581cce4 -r893caf9f58a08a2bd31068806e09603041d64add
--- firmware/App/Common.h	(.../Common.h)	(revision 3a0dc476f0f42bb7ebadc7d6109a0b5b6581cce4)
+++ firmware/App/Common.h	(.../Common.h)	(revision 893caf9f58a08a2bd31068806e09603041d64add)
@@ -8,7 +8,10 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
+#include "BLCommon.h"
+
 #define NUM_OF_FW_STACKS                      3
+#define CAN_MESSAGE_PAYLOAD_SIZE              8
 #define FIRMWARE_START_ADDRESS                0x00010000
 #define FIRMWARE_CRC_TABLE_ADDRESS            0x10020             ///< The starting address of CRC table for firmware image.
 #define SW_UPDATE_FLASH_BUFFER_SIZE           128
@@ -17,13 +20,14 @@
 #define SHIFT_8_BITS_FOR_BYTE_SHIFT           8           ///< Number of bits to shift in order to shift a byte
 #define MASK_OFF_NIBBLE_MSB                   0x0F        ///< Bits to mask off the most significant nibble of a byte
 
+#define NUM_OF_CMD_CAN_FRAMES 1
 
+
 #define GET_LSB_OF_WORD(w)              ((U08)((w) & MASK_OFF_MSB))                             ///< Macro returns the least signficant byte of a 2-byte word
 #define GET_MSB_OF_WORD(w)              ((U08)(((w) >> SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_MSB))  ///< Macro returns the most signficant byte of a 2-byte word
 #define MAKE_WORD_OF_BYTES(h, l)        ((((U16)(h) << SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_LSB) | ((U16)(l) & MASK_OFF_MSB))    ///< Macro merges two bytes into a 2-byte word
 #define INC_WRAP(v, l, u)               ((v) >= (u) ? (l) : ((v) + 1))                          ///< Macro increments a value and wraps to a minimum when a maximum is reached
 
-
 // **** Types ****
 
 typedef float                    F32;               ///< 32-bit floating point type
@@ -69,11 +73,11 @@
 
 typedef enum SW_Update_CAN_Mail_Boxes
 {
-    SW_UPDATE_NOT_USED = 0,  // 0
-    SW_UPDATE_COMMAD,        // 0x601
-    SW_UPDATE_TD_UPDATE,     // 0x602
-    SW_UPDATE_DD_UPDATE,     // 0x603
-    SW_UPDATE_RO_UPDATE,     // 0x604
+    SW_UPDATE_NOT_USED = 0,     // 0
+    SW_UPDATE_COMMAD,           // 0x601
+    SW_UPDATE_TD_UPDATE,        // 0x602
+    SW_UPDATE_DD_UPDATE,        // 0x603
+    SW_UPDATE_RO_UPDATE,        // 0x604
     PLACE_HOLDER_TO_REMOVE_CAN, // 0x606
     SW_UPDATE_RESP,             // 0x607
     NUM_OF_SW_UPDATE_MBOXES,
@@ -123,19 +127,11 @@
     NUM_OF_ACK_NACK
 } ACK_NACK_STATUS_T;
 
-
-typedef struct
+static const SW_UPDATE_CAN_MAIL_BOX_T RECEIVE_MSG_ID[ NUM_OF_FW_STACKS ] =
 {
-    BOOL isSWUpdateBufferReady;
-    SW_UPDATE_DESINTATION_T dest;
-} SW_UPDATE_BUFFER_STATUS_T;
+     SW_UPDATE_TD_UPDATE,
+     SW_UPDATE_DD_UPDATE,
+     SW_UPDATE_RO_UPDATE
+};
 
-typedef struct
-{
-    U08 msgID;
-    U08 updateCmd;
-    U16 cyberRandom;
-    U32 msgCRC;
-} SW_UPDATE_CMD_STATUS_T;
-
 #endif