-
-
Notifications
You must be signed in to change notification settings - Fork 377
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42 from arduino-libraries/refactor
Separating definition/implementation in .h/.cpp files + Bugfix: Prevent socket from keeping open by stopping UDP
- Loading branch information
Showing
10 changed files
with
729 additions
and
454 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,14 +15,22 @@ | |
* a commercial license, send an email to [email protected]. | ||
*/ | ||
|
||
#ifndef CONNECTION_MANAGER_H_INCLUDED | ||
#define CONNECTION_MANAGER_H_INCLUDED | ||
#ifndef CONNECTION_MANAGER_H_ | ||
#define CONNECTION_MANAGER_H_ | ||
|
||
#define ARDUINO_CLOUD_DEBUG_LEVEL 2 | ||
/****************************************************************************** | ||
* INCLUDES | ||
******************************************************************************/ | ||
|
||
#include <Client.h> | ||
#include <Udp.h> | ||
|
||
#include "utility/NTPUtils.h" | ||
#include "utility/DebugUtils.h" | ||
|
||
/****************************************************************************** | ||
* TYPEDEFS | ||
******************************************************************************/ | ||
|
||
enum NetworkConnectionState { | ||
CONNECTION_STATE_INIT, | ||
|
@@ -34,6 +42,10 @@ enum NetworkConnectionState { | |
CONNECTION_STATE_ERROR | ||
}; | ||
|
||
/****************************************************************************** | ||
* CLASS DECLARATION | ||
******************************************************************************/ | ||
|
||
class ConnectionManager { | ||
public: | ||
virtual void init() = 0; | ||
|
@@ -50,7 +62,6 @@ class ConnectionManager { | |
|
||
}; | ||
|
||
|
||
#ifdef ARDUINO_SAMD_MKR1000 | ||
#include <WiFi101.h> | ||
#define BOARD_HAS_WIFI | ||
|
@@ -77,26 +88,4 @@ class ConnectionManager { | |
#define NETWORK_CONNECTED GSM3_NetworkStatus_t::GPRS_READY | ||
#endif | ||
|
||
static int debugMessageLevel = ARDUINO_CLOUD_DEBUG_LEVEL; | ||
inline void debugMessage(char *_msg, int _debugLevel, bool _timestamp = true, bool _newline = true) { | ||
if(_debugLevel < 0){ | ||
return; | ||
} | ||
if (_debugLevel <= debugMessageLevel) { | ||
char prepend[20]; | ||
sprintf(prepend, "\n[ %d ] ", millis()); | ||
if(_timestamp){ | ||
Serial.print(prepend); | ||
} | ||
if(_newline){ | ||
Serial.println(_msg); | ||
}else{ | ||
Serial.print(_msg); | ||
} | ||
} | ||
} | ||
|
||
inline void setDebugMessageLevel(int _debugLevel){ | ||
debugMessageLevel = _debugLevel; | ||
} | ||
#endif | ||
#endif /* CONNECTION_MANAGER_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,193 @@ | ||
/* | ||
* This file is part of ArduinoIoTCloud. | ||
* | ||
* Copyright 2019 ARDUINO SA (http://www.arduino.cc/) | ||
* | ||
* This software is released under the GNU General Public License version 3, | ||
* which covers the main part of arduino-cli. | ||
* The terms of this license can be found at: | ||
* https://www.gnu.org/licenses/gpl-3.0.en.html | ||
* | ||
* You can be released from the requirements of the above licenses by purchasing | ||
* a commercial license. Buying such a license is mandatory if you want to modify or | ||
* otherwise use the software for commercial activities involving the Arduino | ||
* software without disclosing the source code of your own applications. To purchase | ||
* a commercial license, send an email to [email protected]. | ||
*/ | ||
|
||
/****************************************************************************** | ||
* INCLUDE | ||
******************************************************************************/ | ||
|
||
#include "EthernetConnectionManager.h" | ||
|
||
#ifdef BOARD_HAS_ETHERNET /* Only compile if the board has ethernet */ | ||
|
||
/****************************************************************************** | ||
* CONSTANTS | ||
******************************************************************************/ | ||
|
||
static const unsigned long NETWORK_CONNECTION_INTERVAL = 30000; | ||
|
||
/****************************************************************************** | ||
* CTOR | ||
******************************************************************************/ | ||
|
||
EthConnectionManager::EthConnectionManager(uint8_t * mac, int const ss_pin) : | ||
mac(mac), | ||
ss_pin(ss_pin), | ||
lastConnectionTickTime(millis()), | ||
connectionTickTimeInterval(CHECK_INTERVAL_IDLE) { | ||
} | ||
|
||
/****************************************************************************** | ||
* PUBLIC MEMBER FUNCTIONS | ||
******************************************************************************/ | ||
|
||
void EthConnectionManager::init() { | ||
} | ||
|
||
unsigned long EthConnectionManager::getTime() { | ||
//handled by fallback manager | ||
return lastValidTimestamp + 1; | ||
} | ||
|
||
void EthConnectionManager::check() { | ||
char msgBuffer[120]; | ||
unsigned long const now = millis(); | ||
int networkStatus = 0; | ||
if (now - lastConnectionTickTime > connectionTickTimeInterval) { | ||
switch (netConnectionState) { | ||
case CONNECTION_STATE_INIT: | ||
if (ss_pin == -1) { | ||
networkStatus = Ethernet.begin(mac); | ||
} else { | ||
networkStatus = Ethernet.begin(mac, ss_pin); | ||
} | ||
networkStatus = Ethernet.hardwareStatus(); | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Eth hardware status(): %d", networkStatus); | ||
debugMessage(msgBuffer, 2); | ||
if (networkStatus == EthernetNoHardware) { | ||
debugMessage("No Ethernet chip connected", 0); | ||
// don't continue: | ||
changeConnectionState(CONNECTION_STATE_ERROR); | ||
lastConnectionTickTime = now; | ||
return; | ||
} | ||
networkStatus = Ethernet.linkStatus(); | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Eth link status(): %d", networkStatus); | ||
debugMessage(msgBuffer, 2); | ||
if (networkStatus == LinkOFF) { | ||
debugMessage("Failed to configure Ethernet via dhcp", 0); | ||
// don't continue: | ||
changeConnectionState(CONNECTION_STATE_ERROR); | ||
lastConnectionTickTime = now; | ||
return; | ||
} | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Ethernet shield recognized: ID", Ethernet.hardwareStatus()); | ||
debugMessage(msgBuffer, 0); | ||
changeConnectionState(CONNECTION_STATE_CONNECTING); | ||
break; | ||
case CONNECTION_STATE_CONNECTING: | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Connecting via dhcp"); | ||
debugMessage(msgBuffer, 2); | ||
if (ss_pin == -1) { | ||
networkStatus = Ethernet.begin(mac); | ||
} else { | ||
networkStatus = Ethernet.begin(mac, ss_pin); | ||
} | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Ethernet.status(): %d", networkStatus); | ||
debugMessage(msgBuffer, 2); | ||
if (networkStatus == 0) { | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Connection failed"); | ||
debugMessage(msgBuffer, 0); | ||
|
||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Retrying in \"%d\" milliseconds", connectionTickTimeInterval); | ||
debugMessage(msgBuffer, 2); | ||
//changeConnectionState(CONNECTION_STATE_CONNECTING); | ||
return; | ||
} else { | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Connected!"); | ||
debugMessage(msgBuffer, 2); | ||
changeConnectionState(CONNECTION_STATE_GETTIME); | ||
return; | ||
} | ||
break; | ||
case CONNECTION_STATE_GETTIME: | ||
debugMessage("Acquiring Time from Network", 3); | ||
unsigned long networkTime; | ||
networkTime = getTime(); | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Network Time: %u", networkTime); | ||
debugMessage(msgBuffer, 3); | ||
if(networkTime > lastValidTimestamp){ | ||
lastValidTimestamp = networkTime; | ||
changeConnectionState(CONNECTION_STATE_CONNECTED); | ||
} | ||
break; | ||
case CONNECTION_STATE_CONNECTED: | ||
// keep testing connection | ||
Ethernet.maintain(); | ||
networkStatus = Ethernet.linkStatus(); | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Eth link status(): %d", networkStatus); | ||
debugMessage(msgBuffer, 4); | ||
if (networkStatus != LinkON) { | ||
changeConnectionState(CONNECTION_STATE_DISCONNECTED); | ||
return; | ||
} | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Connected"); | ||
debugMessage(msgBuffer, 2); | ||
break; | ||
case CONNECTION_STATE_DISCONNECTED: | ||
*msgBuffer = 0; | ||
sprintf(msgBuffer, "Connection lost."); | ||
debugMessage(msgBuffer, 0); | ||
debugMessage("Attempting reconnection", 1); | ||
changeConnectionState(CONNECTION_STATE_CONNECTING); | ||
//wifiClient.stop(); | ||
break; | ||
} | ||
lastConnectionTickTime = now; | ||
} | ||
} | ||
|
||
/****************************************************************************** | ||
* PRIVATE MEMBER FUNCTIONS | ||
******************************************************************************/ | ||
|
||
void EthConnectionManager::changeConnectionState(NetworkConnectionState _newState) { | ||
netConnectionState = _newState; | ||
int newInterval = CHECK_INTERVAL_IDLE; | ||
switch (_newState) { | ||
case CONNECTION_STATE_INIT: | ||
newInterval = CHECK_INTERVAL_INIT; | ||
break; | ||
case CONNECTION_STATE_CONNECTING: | ||
newInterval = CHECK_INTERVAL_CONNECTING; | ||
break; | ||
case CONNECTION_STATE_GETTIME: | ||
newInterval = CHECK_INTERVAL_GETTIME; | ||
break; | ||
case CONNECTION_STATE_CONNECTED: | ||
newInterval = CHECK_INTERVAL_CONNECTED; | ||
break; | ||
case CONNECTION_STATE_DISCONNECTED: | ||
newInterval = CHECK_INTERVAL_DISCONNECTED; | ||
|
||
break; | ||
} | ||
connectionTickTimeInterval = newInterval; | ||
lastConnectionTickTime = millis(); | ||
} | ||
|
||
#endif /* #ifdef BOARD_HAS_ETHERNET */ |
Oops, something went wrong.