Meta data included in pipeline;PAI-565 additional data key value pair…

… updated in metadata;PAI-596 verify metadata;PAI-596 registeration in portal when a public tag is created;PAI-596 metadata version in additionaData reverted to 1.0.0;PAI-596 verify metada stage moved out of deploy stage;PAI-534 Updated the awsCloudService and mqtt submodules to bring in the Server Name Indication (SNI) update.;PAI-627 update in deploy tool reference;PAI-596 portal reg successful email;PAI-596 project name in metadata updated;PAI-631 update application reference to get the firmware version change;PAI-633 Updated the version number in ivy file and main.json file to 4.1.0;PAI-633 Updated the tag name to RC1;PAI-627 fix in tag stage of deploy pipeline;PAI-627 ivy and metadata updated to 4.0.0-rc2 for internal tag;PAI-631 Updated the version number for the final GitHub release.;PAI-596 portal deploy notififcation;PAI-596 edits in sending notification API call;
microchip-pic-avr-solutions · Jul 23, 2020 · 9c4a64a · 9c4a64a
1 parent 673ed2d
commit 9c4a64a
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 30 deletions.
diff --git a/.main-meta/main.json b/.main-meta/main.json
@@ -0,0 +1,103 @@
+{
+    "metaDataVersion": "1.0.0",
+    "category": "com.microchip.ide.project",
+    "content": {
+        "metaDataVersion": "1.1.0",
+        "name": "com.microchip.mcu8.mplabx.project.avr-iot-aws-sensor-node-mplab",
+        "version": "4.1.0",
+        "displayName": "AVR IoT AWS Sensor Node MPLAB",
+        "projectName": "avr-iot-aws-sensor-node-mplab",
+        "shortDescription": "Microchip AVR-IoT WA (Wireless for Amazon Web Services) Application Example",
+        "ide": {
+            "name": "MPLABX",
+            "semverRange": ">=5.30.0"
+        },
+        "compiler": [
+            {
+                "name": "xc8",
+                "semverRange": "^2.10.0"
+            },
+            {
+                "name": "gcc",
+                "semverRange": "^5.4.0"
+            }
+        ],
+        "dfp": {
+            "name": "Atmega_DFP",
+            "semverRange": "^2.0.12"
+        },
+        "configurator": {
+            "name": "MCC",
+            "semverRange": ">=3.95.0"
+        },
+        "device": {
+            "metaDataVersion": "1.0.0",
+            "category": "com.microchip.portal.contentRef",
+            "content": {
+                "metaDataVersion": "1.0.0",
+                "category": "com.microchip.device",
+                "name": "ATMEGA4808",
+                "versionRange": "*"
+            }
+        },
+        "author": "MCU8 Library Development Team",
+        "subcategories": [
+            "MCC",
+            "IoT",
+            [
+                "Peripherals",
+                "SPI"
+            ],
+            [
+                "Peripherals",
+                "I2C"
+            ],
+            [
+                "Peripherals",
+                "TIMER"
+            ],
+            [
+                "Peripherals",
+                "UART"
+            ],
+            [
+                "Peripherals",
+                "ADC"
+            ]
+        ],
+        "peripherals": [
+            "Interrupt",
+            "PWM",
+            "CCP",
+            "TIMER"
+        ],
+        "keywords": [
+            "MCC",
+            "ECC608",
+            "WINC1510",
+            "Wireless",
+            "MQTT",
+            "Internet of things",
+            "Security",
+            "Crypto Authentication Library",
+            "Cloud",
+            "AWS",
+            "Amazon web Services",
+            "Sensors",
+            "AVR-IoT",
+            "AVR-IoT WA Development Board"
+
+        ],
+        "additionalData": {
+            "longDescription": {
+                "metaDataVersion": "1.0.0",
+                "category": "com.microchip.portal.fileRef",
+                "content": {
+                    "metaDataVersion": "1.0.0",
+                    "fileName": "./README.md",
+                    "mimeType": "text/markdown"
+                }
+            }
+        }   
+    }
+}
diff --git a/AVRIoT.X/mcc_generated_files/cli/cli.c b/AVRIoT.X/mcc_generated_files/cli/cli.c
@@ -71,9 +71,9 @@ static bool isCommandReceived = false;
 static uint8_t index = 0;
 static bool commandTooLongFlag = false;
 
