PAI-414 PAI-415 CryptoAuth_init.c/.h and cryptoauthlib_config.h.ftl moved to "mcc_generated_files" directory;PAI-397 tokens configured to enable/disable macro "USE_AWS_ENDPOINT_FROM_WINC";PAI-397 the tag to use custom endpoint url updated and hence fmpp config is modified;PAI-397 useCustomEndpointURL set to false;PAI-397 mqtt_example files are removed from generation;PAI-397 iotapplication submodule reference updated;PAI-397 cloud submoduel reference updated;PAI-397 updated mqtt submodule reference;PAI-397 cloudsubmodule reference updated;PAI-397 cloud and application submodule updated;PAI-404 readme updated with AWS multi account registration feature;PAI-404 eidts in AWS multiaccount registration - readme;PAI-389 updatig mqttSubmodule reference;PAI-404 Fixed a spelling mistake in readme.md file.;Updated the .gitignore file to stop tracking files generated by CAL since they will be generated on-the-fly using FMPP process.;PAI-435 Updated the tokens of the CAL library to generate exactly those files which are generated by MCC CAL v2.0.0 library. The MCC AVR IoT WA/WG example also generates essentially the same files.;PAI-435 Updated the commit number of the cryptoAuthLibSubmodule to pull the latest files.;PAI-443 tag for testing new artifactory folder strucuture deployment;PAI-443 mentioning path in ivy for the new strucuture;PAI-433 iotdriver submodule reference updated with a change in fmpp;PAI-433 ivysettings and build.xml updated for the new folder structuring;PAI-435 Updating the submodule commit number to bring in the latest CAL files.;PAI-443 build.xml and ivysettings.xml updated to reflect the new folder structure;PAI-443 correcting ivy pattern;PAI-436 Updating the submodule commit of WINC library in the AVR IoT project to pull the latest WINC v1.1.0 library files;PAI-444 cloud ad application submodule reference updated;PAI-434 Documented the pull-up enabled for UART2 Rx pin. This is an important piece of information, since disabling the pull-up opens up the possibility of garbage data reception in the application through UART2.;PAI-434 Modified the wording of the note.;PAI-318 deploy to M8A;PAI-318 fix deployment to M8A stage in pipleline;PAI-318 deploy to test account;PAI-318 fix deploy to M8A;PAI-318 creds updated and deploy pointed to M8A;PAI-318 tag deployment to M8A;PAI-478 tag creation and deploy to BB repo;PAI-478 github url and creds changed to test deploy;PAI-478 fix bb deploy tag stage;PAI-478 tag for testing deploy to bb;PAI-478 pipeline and ivy modified for github and M8A deployment;Fixed the incorrect indentation in main.c.;PAI-363 images for timeout scheduler in wiki;PAI-352 Updated the sub-module commit numbers of the iot-cloud and iot-application repositories to bring in the latest LED driver and NTP server specific updates;PAI-467 awsCloudServiceSubmodule added;PAI-467 awsCloudService and cloudSubmodule references updated, awsCloudService.fmpp added to generate aws cloud service file;PAI-363 replace timeout driver images;PAI-363 timeout_callnextCallback image replaced with edits;PAI-327 cloud and application submodule reference updated;PAI-498 Updated the firmware version for AWS;PAI-498 Bringing in the latest submodule commit;PAI-498 Updated the version number in ivy file.;PAI-507 deploy tool update with removal of bb tag stage removal in pipeline;PAI-507 4.0.0-develop-rc2-mcc;PAI-507 checking out feature branch for deploy tool removed;PAI-507 fix bb deploy stage - deploy tool url changed;PAI-531 updated cloud sub module - aws endpoint url length update;meta data added;formatting metadata;keywords and subcategories added in Metadata;changing toolchain version in metadata;changes in metadata file;mcc core version fix in metadata;chhanges in metadata;PAI-565 updated revision number in ivy;

Author: Microchip Technology

AVRIoT.X/main.c

@@ -25,12 +25,12 @@
 
 int main(void)
 {
-   application_init();
+	application_init();
 
-   while (1)
-   { 
-      runScheduler();  
-   }
+	while (1)
+	{ 
+		runScheduler();  
+	}
 
-   return 0;
+	return 0;
 }

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/CryptoAuth_init.c renamed to AVRIoT.X/mcc_generated_files/CryptoAuth_init.c

