Skip to content

Commit 27a6af7

Browse files
aentingeraentinger
committed
Use braces for every switch-case statement
1 parent 0c2d7bf commit 27a6af7

4 files changed

+96
-91
lines changed

‎src/ArduinoIoTCloud.cpp

+21-26
Original file line numberDiff line numberDiff line change
@@ -387,22 +387,26 @@ void ArduinoIoTCloudClass::connectionCheck()
387387
}
388388

389389
switch (iotStatus) {
390-
case IOT_STATUS_CLOUD_IDLE:
390+
case IOT_STATUS_CLOUD_IDLE: {
391391
setIoTConnectionState(IOT_STATUS_CLOUD_CONNECTING);
392-
break;
393-
case IOT_STATUS_CLOUD_ERROR:
392+
}
393+
break;
394+
case IOT_STATUS_CLOUD_ERROR: {
394395
debugMessage(DebugLevel::Error, "Cloud Error. Retrying...");
395396
setIoTConnectionState(IOT_STATUS_CLOUD_RECONNECTING);
396-
break;
397-
case IOT_STATUS_CLOUD_CONNECTED:
397+
}
398+
break;
399+
case IOT_STATUS_CLOUD_CONNECTED: {
398400
debugMessageNoTimestamp(DebugLevel::Verbose, ".");
399401
if (!_mqttClient->connected()){
400402
setIoTConnectionState(IOT_STATUS_CLOUD_DISCONNECTED);
401403
}
402-
break;
403-
case IOT_STATUS_CLOUD_DISCONNECTED:
404+
}
405+
break;
406+
case IOT_STATUS_CLOUD_DISCONNECTED: {
404407
setIoTConnectionState(IOT_STATUS_CLOUD_RECONNECTING);
405-
break;
408+
}
409+
break;
406410
case IOT_STATUS_CLOUD_RECONNECTING: {
407411
int const ret_code_reconnect = reconnect(*_net);
408412
debugMessage(DebugLevel::Info, "ArduinoCloud.reconnect(): %d", ret_code_reconnect);
@@ -412,8 +416,8 @@ void ArduinoIoTCloudClass::connectionCheck()
412416
CloudSerial.println("Hello from Cloud Serial!");
413417
}
414418
}
415-
break;
416-
case IOT_STATUS_CLOUD_CONNECTING:
419+
break;
420+
case IOT_STATUS_CLOUD_CONNECTING: {
417421
int const ret_code_connect = connect();
418422
debugMessage(DebugLevel::Verbose, "ArduinoCloud.connect(): %d", ret_code_connect);
419423
if (ret_code_connect == CONNECT_SUCCESS) {
@@ -424,28 +428,19 @@ void ArduinoIoTCloudClass::connectionCheck()
424428
else if (ret_code_connect == CONNECT_FAILURE_SUBSCRIBE) {
425429
debugMessage(DebugLevel::Info, "ERROR - Please verify your THING ID");
426430
}
427-
break;
431+
}
432+
break;
428433
}
429434
}
430435

431436
void ArduinoIoTCloudClass::setIoTConnectionState(ArduinoIoTConnectionStatus _newState)
432437
{
433438
switch(_newState){
434-
case IOT_STATUS_CLOUD_ERROR:
435-
debugMessage(DebugLevel::Error, "Arduino, we have a problem.");
436-
break;
437-
case IOT_STATUS_CLOUD_CONNECTING:
438-
debugMessage(DebugLevel::Error, "Connecting to Arduino IoT Cloud...");
439-
break;
440-
case IOT_STATUS_CLOUD_RECONNECTING:
441-
debugMessage(DebugLevel::Error, "Reconnecting to Arduino IoT Cloud...");
442-
break;
443-
case IOT_STATUS_CLOUD_CONNECTED:
444-
debugMessage(DebugLevel::Error, "Connected to Arduino IoT Cloud");
445-
break;
446-
case IOT_STATUS_CLOUD_DISCONNECTED:
447-
debugMessage(DebugLevel::Error, "Disconnected from Arduino IoT Cloud");
448-
break;
439+
case IOT_STATUS_CLOUD_ERROR: debugMessage(DebugLevel::Error, "Arduino, we have a problem."); break;
440+
case IOT_STATUS_CLOUD_CONNECTING: debugMessage(DebugLevel::Error, "Connecting to Arduino IoT Cloud..."); break;
441+
case IOT_STATUS_CLOUD_RECONNECTING: debugMessage(DebugLevel::Error, "Reconnecting to Arduino IoT Cloud..."); break;
442+
case IOT_STATUS_CLOUD_CONNECTED: debugMessage(DebugLevel::Error, "Connected to Arduino IoT Cloud"); break;
443+
case IOT_STATUS_CLOUD_DISCONNECTED: debugMessage(DebugLevel::Error, "Disconnected from Arduino IoT Cloud"); break;
449444
}
450445
iotStatus = _newState;
451446
}

