Skip to content

Commit 9b53a41

Browse files
committed
Renaming _iotStatus to _iot_status to have consistent variable naming across all files
1 parent cd4b745 commit 9b53a41

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/ArduinoIoTCloud.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ NetworkConnectionState ArduinoIoTCloudClass::checkPhyConnection()
151151

152152
if (_connection->check() != NetworkConnectionState::CONNECTED)
153153
{
154-
if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
154+
if (_iot_status == ArduinoIoTConnectionStatus::CONNECTED)
155155
{
156156
disconnect();
157157
}

src/ArduinoIoTCloud.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ class ArduinoIoTCloudClass
134134

135135
protected:
136136

137-
inline ArduinoIoTConnectionStatus getIoTStatus() { return _iotStatus; }
137+
inline ArduinoIoTConnectionStatus getIoTStatus() { return _iot_status; }
138138

139139
ConnectionHandler * _connection = nullptr;
140140
ArduinoCloudThing _thing;
141-
ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
141+
ArduinoIoTConnectionStatus _iot_status = ArduinoIoTConnectionStatus::IDLE;
142142

143143
NetworkConnectionState checkPhyConnection();
144144
void execCloudEventCallback(ArduinoIoTCloudEvent const event);

src/ArduinoIoTCloudLPWAN.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void ArduinoIoTCloudLPWAN::update() {
7373
// Check if a primitive property wrapper is locally changed
7474
_thing.updateTimestampOnLocallyChangedProperties();
7575

76-
ArduinoIoTConnectionStatus next_iot_status = _iotStatus;
76+
ArduinoIoTConnectionStatus next_iot_status = _iot_status;
7777

7878
/* Since we do not have a direct connection to the Arduino IoT Cloud servers
7979
* there is no such thing is a 'cloud connection state' since the LoRa
@@ -84,10 +84,10 @@ void ArduinoIoTCloudLPWAN::update() {
8484
else if(net_con_state == NetworkConnectionState::CONNECTING) { next_iot_status = ArduinoIoTConnectionStatus::CONNECTING; }
8585
else if(net_con_state == NetworkConnectionState::DISCONNECTED) { next_iot_status = ArduinoIoTConnectionStatus::DISCONNECTED; execCloudEventCallback(ArduinoIoTCloudEvent::DISCONNECT); }
8686

87-
if(next_iot_status != _iotStatus)
87+
if(next_iot_status != _iot_status)
8888
{
8989
printConnectionStatus(next_iot_status);
90-
_iotStatus = next_iot_status;
90+
_iot_status = next_iot_status;
9191
}
9292

9393
if(net_con_state != NetworkConnectionState::CONNECTED) return;

src/ArduinoIoTCloudTCP.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
130130
_thing.begin();
131131
_thing.registerGetTimeCallbackFunc(getTime);
132132

133-
printConnectionStatus(_iotStatus);
133+
printConnectionStatus(_iot_status);
134134

135135
return 1;
136136
}
@@ -275,9 +275,9 @@ void ArduinoIoTCloudTCP::requestLastValue() {
275275

276276
ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
277277
{
278-
ArduinoIoTConnectionStatus next_iot_status = _iotStatus;
278+
ArduinoIoTConnectionStatus next_iot_status = _iot_status;
279279

280-
switch (_iotStatus)
280+
switch (_iot_status)
281281
{
282282
case ArduinoIoTConnectionStatus::IDLE: next_iot_status = ArduinoIoTConnectionStatus::CONNECTING; break;
283283
case ArduinoIoTConnectionStatus::ERROR: next_iot_status = ArduinoIoTConnectionStatus::RECONNECTING; break;
@@ -322,15 +322,15 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
322322
break;
323323
}
324324

325-
if(next_iot_status != _iotStatus)
325+
if(next_iot_status != _iot_status)
326326
{
327327
printConnectionStatus(next_iot_status);
328328
if (next_iot_status == ArduinoIoTConnectionStatus::DISCONNECTED) execCloudEventCallback(ArduinoIoTCloudEvent::DISCONNECT);
329329
else if(next_iot_status == ArduinoIoTConnectionStatus::CONNECTED) execCloudEventCallback(ArduinoIoTCloudEvent::CONNECT);
330-
_iotStatus = next_iot_status;
330+
_iot_status = next_iot_status;
331331
}
332332

333-
return _iotStatus;
333+
return _iot_status;
334334
}
335335

336336
int ArduinoIoTCloudTCP::write(String const topic, byte const data[], int const length)

0 commit comments

Comments
 (0)