Skip to content

Commit a39cd77

Browse files
aentingeraentinger
committed
Prefixing member variable netConnectionState with '_' to mark it as a member variable
1 parent ffaa0f1 commit a39cd77

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎src/Arduino_ConnectionHandler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class ConnectionHandler {
151151
#endif
152152

153153
virtual NetworkConnectionState getStatus() __attribute__((deprecated)) {
154-
return netConnectionState;
154+
return _netConnectionState;
155155
}
156156
virtual void connect() = 0;
157157
virtual void disconnect() = 0;
@@ -162,7 +162,7 @@ class ConnectionHandler {
162162

163163
protected:
164164

165-
NetworkConnectionState netConnectionState = NetworkConnectionState::INIT;
165+
NetworkConnectionState _netConnectionState = NetworkConnectionState::INIT;
166166

167167
void execCallback(NetworkConnectionEvent const event, void * callback_arg);
168168

‎src/Arduino_GSMConnectionHandler.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,41 +77,41 @@ unsigned long GSMConnectionHandler::getTime()
7777
NetworkConnectionState GSMConnectionHandler::check()
7878
{
7979
unsigned long const now = millis();
80-
unsigned int const connectionTickTimeInterval = CHECK_INTERVAL_TABLE[static_cast<unsigned int>(netConnectionState)];
80+
unsigned int const connectionTickTimeInterval = CHECK_INTERVAL_TABLE[static_cast<unsigned int>(_netConnectionState)];
8181

8282
if((now - _lastConnectionTickTime) > connectionTickTimeInterval)
8383
{
8484
_lastConnectionTickTime = now;
8585

86-
switch (netConnectionState)
86+
switch (_netConnectionState)
8787
{
88-
case NetworkConnectionState::INIT: netConnectionState = update_handleInit(); break;
89-
case NetworkConnectionState::CONNECTING: netConnectionState = update_handleConnecting(); break;
90-
case NetworkConnectionState::CONNECTED: netConnectionState = update_handleConnected(); break;
88+
case NetworkConnectionState::INIT: _netConnectionState = update_handleInit(); break;
89+
case NetworkConnectionState::CONNECTING: _netConnectionState = update_handleConnecting(); break;
90+
case NetworkConnectionState::CONNECTED: _netConnectionState = update_handleConnected(); break;
9191
case NetworkConnectionState::GETTIME: /* Unused */ break;
92-
case NetworkConnectionState::DISCONNECTING: netConnectionState = update_handleDisconnecting(); break;
93-
case NetworkConnectionState::DISCONNECTED: netConnectionState = update_handleDisconnected(); break;
92+
case NetworkConnectionState::DISCONNECTING: _netConnectionState = update_handleDisconnecting(); break;
93+
case NetworkConnectionState::DISCONNECTED: _netConnectionState = update_handleDisconnected(); break;
9494
case NetworkConnectionState::ERROR: break;
9595
case NetworkConnectionState::CLOSED: break;
9696
}
9797
}
9898

99-
return netConnectionState;
99+
return _netConnectionState;
100100
}
101101

102102
void GSMConnectionHandler::disconnect()
103103
{
104104
_gsm.shutdown();
105105
_keep_alive = false;
106-
netConnectionState = NetworkConnectionState::DISCONNECTING;
106+
_netConnectionState = NetworkConnectionState::DISCONNECTING;
107107
}
108108

109109
void GSMConnectionHandler::connect()
110110
{
111-
if (netConnectionState != NetworkConnectionState::INIT && netConnectionState != NetworkConnectionState::CONNECTING)
111+
if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
112112
{
113113
_keep_alive = true;
114-
netConnectionState = NetworkConnectionState::INIT;
114+
_netConnectionState = NetworkConnectionState::INIT;
115115
}
116116
}
117117

‎src/Arduino_LoRaConnectionHandler.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,25 @@ LoRaConnectionHandler::LoRaConnectionHandler(char const * appeui, char const * a
7878
NetworkConnectionState LoRaConnectionHandler::check()
7979
{
8080
unsigned long const now = millis();
81-
unsigned int const connectionTickTimeInterval = CHECK_INTERVAL_TABLE[static_cast<unsigned int>(netConnectionState)];
81+
unsigned int const connectionTickTimeInterval = CHECK_INTERVAL_TABLE[static_cast<unsigned int>(_netConnectionState)];
8282

8383
if((now - _lastConnectionTickTime) > connectionTickTimeInterval)
8484
{
8585
_lastConnectionTickTime = now;
8686

87-
switch (netConnectionState)
87+
switch (_netConnectionState)
8888
{
89-
case NetworkConnectionState::INIT: netConnectionState = update_handleInit(); break;
90-
case NetworkConnectionState::CONNECTING: netConnectionState = update_handleConnecting(); break;
91-
case NetworkConnectionState::CONNECTED: netConnectionState = update_handleConnected(); break;
92-
case NetworkConnectionState::DISCONNECTING: netConnectionState = update_handleDisconnecting(); break;
93-
case NetworkConnectionState::DISCONNECTED: netConnectionState = update_handleDisconnected(); break;
89+
case NetworkConnectionState::INIT: _netConnectionState = update_handleInit(); break;
90+
case NetworkConnectionState::CONNECTING: _netConnectionState = update_handleConnecting(); break;
91+
case NetworkConnectionState::CONNECTED: _netConnectionState = update_handleConnected(); break;
92+
case NetworkConnectionState::DISCONNECTING: _netConnectionState = update_handleDisconnecting(); break;
93+
case NetworkConnectionState::DISCONNECTED: _netConnectionState = update_handleDisconnected(); break;
9494
case NetworkConnectionState::ERROR: break;
9595
case NetworkConnectionState::CLOSED: break;
9696
}
9797
}
9898

99-
return netConnectionState;
99+
return _netConnectionState;
100100
}
101101

102102
int LoRaConnectionHandler::write(const uint8_t * buf, size_t size)
@@ -139,10 +139,10 @@ bool LoRaConnectionHandler::available()
139139

140140
void LoRaConnectionHandler::connect()
141141
{
142-
if (netConnectionState != NetworkConnectionState::INIT && netConnectionState != NetworkConnectionState::CONNECTING)
142+
if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
143143
{
144144
_keep_alive = true;
145-
netConnectionState = NetworkConnectionState::INIT;
145+
_netConnectionState = NetworkConnectionState::INIT;
146146
}
147147
}
148148
void LoRaConnectionHandler::disconnect()

‎src/Arduino_NBConnectionHandler.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ NetworkConnectionState NBConnectionHandler::check() {
8282
unsigned long const now = millis();
8383
int nbAccessAlive;
8484
if (now - lastConnectionTickTime > connectionTickTimeInterval) {
85-
switch (netConnectionState) {
85+
switch (_netConnectionState) {
8686
case NetworkConnectionState::INIT: {
8787
init();
8888
}
@@ -96,7 +96,7 @@ NetworkConnectionState NBConnectionHandler::check() {
9696
if (networkStatus == NB_NetworkStatus_t::ERROR) {
9797
// NO FURTHER ACTION WILL FOLLOW THIS
9898
changeConnectionState(NetworkConnectionState::ERROR);
99-
return netConnectionState;
99+
return _netConnectionState;
100100
}
101101
Debug.print(DBG_INFO, "Sending PING to outer space...");
102102
int pingResult;
@@ -106,11 +106,11 @@ NetworkConnectionState NBConnectionHandler::check() {
106106
if (pingResult < 0) {
107107
Debug.print(DBG_ERROR, "PING failed");
108108
Debug.print(DBG_INFO, "Retrying in \"%d\" milliseconds", connectionTickTimeInterval);
109-
return netConnectionState;
109+
return _netConnectionState;
110110
} else {
111111
Debug.print(DBG_INFO, "Connected to GPRS Network");
112112
changeConnectionState(NetworkConnectionState::CONNECTED);
113-
return netConnectionState;
113+
return _netConnectionState;
114114
}
115115
}
116116
break;
@@ -119,7 +119,7 @@ NetworkConnectionState NBConnectionHandler::check() {
119119
Debug.print(DBG_VERBOSE, "GPRS.isAccessAlive(): %d", nbAccessAlive);
120120
if (nbAccessAlive != 1) {
121121
changeConnectionState(NetworkConnectionState::DISCONNECTED);
122-
return netConnectionState;
122+
return _netConnectionState;
123123
}
124124
Debug.print(DBG_VERBOSE, "Connected to Cellular Network");
125125
}
@@ -139,7 +139,7 @@ NetworkConnectionState NBConnectionHandler::check() {
139139
lastConnectionTickTime = now;
140140
}
141141

142-
return netConnectionState;
142+
return _netConnectionState;
143143
}
144144

145145
/******************************************************************************
@@ -171,7 +171,7 @@ void NBConnectionHandler::changeConnectionState(NetworkConnectionState _newState
171171
nbAccess.shutdown();
172172
}
173173
case NetworkConnectionState::DISCONNECTED: {
174-
if (netConnectionState == NetworkConnectionState::CONNECTED) {
174+
if (_netConnectionState == NetworkConnectionState::CONNECTED) {
175175
execCallback(NetworkConnectionEvent::DISCONNECTED, 0);
176176
Debug.print(DBG_ERROR, "Disconnected from Cellular Network");
177177
Debug.print(DBG_ERROR, "Attempting reconnection");
@@ -190,12 +190,12 @@ void NBConnectionHandler::changeConnectionState(NetworkConnectionState _newState
190190
}
191191
connectionTickTimeInterval = newInterval;
192192
lastConnectionTickTime = millis();
193-
netConnectionState = _newState;
193+
_netConnectionState = _newState;
194194
}
195195

196196

197197
void NBConnectionHandler::connect() {
198-
if (netConnectionState == NetworkConnectionState::INIT || netConnectionState == NetworkConnectionState::CONNECTING) {
198+
if (_netConnectionState == NetworkConnectionState::INIT || _netConnectionState == NetworkConnectionState::CONNECTING) {
199199
return;
200200
}
201201
keepAlive = true;

‎src/Arduino_WiFiConnectionHandler.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,26 @@ unsigned long WiFiConnectionHandler::getTime()
6868
NetworkConnectionState WiFiConnectionHandler::check()
6969
{
7070
unsigned long const now = millis();
71-
unsigned int const connectionTickTimeInterval = CHECK_INTERVAL_TABLE[static_cast<unsigned int>(netConnectionState)];
71+
unsigned int const connectionTickTimeInterval = CHECK_INTERVAL_TABLE[static_cast<unsigned int>(_netConnectionState)];
7272

7373
if((now - _lastConnectionTickTime) > connectionTickTimeInterval)
7474
{
7575
_lastConnectionTickTime = now;
7676

77-
switch (netConnectionState)
77+
switch (_netConnectionState)
7878
{
79-
case NetworkConnectionState::INIT: netConnectionState = update_handleInit (); break;
80-
case NetworkConnectionState::CONNECTING: netConnectionState = update_handleConnecting (); break;
81-
case NetworkConnectionState::CONNECTED: netConnectionState = update_handleConnected (); break;
82-
case NetworkConnectionState::GETTIME: netConnectionState = update_handleGetTime (); break;
83-
case NetworkConnectionState::DISCONNECTING: netConnectionState = update_handleDisconnecting(); break;
84-
case NetworkConnectionState::DISCONNECTED: netConnectionState = update_handleDisconnected (); break;
79+
case NetworkConnectionState::INIT: _netConnectionState = update_handleInit (); break;
80+
case NetworkConnectionState::CONNECTING: _netConnectionState = update_handleConnecting (); break;
81+
case NetworkConnectionState::CONNECTED: _netConnectionState = update_handleConnected (); break;
82+
case NetworkConnectionState::GETTIME: _netConnectionState = update_handleGetTime (); break;
83+
case NetworkConnectionState::DISCONNECTING: _netConnectionState = update_handleDisconnecting(); break;
84+
case NetworkConnectionState::DISCONNECTED: _netConnectionState = update_handleDisconnected (); break;
8585
case NetworkConnectionState::ERROR: break;
8686
case NetworkConnectionState::CLOSED: break;
8787
}
8888
}
8989

90-
return netConnectionState;
90+
return _netConnectionState;
9191
}
9292

9393
/******************************************************************************
@@ -96,17 +96,17 @@ NetworkConnectionState WiFiConnectionHandler::check()
9696

9797
void WiFiConnectionHandler::connect()
9898
{
99-
if (netConnectionState != NetworkConnectionState::INIT && netConnectionState != NetworkConnectionState::CONNECTING)
99+
if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
100100
{
101101
_keep_alive = true;
102-
netConnectionState = NetworkConnectionState::INIT;
102+
_netConnectionState = NetworkConnectionState::INIT;
103103
}
104104
}
105105

106106
void WiFiConnectionHandler::disconnect()
107107
{
108108
_keep_alive = false;
109-
netConnectionState = NetworkConnectionState::DISCONNECTING;
109+
_netConnectionState = NetworkConnectionState::DISCONNECTING;
110110
}
111111

112112
NetworkConnectionState WiFiConnectionHandler::update_handleInit()

0 commit comments

Comments
 (0)