-const char * const cli_version_number             = "1.0";
+const char * const cli_option_version_number      = "1.0.1";
 
-const char * const firmware_version_number        = "4.0.0";
+const char * const firmware_version_number        = "4.1.0";
 
 static void command_received(char *command_text);
 static void reset_cmd(char *pArg);
@@ -335,7 +335,7 @@ static void get_device_id(char *pArg)
 static void get_cli_version(char *pArg)
 {
     (void)pArg;
-    printf("v%s\r\n\4", cli_version_number);
+    printf("v%s\r\n\4", cli_option_version_number);
 }
 
 static void get_firmware_version(char *pArg)

diff --git a/AVRIoT.X/mcc_generated_files/cloud/aws_cloud_service.c b/AVRIoT.X/mcc_generated_files/cloud/aws_cloud_service.c
@@ -133,14 +133,25 @@ int8_t CLOUD_connectSocket(uint32_t ipAddress)
         if (socketState == SOCKET_CLOSED) 
         {
          debug_print("CLOUD: Connect socket");
-         ret = BSD_connect(*context->tcpClientSocket, (struct bsd_sockaddr *)&addr, sizeof(struct bsd_sockaddr_in));
-
-         if (ret != BSD_SUCCESS) 
+
+         ret = BSD_setsockopt(*context->tcpClientSocket, BSD_SOL_SSL_SOCKET, BSD_SO_SSL_SNI, awsEndpoint, strlen(awsEndpoint));
+         if(ret == BSD_SUCCESS)
          {
-            debug_printError("CLOUD connect received %d",ret);
+             ret = BSD_connect(*context->tcpClientSocket, (struct bsd_sockaddr *)&addr, sizeof(struct bsd_sockaddr_in));
+
+             if (ret != BSD_SUCCESS) 
+             {
+                debug_printError("CLOUD connect received %d",ret);
 
-            BSD_close(*context->tcpClientSocket);
+                BSD_close(*context->tcpClientSocket);
+             }
+
          }
+         else
+         {
+             debug_printError("CLOUD setsockopt received %d",ret);
+         }   
+
       }
    }   
    return ret;

diff --git a/AVRIoT.X/mcc_generated_files/mqtt/mqtt_core/mqtt_core.c b/AVRIoT.X/mcc_generated_files/mqtt/mqtt_core/mqtt_core.c
@@ -845,6 +845,8 @@ static void mqttProcessPingresp(mqttContext *mqttConnectionPtr)
    memset(&txPingrespPacket, 0, sizeof (txPingrespPacket));
 
    MQTT_ExchangeBufferRead(&mqttConnectionPtr->mqttDataExchangeBuffers.rxbuff, &txPingrespPacket.pingFixedHeader.All, sizeof (txPingrespPacket.pingFixedHeader.All));
+   mqttRxFlags.newRxPingrespPacket = 0;
+
    // Reload timeout for keepAliveTimer
    // The timeout should be reloaded only if the keepAliveTimer is set
    // to a non-zero value.
@@ -1186,6 +1188,7 @@ mqttCurrentState MQTT_ReceptionHandler(mqttContext *mqttConnectionPtr)
                      // Send a PINGREQ packet after (keepAliveTimer - KEEP_ALIVE_CALCULATION_CONSTANT)s
                      // if keepAliveTime is non-zero
                      mqttTxFlags.newTxPingreqPacket = 1;
+                     mqttRxFlags.newRxPingrespPacket = 0;
                      // The timeout API names are different in MCC foundation
                      // services timeout driver and START timeout driver
                      timeout_create(&pingreqTimer, ((keepAliveTimeout - KEEP_ALIVE_CALCULATION_CONSTANT) * SECONDS));
@@ -1376,7 +1379,7 @@ static bool mqttSendPingreq(mqttContext *mqttConnectionPtr)
        mqttRxFlags.newRxPingrespPacket = 1;
        // The client expects the server to send a PINGRESP within
        // keepAliveTimer value.
