#include "XPROGProtocol.h"
                #include "XPROGTarget.h"
-
+               #include "Config/AppConfig.h"
+               
        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
                        #undef ENABLE_ISP_PROTOCOL
                #endif
 
        /* Defines: */
-               #define XMEGA_CRC_LENGTH                     3
+               #define XMEGA_CRC_LENGTH_BYTES               3
 
                #define XMEGA_NVM_REG_ADDR0                  0x00
                #define XMEGA_NVM_REG_ADDR1                  0x01
                #define XMEGA_NVM_REG_INTCTRL                0x0D
                #define XMEGA_NVM_REG_STATUS                 0x0F
                #define XMEGA_NVM_REG_LOCKBITS               0x10
+               
+               #define XMEGA_NVM_BIT_CTRLA_CMDEX            (1 << 0)
 
                #define XMEGA_NVM_CMD_NOOP                   0x00
                #define XMEGA_NVM_CMD_CHIPERASE              0x40