@@ -28,7 +28,6 @@
  * THIS SOFTWARE.
 */
 
-#include <stdbool.h>
 #include "CryptoAuth_init.h"
 
 struct atca_command  _gmyCommand;
@@ -45,7 +44,6 @@ ATCAIfaceCfg secureCfg = {
     .rx_retries             =   20
 };
 
-
 bool CryptoAuth_Initialize(void)
 {
     uint8_t calInitialzeStatus; 
@@ -60,4 +58,3 @@ bool CryptoAuth_Initialize(void)
        return true;
     }
 }
-

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/CryptoAuth_init.h renamed to AVRIoT.X/mcc_generated_files/CryptoAuth_init.h

@@ -28,7 +28,6 @@
  * THIS SOFTWARE.
 */
 
-#include <stdbool.h>
 #include "cryptoauthlib_config.h"
 #include "CryptoAuthenticationLibrary/cryptoauthlib.h"
 

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/atca_cfgs.c

@@ -38,89 +38,106 @@
 
 /** \brief default configuration for an ECCx08A device */
 ATCAIfaceCfg cfg_ateccx08a_i2c_default = {
-    .iface_type             = ATCA_I2C_IFACE,
-    .devtype                = ATECC508A,
-    .atcai2c.slave_address  = 0xC0,
-    .atcai2c.bus            = 2,
-    .atcai2c.baud           = 400000,
-    //.atcai2c.baud = 100000,
-    .wake_delay             = 1500,
-    .rx_retries             = 20
+    .iface_type                 = ATCA_I2C_IFACE,
+    .devtype                    = ATECC608A,
+    {
+        .atcai2c.slave_address  = 0xC0,
+        .atcai2c.bus            = 2,
+        .atcai2c.baud           = 400000,
+        //.atcai2c.baud = 100000,
+    },
+    .wake_delay                 = 1500,
+    .rx_retries                 = 20
 };
 
 /** \brief default configuration for an ECCx08A device on the logical SWI bus over UART*/
 ATCAIfaceCfg cfg_ateccx08a_swi_default = {
-    .iface_type     = ATCA_SWI_IFACE,
-    .devtype        = ATECC508A,
-    .atcaswi.bus    = 4,
-    .wake_delay     = 1500,
-    .rx_retries     = 10
+    .iface_type         = ATCA_SWI_IFACE,
+    .devtype            = ATECC608A,
+    {
+        .atcaswi.bus    = 4,
+    },
+    .wake_delay         = 1500,
+    .rx_retries         = 10
 };
 
 /** \brief default configuration for Kit protocol over the device's async interface */
 ATCAIfaceCfg cfg_ateccx08a_kitcdc_default = {
-    .iface_type         = ATCA_UART_IFACE,
-    .devtype            = ATECC508A,
-    .atcauart.port      = 0,
-    .atcauart.baud      = 115200,
-    .atcauart.wordsize  = 8,
-    .atcauart.parity    = 2,
-    .atcauart.stopbits  = 1,
-    .rx_retries         = 1,
+    .iface_type             = ATCA_UART_IFACE,
+    .devtype                = ATECC608A,
+    {
+        .atcauart.port      = 0,
+        .atcauart.baud      = 115200,
+        .atcauart.wordsize  = 8,
+        .atcauart.parity    = 2,
+        .atcauart.stopbits  = 1,
+    },
+    .rx_retries             = 1,
 };
 
 /** \brief default configuration for Kit protocol over the device's async interface */
 ATCAIfaceCfg cfg_ateccx08a_kithid_default = {
-    .iface_type         = ATCA_HID_IFACE,
-    .devtype            = ATECC508A,
-    .atcahid.idx        = 0,
-    .atcahid.vid        = 0x03EB,
-    .atcahid.pid        = 0x2312,
-    .atcahid.packetsize = 64,
-    .atcahid.guid       = { 0x4d,        0x1e, 0x55, 0xb2, 0xf1, 0x6f, 0x11, 0xcf, 0x88, 0xcb, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 },
+    .iface_type                  = ATCA_HID_IFACE,
+    .devtype                     = ATECC608A,
+    {
+        .atcahid.dev_interface   = ATCA_KIT_AUTO_IFACE,
+        .atcahid.dev_identity    = 0,
+        .atcahid.idx             = 0,
+        .atcahid.vid             = 0x03EB,
+        .atcahid.pid             = 0x2312,
+        .atcahid.packetsize      = 64,
+    }
 };
 
