Skip to content

[CM-474] Notify user if thing id is wrong / thing does not exist #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ArduinoIoTCloud
version=0.5.3
version=0.5.4
author=Arduino
maintainer=Arduino <[email protected]>
sentence=This library allows to connect to the Arduino IoT Cloud service.
Expand Down
26 changes: 17 additions & 9 deletions src/ArduinoIoTCloud.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ const static int compressedCertSlot = 10;
const static int serialNumberAndAuthorityKeyIdentifierSlot = 11;
const static int thingIdSlot = 12;

const static int CONNECT_SUCCESS = 1;
const static int CONNECT_FAILURE = 0;
const static int CONNECT_FAILURE_SUBSCRIBE = -1;

static ConnectionManager *getTimeConnection = NULL;

static unsigned long getTime() {
Expand Down Expand Up @@ -185,16 +189,17 @@ int ArduinoIoTCloudClass::connect()
// Username: device id
// Password: empty
if (!_mqttClient->connect(_brokerAddress.c_str(), _brokerPort)) {
return 0;
return CONNECT_FAILURE;
}
_mqttClient->subscribe(_stdinTopic);
_mqttClient->subscribe(_dataTopicIn);
_mqttClient->subscribe(_shadowTopicIn);

if(_mqttClient->subscribe(_stdinTopic ) == 0) return CONNECT_FAILURE_SUBSCRIBE;
if(_mqttClient->subscribe(_dataTopicIn ) == 0) return CONNECT_FAILURE_SUBSCRIBE;
if(_mqttClient->subscribe(_shadowTopicIn) == 0) return CONNECT_FAILURE_SUBSCRIBE;

_syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_WAIT_FOR_CLOUD_VALUES;
_lastSyncRequestTickTime = 0;

return 1;
return CONNECT_SUCCESS;
}

bool ArduinoIoTCloudClass::disconnect()
Expand Down Expand Up @@ -405,15 +410,18 @@ void ArduinoIoTCloudClass::connectionCheck()
}
break;
case IOT_STATUS_CLOUD_CONNECTING:
int arduinoIoTConnectionAttempt;
arduinoIoTConnectionAttempt = connect();
sprintf(msgBuffer, "ArduinoCloud.connect(): %d", arduinoIoTConnectionAttempt);
int const ret_code_connect = connect();
sprintf(msgBuffer, "ArduinoCloud.connect(): %d", ret_code_connect);
debugMessage(msgBuffer, 4);
if (arduinoIoTConnectionAttempt == 1) {
if (ret_code_connect == CONNECT_SUCCESS) {
setIoTConnectionState(IOT_STATUS_CLOUD_CONNECTED);
CloudSerial.begin(9600);
CloudSerial.println("Hello from Cloud Serial!");
}
else if (ret_code_connect == CONNECT_FAILURE_SUBSCRIBE) {
sprintf(msgBuffer, "ERROR - Please verify your THING ID");
debugMessage(msgBuffer, 0);
}
break;
}
}
Expand Down