‎src/EthernetConnectionManager.cpp

+21-27
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void EthConnectionManager::check() {
5757
int networkStatus = 0;
5858
if (now - lastConnectionTickTime > connectionTickTimeInterval) {
5959
switch (netConnectionState) {
60-
case CONNECTION_STATE_INIT:
60+
case CONNECTION_STATE_INIT: {
6161
if (ss_pin == -1) {
6262
networkStatus = Ethernet.begin(mac);
6363
} else {
@@ -83,8 +83,9 @@ void EthConnectionManager::check() {
8383
}
8484
debugMessage(DebugLevel::Error, "Ethernet shield recognized: ID", Ethernet.hardwareStatus());
8585
changeConnectionState(CONNECTION_STATE_CONNECTING);
86-
break;
87-
case CONNECTION_STATE_CONNECTING:
86+
}
87+
break;
88+
case CONNECTION_STATE_CONNECTING: {
8889
debugMessage(DebugLevel::Info, "Connecting via dhcp");
8990
if (ss_pin == -1) {
9091
networkStatus = Ethernet.begin(mac);
@@ -102,8 +103,9 @@ void EthConnectionManager::check() {
102103
changeConnectionState(CONNECTION_STATE_GETTIME);
103104
return;
104105
}
105-
break;
106-
case CONNECTION_STATE_GETTIME:
106+
}
107+
break;
108+
case CONNECTION_STATE_GETTIME: {
107109
debugMessage(DebugLevel::Debug, "Acquiring Time from Network");
108110
unsigned long networkTime;
109111
networkTime = getTime();
@@ -112,8 +114,9 @@ void EthConnectionManager::check() {
112114
lastValidTimestamp = networkTime;
113115
changeConnectionState(CONNECTION_STATE_CONNECTED);
114116
}
115-
break;
116-
case CONNECTION_STATE_CONNECTED:
117+
}
118+
break;
119+
case CONNECTION_STATE_CONNECTED: {
117120
// keep testing connection
118121
Ethernet.maintain();
119122
networkStatus = Ethernet.linkStatus();
@@ -123,13 +126,15 @@ void EthConnectionManager::check() {
123126
return;
124127
}
125128
debugMessage(DebugLevel::Info, "Connected");
126-
break;
127-
case CONNECTION_STATE_DISCONNECTED:
129+
}
130+
break;
131+
case CONNECTION_STATE_DISCONNECTED: {
128132
debugMessage(DebugLevel::Error, "Connection lost.");
129133
debugMessage(DebugLevel::Info, "Attempting reconnection");
130134
changeConnectionState(CONNECTION_STATE_CONNECTING);
131-
//wifiClient.stop();
132-
break;
135+
//wifiClient.stop();
136+
}
137+
break;
133138
}
134139
lastConnectionTickTime = now;
135140
}
@@ -143,22 +148,11 @@ void EthConnectionManager::changeConnectionState(NetworkConnectionState _newStat
143148
netConnectionState = _newState;
144149
int newInterval = CHECK_INTERVAL_IDLE;
145150
switch (_newState) {
146-
case CONNECTION_STATE_INIT:
147-
newInterval = CHECK_INTERVAL_INIT;
148-
break;
149-
case CONNECTION_STATE_CONNECTING:
150-
newInterval = CHECK_INTERVAL_CONNECTING;
151-
break;
152-
case CONNECTION_STATE_GETTIME:
153-
newInterval = CHECK_INTERVAL_GETTIME;
154-
break;
155-
case CONNECTION_STATE_CONNECTED:
156-
newInterval = CHECK_INTERVAL_CONNECTED;
157-
break;
158-
case CONNECTION_STATE_DISCONNECTED:
159-
newInterval = CHECK_INTERVAL_DISCONNECTED;
160-
161-
break;
151+
case CONNECTION_STATE_INIT: newInterval = CHECK_INTERVAL_INIT; break;
152+
case CONNECTION_STATE_CONNECTING: newInterval = CHECK_INTERVAL_CONNECTING; break;
153+
case CONNECTION_STATE_GETTIME: newInterval = CHECK_INTERVAL_GETTIME; break;
154+
case CONNECTION_STATE_CONNECTED: newInterval = CHECK_INTERVAL_CONNECTED; break;
155+
case CONNECTION_STATE_DISCONNECTED: newInterval = CHECK_INTERVAL_DISCONNECTED; break;
162156
}
163157
connectionTickTimeInterval = newInterval;
164158
lastConnectionTickTime = millis();

‎src/GSMConnectionManager.cpp

+27-19
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ void GSMConnectionManager::check() {
6767
int gsmAccessAlive;
6868
if (now - lastConnectionTickTime > connectionTickTimeInterval) {
6969
switch (netConnectionState) {
70-
case CONNECTION_STATE_INIT:
70+
case CONNECTION_STATE_INIT: {
7171
init();
72-
break;
73-
case CONNECTION_STATE_CONNECTING:
72+
}
73+
break;
74+
case CONNECTION_STATE_CONNECTING: {
7475
// NOTE: Blocking Call when 4th parameter == true
7576
GSM3_NetworkStatus_t networkStatus;
7677
networkStatus = gprs.attachGPRS(apn, login, pass, true);
@@ -93,20 +94,23 @@ void GSMConnectionManager::check() {
9394
changeConnectionState(CONNECTION_STATE_CONNECTED);
9495
return;
9596
}
96-
break;
97-
case CONNECTION_STATE_CONNECTED:
97+
}
98+
break;
99+
case CONNECTION_STATE_CONNECTED: {
98100
gsmAccessAlive = gsmAccess.isAccessAlive();
99101
debugMessage(DebugLevel::Verbose, "GPRS.isAccessAlive(): %d", gsmAccessAlive);
100102
if (gsmAccessAlive != 1) {
101103
changeConnectionState(CONNECTION_STATE_DISCONNECTED);
102104
return;
103105
}
104106
debugMessage(DebugLevel::Verbose, "Connected to Cellular Network");
105-
break;
106-
case CONNECTION_STATE_DISCONNECTED:
107+
}
108+
break;
109+
case CONNECTION_STATE_DISCONNECTED: {
107110
gprs.detachGPRS();
108111
changeConnectionState(CONNECTION_STATE_CONNECTING);
109-
break;
112+
}
113+
break;
110114
}
111115
lastConnectionTickTime = now;
112116
}
@@ -117,29 +121,33 @@ void GSMConnectionManager::check() {
117121
******************************************************************************/
118122

119123
void GSMConnectionManager::changeConnectionState(NetworkConnectionState _newState) {
120-
char msgBuffer[120];
121124
int newInterval = CHECK_INTERVAL_IDLE;
122125
switch (_newState) {
123-
case CONNECTION_STATE_INIT:
126+
case CONNECTION_STATE_INIT: {
124127
newInterval = CHECK_INTERVAL_INIT;
125-
break;
126-
case CONNECTION_STATE_CONNECTING:
128+
}
129+
break;
130+
case CONNECTION_STATE_CONNECTING: {
127131
debugMessage(DebugLevel::Info, "Connecting to Cellular Network");
128132
newInterval = CHECK_INTERVAL_CONNECTING;
129-
break;
130-
case CONNECTION_STATE_CONNECTED:
133+
}
134+
break;
135+
case CONNECTION_STATE_CONNECTED: {
131136
newInterval = CHECK_INTERVAL_CONNECTED;
132-
break;
133-
case CONNECTION_STATE_DISCONNECTED:
137+
}
138+
break;
139+
case CONNECTION_STATE_DISCONNECTED: {
134140
if(netConnectionState == CONNECTION_STATE_CONNECTED){
135141
debugMessage(DebugLevel::Error, "Disconnected from Cellular Network");
136142
debugMessage(DebugLevel::Error, "Attempting reconnection");
137143
}
138144
newInterval = CHECK_INTERVAL_DISCONNECTED;
139-
break;
140-
case CONNECTION_STATE_ERROR:
145+
}
146+
break;
147+
case CONNECTION_STATE_ERROR: {
141148
debugMessage(DebugLevel::Error, "GPRS attach failed\n\rMake sure the antenna is connected and reset your board.");
142-
break;
149+
}
150+
break;
143151
}
144152
connectionTickTimeInterval = newInterval;
145153
lastConnectionTickTime = millis();

‎src/WiFiConnectionManager.cpp

+27-19
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void WiFiConnectionManager::check() {
5656
int networkStatus = 0;
5757
if (now - lastConnectionTickTime > connectionTickTimeInterval) {
5858
switch (netConnectionState) {
59-
case CONNECTION_STATE_INIT:
59+
case CONNECTION_STATE_INIT: {
6060
networkStatus = WiFi.status();
6161
debugMessage(DebugLevel::Info, "WiFi.status(): %d", networkStatus);
6262
if (networkStatus == NETWORK_HARDWARE_ERROR) {
@@ -72,8 +72,9 @@ void WiFiConnectionManager::check() {
7272
delay(5000);
7373
}
7474
changeConnectionState(CONNECTION_STATE_CONNECTING);
75-
break;
76-
case CONNECTION_STATE_CONNECTING:
75+
}
76+
break;
77+
case CONNECTION_STATE_CONNECTING: {
7778
networkStatus = WiFi.begin(ssid, pass);
7879
debugMessage(DebugLevel::Verbose, "WiFi.status(): %d", networkStatus);
7980
if (networkStatus != NETWORK_CONNECTED) {
@@ -86,8 +87,9 @@ void WiFiConnectionManager::check() {
8687
changeConnectionState(CONNECTION_STATE_CONNECTED);
8788
return;
8889
}
89-
break;
90-
case CONNECTION_STATE_CONNECTED:
90+
}
91+
break;
92+
case CONNECTION_STATE_CONNECTED: {
9193
// keep testing connection
9294
networkStatus = WiFi.status();
9395
debugMessage(DebugLevel::Verbose, "WiFi.status(): %d", networkStatus);
@@ -96,11 +98,13 @@ void WiFiConnectionManager::check() {
9698
return;
9799
}
98100
debugMessage(DebugLevel::Verbose, "Connected to \"%s\"", ssid);
99-
break;
100-
case CONNECTION_STATE_DISCONNECTED:
101+
}
102+
break;
103+
case CONNECTION_STATE_DISCONNECTED: {
101104
WiFi.end();
102105
changeConnectionState(CONNECTION_STATE_CONNECTING);
103-
break;
106+
}
107+
break;
104108
}
105109
lastConnectionTickTime = now;
106110
}
@@ -111,29 +115,33 @@ void WiFiConnectionManager::check() {
111115
******************************************************************************/
112116

113117
void WiFiConnectionManager::changeConnectionState(NetworkConnectionState _newState) {
114-
char msgBuffer[120];
115118
int newInterval = CHECK_INTERVAL_INIT;
116119
switch (_newState) {
117-
case CONNECTION_STATE_INIT:
120+
case CONNECTION_STATE_INIT: {
118121
newInterval = CHECK_INTERVAL_INIT;
119-
break;
120-
case CONNECTION_STATE_CONNECTING:
122+
}
123+
break;
124+
case CONNECTION_STATE_CONNECTING: {
121125
debugMessage(DebugLevel::Info, "Connecting to \"%s\"", ssid);
122126
newInterval = CHECK_INTERVAL_CONNECTING;
123-
break;
124-
case CONNECTION_STATE_CONNECTED:
127+
}
128+
break;
129+
case CONNECTION_STATE_CONNECTED: {
125130
newInterval = CHECK_INTERVAL_CONNECTED;
126-
break;
127-
case CONNECTION_STATE_DISCONNECTED:
131+
}
132+
break;
133+
case CONNECTION_STATE_DISCONNECTED: {
128134
debugMessage(DebugLevel::Verbose, "WiFi.status(): %d", WiFi.status());
129135
debugMessage(DebugLevel::Error, "Connection to \"%s\" lost.", ssid);
130136
debugMessage(DebugLevel::Error, "Attempting reconnection");
131137
newInterval = CHECK_INTERVAL_DISCONNECTED;
132-
break;
133-
case CONNECTION_STATE_ERROR:
138+
}
139+
break;
140+
case CONNECTION_STATE_ERROR: {
134141
debugMessage(DebugLevel::Error, "WiFi Hardware failure.\nMake sure you are using a WiFi enabled board/shield.");
135142
debugMessage(DebugLevel::Error, "Then reset and retry.");
136-
break;
143+
}
144+
break;
137145
}
138146
connectionTickTimeInterval = newInterval;
139147
lastConnectionTickTime = millis();

0 commit comments

Comments
 (0)