+
 /** \brief default configuration for a SHA204A device on the first logical I2C bus */
 ATCAIfaceCfg cfg_atsha204a_i2c_default = {
-    .iface_type             = ATCA_I2C_IFACE,
-    .devtype                = ATSHA204A,
-    .atcai2c.slave_address  = 0xC8,
-    .atcai2c.bus            = 2,
-    .atcai2c.baud           = 400000,
-    .wake_delay             = 2560,
-    .rx_retries             = 20
+    .iface_type                 = ATCA_I2C_IFACE,
+    .devtype                    = ATSHA204A,
+    {
+        .atcai2c.slave_address  = 0xC8,
+        .atcai2c.bus            = 2,
+        .atcai2c.baud           = 400000,
+    },
+    .wake_delay                 = 2560,
+    .rx_retries                 = 20
 };
 
 /** \brief default configuration for an SHA204A device on the logical SWI bus over UART*/
 ATCAIfaceCfg cfg_atsha204a_swi_default = {
-    .iface_type     = ATCA_SWI_IFACE,
-    .devtype        = ATSHA204A,
-    .atcaswi.bus    = 4,
-    .wake_delay     = 2560,
-    .rx_retries     = 10
+    .iface_type       = ATCA_SWI_IFACE,
+    .devtype          = ATSHA204A,
+    {
+        .atcaswi.bus  = 4,
+    },
+    .wake_delay       = 2560,
+    .rx_retries       = 10
 };
 
 /** \brief default configuration for Kit protocol over the device's async interface */
 ATCAIfaceCfg cfg_atsha204a_kitcdc_default = {
-    .iface_type        = ATCA_UART_IFACE,
-    .devtype           = ATSHA204A,
-    .atcauart.port     = 0,
-    .atcauart.baud     = 115200,
-    .atcauart.wordsize = 8,
-    .atcauart.parity   = 2,
-    .atcauart.stopbits = 1,
-    .rx_retries        = 1,
+    .iface_type            = ATCA_UART_IFACE,
+    .devtype               = ATSHA204A,
+    {
+        .atcauart.port     = 0,
+        .atcauart.baud     = 115200,
+        .atcauart.wordsize = 8,
+        .atcauart.parity   = 2,
+        .atcauart.stopbits = 1,
+    },
+    .rx_retries            = 1,
 };
 
 /** \brief default configuration for Kit protocol over the device's async interface */
 ATCAIfaceCfg cfg_atsha204a_kithid_default = {
-    .iface_type         = ATCA_HID_IFACE,
-    .devtype            = ATSHA204A,
-    .atcahid.idx        = 0,
-    .atcahid.vid        = 0x03EB,
-    .atcahid.pid        = 0x2312,
-    .atcahid.packetsize = 64,
-    .atcahid.guid       = { 0x4d,        0x1e, 0x55, 0xb2, 0xf1, 0x6f, 0x11, 0xcf, 0x88, 0xcb, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 },
+    .iface_type            = ATCA_HID_IFACE,
+    .devtype               = ATSHA204A,
+    .atcahid.dev_interface = ATCA_KIT_AUTO_IFACE,
+    .atcahid.dev_identity  = 0,
+    .atcahid.idx           = 0,
+    .atcahid.vid           = 0x03EB,
+    .atcahid.pid           = 0x2312,
+    .atcahid.packetsize    = 64,
 };
 
 /** @} */

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/atca_command.c

