Skip to content

Commit 09a92ec

Browse files
author
Microchip Technology
committed
Merging into the (master) branch
1 parent b62f97b commit 09a92ec

File tree

13 files changed

+56
-156
lines changed

13 files changed

+56
-156
lines changed

‎AVRIoT.X/mcc_generated_files/application_manager.c‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ static void receivedFromCloud(uint8_t *topic, uint8_t *payload)
141141
holdCount = 2;
142142
}
143143
}
144-
debug_printer(SEVERITY_NONE, LEVEL_NORMAL, "topic: %s", topic);
145-
debug_printer(SEVERITY_NONE, LEVEL_NORMAL, "payload: %s", payload);
144+
debug_printIoTAppMsg("topic: %s", topic);
145+
debug_printIoTAppMsg("payload: %s", payload);
146146
updateDeviceShadow();
147147
}
148148

@@ -191,7 +191,7 @@ void application_init()
191191
CLI_setdeviceId(attDeviceID);
192192
#endif
193193
debug_setPrefix(attDeviceID);
194-
wifi_readThingIdFromWinc();
194+
wifi_readThingNameFromWinc();
195195
wifi_readAWSEndpointFromWinc();
196196
timeout_create(&initDeviceShadowTimer, DEVICE_SHADOW_INIT_INTERVAL );
197197
// Blocking debounce
@@ -343,6 +343,11 @@ uint32_t MAIN_dataTask(void *payload)
343343
sendToCloud();
344344
}
345345
}
346+
else
347+
{
348+
ledState.Full2Sec = LED_OFF_STATIC;
349+
LED_modeYellow(ledState);
350+
}
346351

347352
// Blue LED
348353
if (!shared_networking_params.amConnectingAP)
@@ -361,6 +366,11 @@ uint32_t MAIN_dataTask(void *payload)
361366
ledState.Full2Sec = LED_ON_STATIC;
362367
LED_modeGreen(ledState);
363368
}
369+
else if(shared_networking_params.haveDataConnection == 1)
370+
{
371+
ledState.Full2Sec = LED_BLINK;
372+
LED_modeGreen(ledState);
373+
}
364374
}
365375
}
366376

@@ -393,7 +403,6 @@ static void wifiConnectionStateChanged(uint8_t status)
393403
// If we have no AP access we want to retry
394404
if (status != 1)
395405
{
396-
// Restart the WIFI module if we get disconnected from the WiFi Access Point (AP)
397-
CLOUD_setInitFlag();
406+
CLOUD_reset();
398407
}
399408
}

‎AVRIoT.X/mcc_generated_files/banner.h‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@ static uint8_t index = 0;
7070
static bool commandTooLongFlag = false;
7171

7272
const char * const cli_version_number = "1.0";
73-
const char * const firmware_version_number = "2.0.2";
73+
74+
const char * const firmware_version_number = "3.0.0";
7475

7576
static void command_received(char *command_text);
7677
static void reset_cmd(char *pArg);
7778
static void reconnect_cmd(char *pArg);
7879
static void set_wifi_auth(char *ssid_pwd_auth);
79-
static void get_thing_id(char *pArg);
80+
static void get_thing_name(char *pArg);
8081
static void get_device_id(char *pArg);
8182
static void get_cli_version(char *pArg);
8283
static void get_firmware_version(char *pArg);
@@ -100,7 +101,7 @@ const struct cmd commands[] =
100101
{ "reset", reset_cmd},
101102
{ "reconnect", reconnect_cmd },
102103
{ "wifi", set_wifi_auth },
103-
{ "thing", get_thing_id },
104+
{ "thing", get_thing_name },
104105
{ "device", get_device_id },
105106
{ "cli_version", get_cli_version },
106107
{ "version", get_firmware_version },
@@ -233,9 +234,9 @@ static void set_wifi_auth(char *ssid_pwd_auth)
233234
{
234235
MQTT_Close(MQTT_GetClientConnectionInfo());
235236
}
236-
if (shared_networking_params.haveSocket)
237+
if (shared_networking_params.haveDataConnection)
237238
{ // Disconnect from Socket if active
238-
shared_networking_params.haveSocket = 0;
239+
shared_networking_params.haveDataConnection = 0;
239240
MQTT_Disconnect(MQTT_GetClientConnectionInfo());
240241
}
241242
wifi_disconnectFromAp();
@@ -261,7 +262,7 @@ static void reconnect_cmd(char *pArg)
261262
LED_modeRed(ledState);
262263
ledState.Full2Sec = LED_BLINK;
263264
LED_modeGreen(ledState);
264-
shared_networking_params.haveSocket = 0;
265+
shared_networking_params.haveDataConnection = 0;
265266
MQTT_Disconnect(MQTT_GetClientConnectionInfo());
266267
printf("OK\r\n");
267268
}
@@ -288,7 +289,7 @@ static void set_debug_level(char *pArg)
288289
}
289290
}
290291