-
+       mqttTimeouts.pingrespTimeoutOccured = 0;
        //The timeout API names are different in MCC foundation
        //services timeout driver and START timeout driver
        timeout_create(&pingrespTimer, (WAITFORPINGRESP_TIMEOUT));

diff --git a/AVRIoT.X/mcc_generated_files/mqtt/mqtt_winc_adapter.c b/AVRIoT.X/mcc_generated_files/mqtt/mqtt_winc_adapter.c
@@ -68,20 +68,6 @@ typedef enum
 	WINC_SOCK_ERR_BUFFER_FULL = -14,
 }wincSocketResponses_t;
 
-typedef enum
-{
-	WINC_SO_SSL_BYPASS_X509_VERIF = 1,
-	WINC_SO_SSL_SNI = 2,
-	WINC_SO_SSL_ENABLE_SESSION_CACHING = 3,
-	WINC_SO_SSL_ENABLE_SNI_VALIDATION = 4,
-}wincSupportedSockOptions;
-
-typedef enum
-{
-	WINC_SOL_SOCKET = 1,
-	WINC_SOL_SSL_SOCKET = 2,
-}wincSupportedSockLevel;
-
 /*******************WINC specific socket address structure***************************/
 typedef struct {
     uint16_t		sa_family;		//Socket address
@@ -566,8 +552,8 @@ int BSD_setsockopt(int socket, int level, int optname, const void *optval, sockl
 
 	switch((wincSupportedSockLevel)level)
 	{
-		case WINC_SOL_SOCKET:
-		case WINC_SOL_SSL_SOCKET:
+		case BSD_SOL_SOCKET:
+		case BSD_SOL_SSL_SOCKET:
 			wincSockLevel = level;
 		break;
 		default:
@@ -577,10 +563,10 @@ int BSD_setsockopt(int socket, int level, int optname, const void *optval, sockl
 	}
 	switch((wincSupportedSockOptions)optname)
 	{
-		case WINC_SO_SSL_BYPASS_X509_VERIF:
-		case WINC_SO_SSL_SNI:
-		case WINC_SO_SSL_ENABLE_SESSION_CACHING:
-		case WINC_SO_SSL_ENABLE_SNI_VALIDATION:
+		case BSD_SO_SSL_BYPASS_X509_VERIF:
+		case BSD_SO_SSL_SNI:
+		case BSD_SO_SSL_ENABLE_SESSION_CACHING:
+		case BSD_SO_SSL_ENABLE_SNI_VALIDATION:
 			wincSockOptions = optname;
 		break;
 		default:

diff --git a/AVRIoT.X/mcc_generated_files/mqtt/mqtt_winc_adapter.h b/AVRIoT.X/mcc_generated_files/mqtt/mqtt_winc_adapter.h
@@ -78,6 +78,20 @@ typedef enum
 	BSD_SOCK_PACKET,
 }bsdTypes_t;
 
+typedef enum
+{
+	BSD_SO_SSL_BYPASS_X509_VERIF = 1,
+	BSD_SO_SSL_SNI = 2,
+	BSD_SO_SSL_ENABLE_SESSION_CACHING = 3,
+	BSD_SO_SSL_ENABLE_SNI_VALIDATION = 4,
+}wincSupportedSockOptions;
+
+typedef enum
+{
+	BSD_SOL_SOCKET = 1,
+	BSD_SOL_SSL_SOCKET = 2,
+}wincSupportedSockLevel;
+
 /************** (END) BSD Type Defined Enumerators (END) *******************/
 
 /***************** Error Number Defined Enumerators **********************/

diff --git a/AVRIoT.X/nbproject/Makefile-genesis.properties b/AVRIoT.X/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Thu Jul 02 23:34:52 UTC 2020
+#Thu Jul 23 01:09:57 UTC 2020
 AWS_IOT.Pack.dfplocation=/opt/microchip/mplabx/v5.30/packs/Microchip/ATmega_DFP/2.0.12
 AWS_IOT.languagetoolchain.dir=/opt/microchip/xc8/v2.10/bin
 AWS_IOT.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=f87389d82b4b299d292110931953ebdc