Skip to content

Commit 9c4a64a

Browse files
author
Microchip Technology
committed
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;
1 parent 673ed2d commit 9c4a64a

File tree

7 files changed

+147
-30
lines changed

7 files changed

+147
-30
lines changed

‎.main-meta/main.json‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
{
2+
"metaDataVersion": "1.0.0",
3+
"category": "com.microchip.ide.project",
4+
"content": {
5+
"metaDataVersion": "1.1.0",
6+
"name": "com.microchip.mcu8.mplabx.project.avr-iot-aws-sensor-node-mplab",
7+
"version": "4.1.0",
8+
"displayName": "AVR IoT AWS Sensor Node MPLAB",
9+
"projectName": "avr-iot-aws-sensor-node-mplab",
10+
"shortDescription": "Microchip AVR-IoT WA (Wireless for Amazon Web Services) Application Example",
11+
"ide": {
12+
"name": "MPLABX",
13+
"semverRange": ">=5.30.0"
14+
},
15+
"compiler": [
16+
{
17+
"name": "xc8",
18+
"semverRange": "^2.10.0"
19+
},
20+
{
21+
"name": "gcc",
22+
"semverRange": "^5.4.0"
23+
}
24+
],
25+
"dfp": {
26+
"name": "Atmega_DFP",
27+
"semverRange": "^2.0.12"
28+
},
29+
"configurator": {
30+
"name": "MCC",
31+
"semverRange": ">=3.95.0"
32+
},
33+
"device": {
34+
"metaDataVersion": "1.0.0",
35+
"category": "com.microchip.portal.contentRef",
36+
"content": {
37+
"metaDataVersion": "1.0.0",
38+
"category": "com.microchip.device",
39+
"name": "ATMEGA4808",
40+
"versionRange": "*"
41+
}
42+
},
43+
"author": "MCU8 Library Development Team",
44+
"subcategories": [
45+
"MCC",
46+
"IoT",
47+
[
48+
"Peripherals",
49+
"SPI"
50+
],
51+
[
52+
"Peripherals",
53+
"I2C"
54+
],
55+
[
56+
"Peripherals",
57+
"TIMER"
58+
],
59+
[
60+
"Peripherals",
61+
"UART"
62+
],
63+
[
64+
"Peripherals",
65+
"ADC"
66+
]
67+
],
68+
"peripherals": [
69+
"Interrupt",
70+
"PWM",
71+
"CCP",
72+
"TIMER"
73+
],
74+
"keywords": [
75+
"MCC",
76+
"ECC608",
77+
"WINC1510",
78+
"Wireless",
79+
"MQTT",
80+
"Internet of things",
81+
"Security",
82+
"Crypto Authentication Library",
83+
"Cloud",
84+
"AWS",
85+
"Amazon web Services",
86+
"Sensors",
87+
"AVR-IoT",
88+
"AVR-IoT WA Development Board"
89+
90+
],
91+
"additionalData": {
92+
"longDescription": {
93+
"metaDataVersion": "1.0.0",
94+
"category": "com.microchip.portal.fileRef",
95+
"content": {
96+
"metaDataVersion": "1.0.0",
97+
"fileName": "./README.md",
98+
"mimeType": "text/markdown"
99+
}
100+
}
101+
}
102+
}
103+
}

‎AVRIoT.X/mcc_generated_files/cli/cli.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ static bool isCommandReceived = false;
7171
static uint8_t index = 0;
7272
static bool commandTooLongFlag = false;
7373

74-
const char * const cli_version_number = "1.0";
74+
const char * const cli_option_version_number = "1.0.1";
7575

76-
const char * const firmware_version_number = "4.0.0";
76+
const char * const firmware_version_number = "4.1.0";
7777

7878
static void command_received(char *command_text);
7979
static void reset_cmd(char *pArg);
@@ -335,7 +335,7 @@ static void get_device_id(char *pArg)
335335
static void get_cli_version(char *pArg)
336336
{
337337
(void)pArg;
338-
printf("v%s\r\n\4", cli_version_number);
338+
printf("v%s\r\n\4", cli_option_version_number);
339339
}
340340

341341
static void get_firmware_version(char *pArg)

‎AVRIoT.X/mcc_generated_files/cloud/aws_cloud_service.c‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,25 @@ int8_t CLOUD_connectSocket(uint32_t ipAddress)
133133
if (socketState == SOCKET_CLOSED)
134134
{
135135
debug_print("CLOUD: Connect socket");
136-
ret = BSD_connect(*context->tcpClientSocket, (struct bsd_sockaddr *)&addr, sizeof(struct bsd_sockaddr_in));
137-
138-
if (ret != BSD_SUCCESS)
136+
137+
ret = BSD_setsockopt(*context->tcpClientSocket, BSD_SOL_SSL_SOCKET, BSD_SO_SSL_SNI, awsEndpoint, strlen(awsEndpoint));
138+
if(ret == BSD_SUCCESS)
139139
{
140-
debug_printError("CLOUD connect received %d",ret);
140+
ret = BSD_connect(*context->tcpClientSocket, (struct bsd_sockaddr *)&addr, sizeof(struct bsd_sockaddr_in));
141+
142+
if (ret != BSD_SUCCESS)
143+
{
144+
debug_printError("CLOUD connect received %d",ret);
141145

142-
BSD_close(*context->tcpClientSocket);
146+
BSD_close(*context->tcpClientSocket);
147+
}
148+
143149
}
150+
else
151+
{
152+
debug_printError("CLOUD setsockopt received %d",ret);
153+
}
154+
144155
}
145156
}
146157
return ret;