291-
static void get_thing_id(char *pArg)
292+
static void get_thing_name(char *pArg)
292293
{
293294
(void)pArg;
294295

@@ -298,7 +299,7 @@ static void get_thing_id(char *pArg)
298299
}
299300
else
300301
{
301-
printf("Error getting Thing ID.\r\n\4");
302+
printf("Error getting Thing Name.\r\n\4");
302303
}
303304
}
304305

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ cloudContext_t cloudContext =
9292
};
9393

9494

95-
void CLOUD_setInitFlag(void)
95+
void CLOUD_reset(void)
9696
{
9797
debug_printError("CLOUD: Cloud Reset");
9898
cloudStatus.cloudInitialized = false;
@@ -130,7 +130,7 @@ bool CLOUD_checkIsConnected(void)
130130
uint32_t mqttTimeoutTask(void *payload)
131131
{
132132
debug_printError("CLOUD: MQTT Connection Timeout");
133-
CLOUD_setInitFlag();
133+
CLOUD_reset();
134134

135135
cloudStatus.waitingForMQTT = false;
136136

@@ -178,6 +178,7 @@ static void startMqttConnectionTimeout()
178178
{
179179
debug_printError("MQTT: MQTT reset timer is created");
180180
timeout_create(&mqttTimeoutTaskTimer, CLOUD_MQTT_TIMEOUT_COUNT);
181+
shared_networking_params.haveDataConnection = 0;
181182
cloudStatus.waitingForMQTT = true;
182183
}
183184

@@ -211,7 +212,7 @@ static void setHaveSocketFor(socketState_t socketState, int32_t thisAge)
211212

212213
if(cloudContext.cloudIsConnected())
213214
{
214-
shared_networking_params.haveSocket = 1;
215+
shared_networking_params.haveDataConnection = 1;
215216
if(lastAge != thisAge)
216217
{
217218
debug_printInfo("CLOUD: Uptime %lus SocketState (%d) MQTT (%d)", thisAge , socketState, MQTT_GetConnectionState());
@@ -376,11 +377,6 @@ static void CLOUD_handleTransmitDebugMessage(void)
376377
}
377378
}
378379

379-
bool CLOUD_checkIsDisconnected(void)
380-
{
381-
return cloudContext.cloudIsDisconnected();
382-
}
383-
384380
static void dnsHandler(uint8_t* domainName, uint32_t serverIP)
385381
{
386382
if(serverIP != 0)

‎AVRIoT.X/mcc_generated_files/cloud/cloud_service.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@ typedef union
2929
unsigned amConnectingSocket : 1;
3030
unsigned amSoftAP: 1;
3131
unsigned amDefaultCred : 1;
32-
unsigned haveSocket : 1;
32+
unsigned haveDataConnection : 1;
3333
};
3434
} shared_networking_params_t;
3535

3636
extern shared_networking_params_t shared_networking_params;
3737

38-
void CLOUD_setInitFlag(void);
3938
void CLOUD_setupTask(char* deviceId);
4039
void CLOUD_publishData(uint8_t* refToPublishTopic, uint8_t* data, unsigned int len);
4140
void CLOUD_registerSubscription(uint8_t *topic, imqttHandlePublishDataFuncPtr subscriptionCallback);
4241
bool CLOUD_checkIsConnected(void);
43-
bool CLOUD_checkIsDisconnected(void);
42+
void CLOUD_reset(void);
4443
#endif /* CLOUD_SERVICE_H_ */

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SOFTWARE.
5454
#include "config/cloud_config.h"
5555

5656

57-
//Flash location to read thing ID from winc
57+
//Flash location to read thing Name from winc
5858
#define THING_NAME_FLASH_OFFSET (M2M_TLS_SERVER_FLASH_OFFSET + M2M_TLS_SERVER_FLASH_SIZE - FLASH_PAGE_SZ)
5959
#define AWS_ENDPOINT_FLASH_OFFSET (THING_NAME_FLASH_OFFSET - FLASH_PAGE_SZ)
6060
#define CLOUD_WIFI_TASK_INTERVAL 50L
@@ -137,14 +137,14 @@ void wifi_init(void (*funcPtr)(uint8_t), uint8_t mode) {
137137
timeout_create(&wifiHandlerTimer, CLOUD_WIFI_TASK_INTERVAL);
138138
}
139139

140-
void wifi_readThingIdFromWinc(void)
140+
void wifi_readThingNameFromWinc(void)
141141
{
142142
int8_t status;
143143
status = m2m_wifi_download_mode();
144144

145145
if(status != M2M_SUCCESS)
146146
{
147-
debug_printError("WINC download mode failed - Thing ID cannot be obtained");
147+
debug_printError("WINC download mode failed - Thing Name cannot be obtained");
148148
}
149149
else
150150
{
@@ -153,12 +153,12 @@ void wifi_readThingIdFromWinc(void)
153153
status = spi_flash_read(cid, THING_NAME_FLASH_OFFSET,MQTT_CID_LENGTH);
154154
if(status != M2M_SUCCESS || cid[0] == 0xFF || cid[MQTT_CID_LENGTH-1] == 0xFF)
155155
{
156-
sprintf(cid, "%s", AWS_THING_ID);
157-
debug_printer(SEVERITY_NONE, LEVEL_ERROR, "Thing ID is not present, error type %d, user defined thing ID is used",status);
156+
sprintf(cid, "%s", AWS_THING_NAME);
157+
debug_printIoTAppMsg("Thing Name is not present, error type %d, user defined thing ID is used",status);
158158
}
159159
else
160160
{
161-
debug_printer(SEVERITY_NONE, LEVEL_NORMAL,"Thing ID read from the device is %s",cid);
161+
debug_printIoTAppMsg("Thing Name read from the device is %s",cid);
162162
}
163163
}
164164
}
@@ -181,18 +181,18 @@ void wifi_readAWSEndpointFromWinc(void)
181181
if(status != M2M_SUCCESS || awsEndpoint[0] == 0xFF || awsEndpoint[AWS_ENDPOINT_LEN - 1] == 0xFF)
182182
{
183183
sprintf(awsEndpoint, "%s", CFG_MQTT_HOSTURL);
184-
debug_printer(SEVERITY_NONE, LEVEL_NORMAL, "Custom endpoint not present, using the default endpoint which the hardware was pre-provisioned for : %s", awsEndpoint);
184+
debug_printIoTAppMsg("Custom endpoint not present, using the default endpoint which the hardware was pre-provisioned for : %s", awsEndpoint);
185185
}
186186
else
187187
{
188188
#if USE_MCHP_AWS_ENDPOINT
189189
{
190190
sprintf(awsEndpoint, "%s", CFG_MQTT_HOSTURL);
191-
debug_printer(SEVERITY_NONE, LEVEL_NORMAL,"Using the default endpoint which the hardware was pre-provisioned for : %s", awsEndpoint);
191+
debug_printIoTAppMsg("Using the default endpoint which the hardware was pre-provisioned for : %s", awsEndpoint);
192192
}
193193
#else
194194
{
195-
debug_printer(SEVERITY_NONE, LEVEL_NORMAL,"Using the endpoint defined for custom AWS account: %s", awsEndpoint);
195+
debug_printIoTAppMsg("Using the endpoint defined for custom AWS account: %s", awsEndpoint);
196196
}
197197
#endif
198198
}

‎AVRIoT.X/mcc_generated_files/cloud/wifi_service.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ void wifi_init(void (*funcPtr)(uint8_t), uint8_t mode);
4242
void wifi_reinit();
4343
bool wifi_connectToAp(uint8_t passed_wifi_creds);
4444
bool wifi_disconnectFromAp(void);
45-
void wifi_readThingIdFromWinc(void);
45+
void wifi_readThingNameFromWinc(void);
4646
void wifi_readAWSEndpointFromWinc(void);
4747
#endif /* WIFI_SERVICE_H_ */

‎AVRIoT.X/mcc_generated_files/config/IoT_Sensor_Node_config.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55

66
#define CFG_TIMEOUT 5000
77

8-
#define CFG_DEBUG_MSG (0)
8+
#define CFG_DEBUG_PRINT (0)
99

1010
#define CFG_ENABLE_CLI (1)
1111

12+
#define ENABLE_DEBUG_IOT_APP_MSGS (1)
13+
1214
#define CFG_NTP_SERVER ("*.pool.ntp.org")
1315

1416
#endif // IOT_SENSOR_NODE_CONFIG_H

‎AVRIoT.X/mcc_generated_files/config/cloud_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#ifndef CLOUD_CONFIG_H
22
#define CLOUD_CONFIG_H
33

4-
//Thing ID configuration
4+
//Thing Name configuration
55

6-
//Use this thing ID in the event of not reading it from WINC
7-
#define AWS_THING_ID ""
6+
//Use this thing Name in the event of not reading it from WINC
7+
#define AWS_THING_NAME ""
88

99

1010
// </h>

0 commit comments

Comments
 (0)