Skip to content

Commit 45a2847

Browse files
committed
Extracting function checkPhyConnection into base class ArduinoIoTCloudClass
1 parent 0dbffd7 commit 45a2847

File tree

6 files changed

+17
-33
lines changed

6 files changed

+17
-33
lines changed

src/ArduinoIoTCloud.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,24 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, St
142142
}
143143

144144
/******************************************************************************
145-
* PRIVATE MEMBER FUNCTIONS
145+
* PROTECTED MEMBER FUNCTIONS
146146
******************************************************************************/
147147

148+
NetworkConnectionState ArduinoIoTCloudClass::checkPhyConnection()
149+
{
150+
NetworkConnectionState const connect_state = _connection->check();
151+
152+
if (_connection->check() != NetworkConnectionState::CONNECTED)
153+
{
154+
if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
155+
{
156+
disconnect();
157+
}
158+
}
159+
160+
return connect_state;
161+
}
162+
148163
void ArduinoIoTCloudClass::execCloudEventCallback(ArduinoIoTCloudEvent const event)
149164
{
150165
OnCloudEventCallback callback = _cloud_event_callback[static_cast<size_t>(event)];

src/ArduinoIoTCloud.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ class ArduinoIoTCloudClass
140140
ArduinoCloudThing _thing;
141141
ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
142142

143+
NetworkConnectionState checkPhyConnection();
143144
void execCloudEventCallback(ArduinoIoTCloudEvent const event);
144145
static void printConnectionStatus(ArduinoIoTConnectionStatus status);
145146

src/ArduinoIoTCloudLPWAN.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,6 @@ int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length) {
121121
return 1;
122122
}
123123

124-
NetworkConnectionState ArduinoIoTCloudLPWAN::checkPhyConnection()
125-
{
126-
NetworkConnectionState const connect_state = _connection->check();
127-
128-
if (_connection->check() != NetworkConnectionState::CONNECTED)
129-
{
130-
if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
131-
{
132-
disconnect();
133-
}
134-
}
135-
136-
return connect_state;
137-
}
138-
139124
ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::checkCloudConnection()
140125
{
141126
switch (_iotStatus) {

src/ArduinoIoTCloudLPWAN.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
5959

6060
void sendPropertiesToCloud();
6161
int writeProperties(const byte data[], int length);
62-
NetworkConnectionState checkPhyConnection();
6362
ArduinoIoTConnectionStatus checkCloudConnection();
6463
};
6564

src/ArduinoIoTCloudTCP.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -273,21 +273,6 @@ void ArduinoIoTCloudTCP::requestLastValue() {
273273
write(_shadowTopicOut, CBOR_REQUEST_LAST_VALUE_MSG, sizeof(CBOR_REQUEST_LAST_VALUE_MSG));
274274
}
275275

276-
NetworkConnectionState ArduinoIoTCloudTCP::checkPhyConnection()
277-
{
278-
NetworkConnectionState const connect_state = _connection->check();
279-
280-
if (_connection->check() != NetworkConnectionState::CONNECTED)
281-
{
282-
if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
283-
{
284-
disconnect();
285-
}
286-
}
287-
288-
return connect_state;
289-
}
290-
291276
ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
292277
{
293278
ArduinoIoTConnectionStatus next_iot_status = _iotStatus;

src/ArduinoIoTCloudTCP.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
119119
void handleMessage(int length);
120120
void sendPropertiesToCloud();
121121
void requestLastValue();
122-
NetworkConnectionState checkPhyConnection();
123122
ArduinoIoTConnectionStatus checkCloudConnection();
124123
int write(String const topic, byte const data[], int const length);
125124
};

0 commit comments

Comments
 (0)