‎AVRIoT.X/mcc_generated_files/mqtt/mqtt_core/mqtt_core.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,8 @@ static void mqttProcessPingresp(mqttContext *mqttConnectionPtr)
845845
memset(&txPingrespPacket, 0, sizeof (txPingrespPacket));
846846

847847
MQTT_ExchangeBufferRead(&mqttConnectionPtr->mqttDataExchangeBuffers.rxbuff, &txPingrespPacket.pingFixedHeader.All, sizeof (txPingrespPacket.pingFixedHeader.All));
848+
mqttRxFlags.newRxPingrespPacket = 0;
849+
848850
// Reload timeout for keepAliveTimer
849851
// The timeout should be reloaded only if the keepAliveTimer is set
850852
// to a non-zero value.
@@ -1186,6 +1188,7 @@ mqttCurrentState MQTT_ReceptionHandler(mqttContext *mqttConnectionPtr)
11861188
// Send a PINGREQ packet after (keepAliveTimer - KEEP_ALIVE_CALCULATION_CONSTANT)s
11871189
// if keepAliveTime is non-zero
11881190
mqttTxFlags.newTxPingreqPacket = 1;
1191+
mqttRxFlags.newRxPingrespPacket = 0;
11891192
// The timeout API names are different in MCC foundation
11901193
// services timeout driver and START timeout driver
11911194
timeout_create(&pingreqTimer, ((keepAliveTimeout - KEEP_ALIVE_CALCULATION_CONSTANT) * SECONDS));
@@ -1376,7 +1379,7 @@ static bool mqttSendPingreq(mqttContext *mqttConnectionPtr)
13761379
mqttRxFlags.newRxPingrespPacket = 1;
13771380
// The client expects the server to send a PINGRESP within
13781381
// keepAliveTimer value.
1379-
1382+
mqttTimeouts.pingrespTimeoutOccured = 0;
13801383
//The timeout API names are different in MCC foundation
13811384
//services timeout driver and START timeout driver
13821385
timeout_create(&pingrespTimer, (WAITFORPINGRESP_TIMEOUT));

‎AVRIoT.X/mcc_generated_files/mqtt/mqtt_winc_adapter.c‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,6 @@ typedef enum
6868
WINC_SOCK_ERR_BUFFER_FULL = -14,
6969
}wincSocketResponses_t;
7070

71-
typedef enum
72-
{
73-
WINC_SO_SSL_BYPASS_X509_VERIF = 1,
74-
WINC_SO_SSL_SNI = 2,
75-
WINC_SO_SSL_ENABLE_SESSION_CACHING = 3,
76-
WINC_SO_SSL_ENABLE_SNI_VALIDATION = 4,
77-
}wincSupportedSockOptions;
78-
79-
typedef enum
80-
{
81-
WINC_SOL_SOCKET = 1,
82-
WINC_SOL_SSL_SOCKET = 2,
83-
}wincSupportedSockLevel;
84-
8571
/*******************WINC specific socket address structure***************************/
8672
typedef struct {
8773
uint16_t sa_family; //Socket address
@@ -566,8 +552,8 @@ int BSD_setsockopt(int socket, int level, int optname, const void *optval, sockl
566552

567553
switch((wincSupportedSockLevel)level)
568554
{
569-
case WINC_SOL_SOCKET:
570-
case WINC_SOL_SSL_SOCKET:
555+
case BSD_SOL_SOCKET:
556+
case BSD_SOL_SSL_SOCKET:
571557
wincSockLevel = level;
572558
break;
573559
default:
@@ -577,10 +563,10 @@ int BSD_setsockopt(int socket, int level, int optname, const void *optval, sockl
577563
}
578564
switch((wincSupportedSockOptions)optname)
579565
{
580-
case WINC_SO_SSL_BYPASS_X509_VERIF:
581-
case WINC_SO_SSL_SNI:
582-
case WINC_SO_SSL_ENABLE_SESSION_CACHING:
583-
case WINC_SO_SSL_ENABLE_SNI_VALIDATION:
566+
case BSD_SO_SSL_BYPASS_X509_VERIF:
567+
case BSD_SO_SSL_SNI:
568+
case BSD_SO_SSL_ENABLE_SESSION_CACHING:
569+
case BSD_SO_SSL_ENABLE_SNI_VALIDATION:
584570
wincSockOptions = optname;
585571
break;
586572
default:

‎AVRIoT.X/mcc_generated_files/mqtt/mqtt_winc_adapter.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,20 @@ typedef enum
7878
BSD_SOCK_PACKET,
7979
}bsdTypes_t;
8080

81+
typedef enum
82+
{
83+
BSD_SO_SSL_BYPASS_X509_VERIF = 1,
84+
BSD_SO_SSL_SNI = 2,
85+
BSD_SO_SSL_ENABLE_SESSION_CACHING = 3,
86+
BSD_SO_SSL_ENABLE_SNI_VALIDATION = 4,
87+
}wincSupportedSockOptions;
88+
89+
typedef enum
90+
{
91+
BSD_SOL_SOCKET = 1,
92+
BSD_SOL_SSL_SOCKET = 2,
93+
}wincSupportedSockLevel;
94+
8195
/************** (END) BSD Type Defined Enumerators (END) *******************/
8296

8397
/***************** Error Number Defined Enumerators **********************/

‎AVRIoT.X/nbproject/Makefile-genesis.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
#Thu Jul 02 23:34:52 UTC 2020
2+
#Thu Jul 23 01:09:57 UTC 2020
33
AWS_IOT.Pack.dfplocation=/opt/microchip/mplabx/v5.30/packs/Microchip/ATmega_DFP/2.0.12
44
AWS_IOT.languagetoolchain.dir=/opt/microchip/xc8/v2.10/bin
55
AWS_IOT.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=f87389d82b4b299d292110931953ebdc

0 commit comments

Comments
 (0)