Skip to content

All registration of callbacks for various "on connection attempt" failures #243

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

All registration of callbacks for various "on connection attempt" failures #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5789902
Provide additional callbacks to register functions for various 'on-co…
aentinger Apr 21, 2021
62be681
Adding methods to keywords.txt.
aentinger Apr 21, 2021
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
3 changes: 3 additions & 0 deletions keywords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ setDeviceId KEYWORD2
getDeviceId KEYWORD2
getConnection KEYWORD2
addCallback KEYWORD2
onPhyConnectionFailure KEYWORD2
onMQTTConnectionFailure KEYWORD2
onMQTTSubscriptionFailure KEYWORD2
addProperty KEYWORD2

# ArduinoIoTCloudLPWAN.h
Expand Down
9 changes: 7 additions & 2 deletions src/ArduinoIoTCloud.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ enum class ArduinoIoTConnectionStatus

enum class ArduinoIoTCloudEvent : size_t
{
SYNC = 0, CONNECT = 1, DISCONNECT = 2
SYNC = 0, CONNECT = 1, DISCONNECT = 2, MOTT_CONNECT_FAILURE = 3, MOTT_SUBSCRIBE_FAILURE = 4
};

typedef void (*OnCloudEventCallback)(void);
Expand Down Expand Up @@ -100,6 +100,11 @@ class ArduinoIoTCloudClass

void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);

inline void onPhyConnectionFailure (OnCloudEventCallback func) { if (_connection) _connection->addCallback(NetworkConnectionEvent::CONNECTION_FAILED, func); }
inline void onMQTTConnectionFailure (OnCloudEventCallback func) { addCallback(ArduinoIoTCloudEvent::MOTT_CONNECT_FAILURE, func); }
inline void onMQTTSubscriptionFailure(OnCloudEventCallback func) { addCallback(ArduinoIoTCloudEvent::MOTT_SUBSCRIBE_FAILURE, func); }


#define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)

/* The following methods are used for non-LoRa boards which can use the
Expand Down Expand Up @@ -148,7 +153,7 @@ class ArduinoIoTCloudClass

String _thing_id = "";
String _device_id = "";
OnCloudEventCallback _cloud_event_callback[3] = {nullptr};
OnCloudEventCallback _cloud_event_callback[5] = {nullptr};
};

#ifdef HAS_TCP
Expand Down
4 changes: 4 additions & 0 deletions src/ArduinoIoTCloudTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,8 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
if (_mqttClient.connect(_brokerAddress.c_str(), _brokerPort))
return State::SubscribeMqttTopics;

execCloudEventCallback(ArduinoIoTCloudEvent::MOTT_CONNECT_FAILURE);

DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not connect to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
return State::ConnectPhy;
}
Expand All @@ -374,6 +376,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeMqttTopics()
#if !defined(__AVR__)
DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
#endif
execCloudEventCallback(ArduinoIoTCloudEvent::MOTT_SUBSCRIBE_FAILURE);
return State::SubscribeMqttTopics;
}

Expand All @@ -385,6 +388,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeMqttTopics()
#if !defined(__AVR__)
DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
#endif
execCloudEventCallback(ArduinoIoTCloudEvent::MOTT_SUBSCRIBE_FAILURE);
return State::SubscribeMqttTopics;
}
}
Expand Down