@@ -30,6 +30,10 @@ const static int compressedCertSlot = 10;
30
30
const static int serialNumberAndAuthorityKeyIdentifierSlot = 11 ;
31
31
const static int thingIdSlot = 12 ;
32
32
33
+ const static int CONNECT_SUCCESS = 1 ;
34
+ const static int CONNECT_FAILURE = 0 ;
35
+ const static int CONNECT_FAILURE_SUBSCRIBE = -1 ;
36
+
33
37
static ConnectionManager *getTimeConnection = NULL ;
34
38
35
39
static unsigned long getTime () {
@@ -185,16 +189,17 @@ int ArduinoIoTCloudClass::connect()
185
189
// Username: device id
186
190
// Password: empty
187
191
if (!_mqttClient->connect (_brokerAddress.c_str (), _brokerPort)) {
188
- return 0 ;
192
+ return CONNECT_FAILURE ;
189
193
}
190
- _mqttClient->subscribe (_stdinTopic);
191
- _mqttClient->subscribe (_dataTopicIn);
192
- _mqttClient->subscribe (_shadowTopicIn);
194
+
195
+ if (_mqttClient->subscribe (_stdinTopic ) == 0 ) return CONNECT_FAILURE_SUBSCRIBE;
196
+ if (_mqttClient->subscribe (_dataTopicIn ) == 0 ) return CONNECT_FAILURE_SUBSCRIBE;
197
+ if (_mqttClient->subscribe (_shadowTopicIn) == 0 ) return CONNECT_FAILURE_SUBSCRIBE;
193
198
194
199
_syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_WAIT_FOR_CLOUD_VALUES;
195
200
_lastSyncRequestTickTime = 0 ;
196
201
197
- return 1 ;
202
+ return CONNECT_SUCCESS ;
198
203
}
199
204
200
205
bool ArduinoIoTCloudClass::disconnect ()
@@ -405,15 +410,18 @@ void ArduinoIoTCloudClass::connectionCheck()
405
410
}
406
411
break ;
407
412
case IOT_STATUS_CLOUD_CONNECTING:
408
- int arduinoIoTConnectionAttempt;
409
- arduinoIoTConnectionAttempt = connect ();
410
- sprintf (msgBuffer, " ArduinoCloud.connect(): %d" , arduinoIoTConnectionAttempt);
413
+ int const ret_code_connect = connect ();
414
+ sprintf (msgBuffer, " ArduinoCloud.connect(): %d" , ret_code_connect);
411
415
debugMessage (msgBuffer, 4 );
412
- if (arduinoIoTConnectionAttempt == 1 ) {
416
+ if (ret_code_connect == CONNECT_SUCCESS ) {
413
417
setIoTConnectionState (IOT_STATUS_CLOUD_CONNECTED);
414
418
CloudSerial.begin (9600 );
415
419
CloudSerial.println (" Hello from Cloud Serial!" );
416
420
}
421
+ else if (ret_code_connect == CONNECT_FAILURE_SUBSCRIBE) {
422
+ sprintf (msgBuffer, " ERROR - Please verify your THING ID" );
423
+ debugMessage (msgBuffer, 0 );
424
+ }
417
425
break ;
418
426
}
419
427
}
0 commit comments