Skip to content

Commit c1292ff

Browse files
aentingeraentinger
committed
Remove NetworkConnectionState::GETTIME and share check interval table between all connection handlers
1 parent 8172a1d commit c1292ff

File tree

5 files changed

+19
-73
lines changed

5 files changed

+19
-73
lines changed

‎src/Arduino_ConnectionHandler.h‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,10 @@ enum class NetworkConnectionState : unsigned int {
117117
INIT = 0,
118118
CONNECTING = 1,
119119
CONNECTED = 2,
120-
GETTIME = 3,
121-
DISCONNECTING = 4,
122-
DISCONNECTED = 5,
123-
CLOSED = 6,
124-
ERROR = 7
120+
DISCONNECTING = 3,
121+
DISCONNECTED = 4,
122+
CLOSED = 5,
123+
ERROR = 6
125124
};
126125

127126
enum class NetworkConnectionEvent {
@@ -130,6 +129,21 @@ enum class NetworkConnectionEvent {
130129

131130
typedef void (*OnNetworkEventCallback)();
132131

132+
/******************************************************************************
133+
CONSTANTS
134+
******************************************************************************/
135+
136+
static unsigned int const CHECK_INTERVAL_TABLE[] =
137+
{
138+
/* INIT */ 100,
139+
/* CONNECTING */ 500,
140+
/* CONNECTED */ 10000,
141+
/* DISCONNECTING */ 100,
142+
/* DISCONNECTED */ 1000,
143+
/* CLOSED */ 1000,
144+
/* ERROR */ 1000
145+
};
146+
133147
/******************************************************************************
134148
CLASS DECLARATION
135149
******************************************************************************/

‎src/Arduino_GSMConnectionHandler.cpp‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
INCLUDE
2020
******************************************************************************/
2121

22-
/*
23-
static int const DBG_NONE = -1;
24-
static int const DBG_ERROR = 0;
25-
static int const DBG_WARNING = 1;
26-
static int const DBG_INFO = 2;
27-
static int const DBG_DEBUG = 3;
28-
static int const DBG_VERBOSE = 4;
29-
*/
30-
3122
#include "Arduino_GSMConnectionHandler.h"
3223

3324
#ifdef BOARD_HAS_GSM /* Only compile if this is a board with GSM */
@@ -38,18 +29,6 @@
3829

3930
static int const GSM_TIMEOUT = 30000;
4031

41-
static unsigned int const CHECK_INTERVAL_TABLE[] =
42-
{
43-
/* INIT */ 100,
44-
/* CONNECTING */ 500,
45-
/* CONNECTED */ 10000,
46-
/* GETTIME */ 100,
47-
/* DISCONNECTING */ 100,
48-
/* DISCONNECTED */ 1000,
49-
/* CLOSED */ 1000,
50-
/* ERROR */ 1000
51-
};
52-
5332
/******************************************************************************
5433
CTOR/DTOR
5534
******************************************************************************/
@@ -88,7 +67,6 @@ NetworkConnectionState GSMConnectionHandler::check()
8867
case NetworkConnectionState::INIT: _netConnectionState = update_handleInit(); break;
8968
case NetworkConnectionState::CONNECTING: _netConnectionState = update_handleConnecting(); break;
9069
case NetworkConnectionState::CONNECTED: _netConnectionState = update_handleConnected(); break;
91-
case NetworkConnectionState::GETTIME: /* Unused */ break;
9270
case NetworkConnectionState::DISCONNECTING: _netConnectionState = update_handleDisconnecting(); break;
9371
case NetworkConnectionState::DISCONNECTED: _netConnectionState = update_handleDisconnected(); break;
9472
case NetworkConnectionState::ERROR: break;

‎src/Arduino_LoRaConnectionHandler.cpp‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,6 @@ typedef enum
4040
LORA_ERROR_MAX_PACKET_SIZE = -20
4141
} LoRaCommunicationError;
4242

43-
/******************************************************************************
44-
CONSTANTS
45-
******************************************************************************/
46-
47-
static unsigned int const CHECK_INTERVAL_TABLE[] =
48-
{
49-
/* INIT */ 100,
50-
/* CONNECTING */ 500,
51-
/* CONNECTED */ 10000,
52-
/* GETTIME */ 100,
53-
/* DISCONNECTING */ 100,
54-
/* DISCONNECTED */ 1000,
55-
/* CLOSED */ 1000,
56-
/* ERROR */ 1000
57-
};
58-
5943
/******************************************************************************
6044
CTOR/DTOR
6145
******************************************************************************/

‎src/Arduino_NBConnectionHandler.cpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@
3838

3939
static int const NB_TIMEOUT = 30000;
4040

41-
static unsigned int const CHECK_INTERVAL_TABLE[] =
42-
{
43-
/* INIT */ 100,
44-
/* CONNECTING */ 500,
45-
/* CONNECTED */ 10000,
46-
/* GETTIME */ 100,
47-
/* DISCONNECTING */ 100,
48-
/* DISCONNECTED */ 1000,
49-
/* CLOSED */ 1000,
50-
/* ERROR */ 1000
51-
};
52-
5341
/******************************************************************************
5442
CTOR/DTOR
5543
******************************************************************************/
@@ -99,7 +87,6 @@ NetworkConnectionState NBConnectionHandler::check()
9987
case NetworkConnectionState::INIT: _netConnectionState = update_handleInit (); break;
10088
case NetworkConnectionState::CONNECTING: _netConnectionState = update_handleConnecting (); break;
10189
case NetworkConnectionState::CONNECTED: _netConnectionState = update_handleConnected (); break;
102-
case NetworkConnectionState::GETTIME: /* Unused */ break;
10390
case NetworkConnectionState::DISCONNECTING: _netConnectionState = update_handleDisconnecting(); break;
10491
case NetworkConnectionState::DISCONNECTED: _netConnectionState = update_handleDisconnected (); break;
10592
case NetworkConnectionState::ERROR: break;

‎src/Arduino_WiFiConnectionHandler.cpp‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,6 @@
2323

2424
#ifdef BOARD_HAS_WIFI /* Only compile if the board has WiFi */
2525

26-
/******************************************************************************
27-
CONSTANTS
28-
******************************************************************************/
29-
30-
static unsigned int const CHECK_INTERVAL_TABLE[] =
31-
{
32-
/* INIT */ 100,
33-
/* CONNECTING */ 500,
34-
/* CONNECTED */ 10000,
35-
/* GETTIME */ 100,
36-
/* DISCONNECTING */ 100,
37-
/* DISCONNECTED */ 1000,
38-
/* CLOSED */ 1000,
39-
/* ERROR */ 1000
40-
};
41-
4226
/******************************************************************************
4327
CTOR/DTOR
4428
******************************************************************************/
@@ -79,7 +63,6 @@ NetworkConnectionState WiFiConnectionHandler::check()
7963
case NetworkConnectionState::INIT: _netConnectionState = update_handleInit (); break;
8064
case NetworkConnectionState::CONNECTING: _netConnectionState = update_handleConnecting (); break;
8165
case NetworkConnectionState::CONNECTED: _netConnectionState = update_handleConnected (); break;
82-
case NetworkConnectionState::GETTIME: /* Unused */ break;
8366
case NetworkConnectionState::DISCONNECTING: _netConnectionState = update_handleDisconnecting(); break;
8467
case NetworkConnectionState::DISCONNECTED: _netConnectionState = update_handleDisconnected (); break;
8568
case NetworkConnectionState::ERROR: break;

0 commit comments

Comments
 (0)