Skip to content

Adding missing commits to #176 #177

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.

Sign up for GitHub

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
Jul 23, 2020
Merged

Adding missing commits to #176 #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 20 additions & 17 deletions src/ArduinoIoTCloudTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)

void ArduinoIoTCloudTCP::update()
{
/* Retrieve the latest data from the MQTT Client. */
if (_mqttClient.connected())
_mqttClient.poll();

/* Run through the state machine. */
State next_state = _state;
switch (_state)
Expand All @@ -182,6 +178,19 @@ void ArduinoIoTCloudTCP::update()
case State::Connected: next_state = handle_Connected(); break;
}
_state = next_state;

/* Check for new data from the MQTT client. */
if (_mqttClient.connected())
_mqttClient.poll();

#if OTA_ENABLED
/* If a _ota_logic object has been instantiated then we are spinning its
* 'update' method here in order to process incoming data and generally
* to transition to the OTA logic update states.
*/
OTAError const err = _ota_logic.update();
_ota_error = static_cast<int>(err);
#endif /* OTA_ENABLED */
}

int ArduinoIoTCloudTCP::connected()
Expand Down Expand Up @@ -231,7 +240,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
return State::SubscribeMqttTopics;

DBG_ERROR("ArduinoIoTCloudTCP::%s could not connect to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
return State::ConnectMqttBroker;
return State::ConnectPhy;
}

ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeMqttTopics()
Expand Down Expand Up @@ -290,28 +299,22 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
{
if (!_mqttClient.connected())
{
DBG_ERROR("ArduinoIoTCloudTCP::%s MQTT client connection lost", __FUNCTION__);

/* Forcefully disconnect MQTT client and trigger a reconnection. */
_mqttClient.stop();

/* The last message was definitely lost, trigger a retransmit. */
_mqtt_data_request_retransmit = true;

/* We are not connected anymore, trigger the callback for a disconnected event. */
execCloudEventCallback(ArduinoIoTCloudEvent::DISCONNECT);

/* Forcefully disconnect MQTT client and trigger a reconnection. */
_mqttClient.stop();
return State::ConnectMqttBroker;
return State::ConnectPhy;
}
/* We are connected so let's to our stuff here. */
else
{
#if OTA_ENABLED
/* If a _ota_logic object has been instantiated then we are spinning its
* 'update' method here in order to process incoming data and generally
* to transition to the OTA logic update states.
*/
OTAError const err = _ota_logic.update();
_ota_error = static_cast<int>(err);
#endif /* OTA_ENABLED */

/* Check if a primitive property wrapper is locally changed.
* This function requires an existing time service which in
* turn requires an established connection. Not having that
Expand Down