@@ -648,6 +648,8 @@ void atCalcCrc(ATCAPacket *packet)
 {
     uint8_t length, *crc;
 
+    packet->param2 = ATCA_UINT16_HOST_TO_LE(packet->param2);
+
     length = packet->txsize - ATCA_CRC_SIZE;
     // computer pointer to CRC in the packet
     crc = &(packet->txsize) + length;

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/atca_command.h

@@ -37,9 +37,10 @@
 #include "atca_compiler.h"
 #include "atca_status.h"
 #include "atca_devtypes.h"
-#include "cryptoauthlib_config.h" 
+#include "../cryptoauthlib_config.h"
 #include <stddef.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -85,14 +86,17 @@ void deleteATCACommand(ATCACommand *ca_cmd);
 
 // Note: pack @ 2 is required, @ 1 causes word alignment crash (though it should not), a known bug in GCC.
 // @2, the wire still has the intended byte alignment with arm-eabi.  this is likely the least portable part of atca
-#if defined(__XC16__)||defined(__XC32__) 
+
+
+#ifdef ATCA_NO_PRAGMA_PACK
+typedef struct __attribute__ ((packed))
+#else
 #pragma pack( push, ATCAPacket, 2 )
+typedef struct
 #endif
-
 /** \brief an ATCA packet structure.  This is a superset of the packet transmitted on the wire.  It's also
  * used as a buffer for receiving the response
  */
-typedef struct
 {
 
     // used for transmit/send
@@ -117,7 +121,7 @@ typedef struct
 
 } ATCAPacket;
 
-#if defined(__XC16__)||defined(__XC32__) 
+#ifndef ATCA_NO_PRAGMA_PACK
 #pragma pack( pop, ATCAPacket)
 #endif
 
@@ -344,6 +348,7 @@ ATCA_STATUS atCheckCrc(const uint8_t *response);
 #define COUNTER_MODE_READ                   ((uint8_t)0x00)         //!< Counter command mode for reading
 #define COUNTER_MODE_INCREMENT              ((uint8_t)0x01)         //!< Counter command mode for incrementing
 #define COUNTER_RSP_SIZE                    ATCA_RSP_SIZE_4         //!< Counter command response packet size
+#define COUNTER_SIZE                        ATCA_RSP_SIZE_MIN       //!< Counter size in binary
 /** @} */
 
 /** \name Definitions for the DeriveKey Command

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/atca_compiler.h

@@ -31,31 +31,62 @@
 #ifndef ATCA_COMPILER_H_
 #define ATCA_COMPILER_H_
 
-#if defined(__clang__)
+#if defined(__clang__)&& defined(__AVR_ARCH__)
 /* Clang/LLVM. ---------------------------------------------- */
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define ATCA_UINT16_HOST_TO_LE(x)  __builtin_bswap16(x)
+#define ATCA_UINT16_LE_TO_HOST(x)  __builtin_bswap16(x)
+#define ATCA_UINT32_HOST_TO_LE(x)  __builtin_bswap32(x)
 #define ATCA_UINT32_HOST_TO_BE(x)  (x)
 #define ATCA_UINT32_BE_TO_HOST(x)  (x)
 #define ATCA_UINT64_HOST_TO_BE(x)  (x)
 #define ATCA_UINT64_BE_TO_HOST(x)  (x)
 #else
+#define ATCA_UINT16_HOST_TO_LE(x)  (x)
+#define ATCA_UINT16_LE_TO_HOST(x)  (x)
+#define ATCA_UINT32_HOST_TO_LE(x)  (x)
 #define ATCA_UINT32_HOST_TO_BE(x)  __builtin_bswap32(x)
 #define ATCA_UINT32_BE_TO_HOST(x)  __builtin_bswap32(x)
 #define ATCA_UINT64_HOST_TO_BE(x)  __builtin_bswap64(x)
 #define ATCA_UINT64_BE_TO_HOST(x)  __builtin_bswap64(x)
 #endif
 
+#elif defined(__XC8) || defined(__XC16)
+/* Microchip XC8 and XC16 Compilers ------------------------- */
+#define ATCA_UINT16_HOST_TO_LE(x)  (x)
+#define ATCA_UINT16_LE_TO_HOST(x)  (x)
+#define ATCA_UINT32_HOST_TO_LE(x)  (x)
+#define ATCA_UINT32_HOST_TO_BE(x)  (((x & 0x000000FF)<<24) | ((x & 0x0000FF00)<<8) | ((x & 0x00FF0000)>>8) | ((x & 0xFF000000) >> 24))
+#define ATCA_UINT32_BE_TO_HOST(x)  (((x & 0x000000FF)<<24) | ((x & 0x0000FF00)<<8) | ((x & 0x00FF0000)>>8) | ((x & 0xFF000000) >> 24))
+#define ATCA_UINT64_HOST_TO_BE(x)  ((uint64_t)ATCA_UINT32_HOST_TO_BE((uint32_t)x)<<32 + (uint64_t)ATCA_UINT32_HOST_TO_BE((uint32_t)(x>>32)))
+#define ATCA_UINT64_BE_TO_HOST(x)  ((uint64_t)ATCA_UINT32_BE_TO_HOST((uint32_t)x)<<32 + (uint64_t)ATCA_UINT32_BE_TO_HOST((uint32_t)(x>>32)))
+
 #elif defined(__ICC) || defined(__INTEL_COMPILER)
 /* Intel ICC/ICPC. ------------------------------------------ */
 
 #elif defined(__GNUC__) || defined(__GNUG__)
 /* GNU GCC/G++. --------------------------------------------- */
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#if defined(__AVR32__)
+#define ATCA_UINT16_HOST_TO_LE(x)  __builtin_bswap_16(x)
+#define ATCA_UINT16_LE_TO_HOST(x)  __builtin_bswap_16(x)
+#define ATCA_UINT32_HOST_TO_LE(x)  __builtin_bswap_32(x)
+#define ATCA_UINT32_HOST_TO_BE(x)  (x)
+#define ATCA_UINT32_BE_TO_HOST(x)  (x)
+#define ATCA_UINT64_HOST_TO_BE(x)  (x)
+#define ATCA_UINT64_BE_TO_HOST(x)  (x)
+#define ATCA_NO_PRAGMA_PACK
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define ATCA_UINT16_HOST_TO_LE(x)  __builtin_bswap16(x)
+#define ATCA_UINT16_LE_TO_HOST(x)  __builtin_bswap16(x)
+#define ATCA_UINT32_HOST_TO_LE(x)  __builtin_bswap32(x)
 #define ATCA_UINT32_HOST_TO_BE(x)  (x)
 #define ATCA_UINT32_BE_TO_HOST(x)  (x)
 #define ATCA_UINT64_HOST_TO_BE(x)  (x)
 #define ATCA_UINT64_BE_TO_HOST(x)  (x)
 #else
+#define ATCA_UINT16_HOST_TO_LE(x)  (x)
+#define ATCA_UINT16_LE_TO_HOST(x)  (x)
+#define ATCA_UINT32_HOST_TO_LE(x)  (x)
 #define ATCA_UINT32_HOST_TO_BE(x)  __builtin_bswap32(x)
 #define ATCA_UINT32_BE_TO_HOST(x)  __builtin_bswap32(x)
 #define ATCA_UINT64_HOST_TO_BE(x)  __builtin_bswap64(x)
@@ -72,10 +103,14 @@
 /* Microsoft Visual Studio. --------------------------------- */
 // MSVC is usually always little-endian architecture
 #include <stdlib.h>
+#define ATCA_UINT16_HOST_TO_LE(x)  (x)
+#define ATCA_UINT16_LE_TO_HOST(x)  (x)
+#define ATCA_UINT32_HOST_TO_LE(x)  (x)
 #define ATCA_UINT32_HOST_TO_BE(x)  _byteswap_ulong(x)
 #define ATCA_UINT32_BE_TO_HOST(x)  _byteswap_ulong(x)
 #define ATCA_UINT64_HOST_TO_BE(x)  _byteswap_uint64(x)
 #define ATCA_UINT64_BE_TO_HOST(x)  _byteswap_uint64(x)
+#define strtok_r                   strtok_s
 
 #elif defined(__PGI)
 /* Portland Group PGCC/PGCPP. ------------------------------- */

AVRIoT.X/mcc_generated_files/CryptoAuthenticationLibrary/atca_iface.c

@@ -227,12 +227,15 @@ void* atgetifacehaldat(ATCAIface ca_iface)
  */
 ATCA_STATUS releaseATCAIface(ATCAIface ca_iface)
 {
-    if (ca_iface == NULL)
+    ATCA_STATUS ret = ATCA_BAD_PARAM;
+
+    if (ca_iface)
     {
-        return ATCA_BAD_PARAM;
+        ret = hal_iface_release(ca_iface->mType, ca_iface->hal_data);
+        ca_iface->hal_data = NULL;
     }
 
-    return hal_iface_release(ca_iface->mType, ca_iface->hal_data);
+    return ret;
 }
 
 #ifndef ATCA_NO_HEAP