- renamed Classes to remove Arduino_ but left the name in the file for clean inclusion

- reworked callback structure and simplified their addition (@cmaglie)
- cleaned example, added `arduino_secrets.h` and removed creation as pointer
- generic cleanup
- more feedback welcome

Author: ubidefeo

Arduino_ConnectionHandler.h

@@ -53,7 +53,7 @@ typedef void (*OnNetworkEventCallback)(void * /* arg */);
    CLASS DECLARATION
  ******************************************************************************/
 
-class Arduino_ConnectionHandler {
+class ConnectionHandler {
   public:
     virtual void init() = 0;
     virtual void check() = 0;
@@ -68,7 +68,9 @@ class Arduino_ConnectionHandler {
     virtual void connect();
     virtual void disconnect();
     virtual void addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback);
-
+    virtual void addConnectCallback(OnNetworkEventCallback callback);
+    virtual void addDisconnectCallback(OnNetworkEventCallback callback);
+    virtual void addErrorCallback(OnNetworkEventCallback callback);
 
   private:
     OnNetworkEventCallback  _on_connect_event_callback,

Arduino_WiFiConnectionHandler.cpp

@@ -33,7 +33,7 @@ static const unsigned long NETWORK_CONNECTION_INTERVAL = 30000;   /*    NOT USED
    CTOR/DTOR
  ******************************************************************************/
 
-Arduino_WiFiConnectionHandler::Arduino_WiFiConnectionHandler(const char *_ssid, const char *_pass, bool _keepAlive) :
+WiFiConnectionHandler::WiFiConnectionHandler(const char *_ssid, const char *_pass, bool _keepAlive) :
   ssid(_ssid),
   pass(_pass),
   lastConnectionTickTime(millis()),
@@ -48,32 +48,42 @@ Arduino_WiFiConnectionHandler::Arduino_WiFiConnectionHandler(const char *_ssid,
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-void Arduino_WiFiConnectionHandler::init() {
+void WiFiConnectionHandler::init() {
 }
 
-void Arduino_WiFiConnectionHandler::addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback){
+void WiFiConnectionHandler::addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback){
   switch (event) {
     case NetworkConnectionEvent::CONNECTED:       _on_connect_event_callback       = callback; break;
     case NetworkConnectionEvent::DISCONNECTED:    _on_disconnect_event_callback    = callback; break;
     case NetworkConnectionEvent::ERROR:           _on_error_event_callback         = callback; break;
   }
 }
 
-void Arduino_WiFiConnectionHandler::execNetworkEventCallback(OnNetworkEventCallback & callback, void * callback_arg){
+void WiFiConnectionHandler::addConnectCallback(OnNetworkEventCallback callback){
+    _on_connect_event_callback = callback;
+}
+void WiFiConnectionHandler::addDisconnectCallback(OnNetworkEventCallback callback){
+    _on_disconnect_event_callback = callback;
+}
+void WiFiConnectionHandler::addErrorCallback(OnNetworkEventCallback callback){
+    _on_error_event_callback = callback;
+}
+
+void WiFiConnectionHandler::execNetworkEventCallback(OnNetworkEventCallback & callback, void * callback_arg){
   if(callback){
     (*callback)(callback_arg);
   }
 }
 
-unsigned long Arduino_WiFiConnectionHandler::getTime() {
+unsigned long WiFiConnectionHandler::getTime() {
 #ifdef GETTIME_MISSING
   return 0;
 #else
   return WiFi.getTime();
 #endif
 }
 
-void Arduino_WiFiConnectionHandler::update() {
+void WiFiConnectionHandler::update() {
 
   unsigned long const now = millis();
   int networkStatus = 0;
@@ -187,7 +197,7 @@ void Arduino_WiFiConnectionHandler::update() {
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/
 
-void Arduino_WiFiConnectionHandler::changeConnectionState(NetworkConnectionState _newState) {
+void WiFiConnectionHandler::changeConnectionState(NetworkConnectionState _newState) {
   if(_newState == netConnectionState) return;
   int newInterval = CHECK_INTERVAL_INIT;
   switch (_newState) {
@@ -245,15 +255,15 @@ void Arduino_WiFiConnectionHandler::changeConnectionState(NetworkConnectionState
   connectionStateChanged(netConnectionState);
 }
 
-void Arduino_WiFiConnectionHandler::connect() {
+void WiFiConnectionHandler::connect() {
   if(netConnectionState == NetworkConnectionState::INIT || netConnectionState == NetworkConnectionState::CONNECTING){
     return;
   }
   keepAlive = true;
   changeConnectionState(NetworkConnectionState::INIT);
 
 }
-void Arduino_WiFiConnectionHandler::disconnect() {
+void WiFiConnectionHandler::disconnect() {
   //WiFi.end();
 
   changeConnectionState(NetworkConnectionState::DISCONNECTING);

Arduino_WiFiConnectionHandler.h

@@ -33,9 +33,9 @@ extern void connectionStateChanged(NetworkConnectionState _newState);
    CLASS DECLARATION
  ******************************************************************************/
 
-class Arduino_WiFiConnectionHandler : public Arduino_ConnectionHandler {
+class WiFiConnectionHandler : public ConnectionHandler {
   public:
-    Arduino_WiFiConnectionHandler(const char *_ssid, const char *_pass, bool _keepAlive = true);
+    WiFiConnectionHandler(const char *_ssid, const char *_pass, bool _keepAlive = true);
 
     virtual void init();
     virtual unsigned long getTime();
@@ -51,6 +51,9 @@ class Arduino_WiFiConnectionHandler : public Arduino_ConnectionHandler {
     virtual void connect();
 
     virtual void addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback);
+    virtual void addConnectCallback(OnNetworkEventCallback callback);
+    virtual void addDisconnectCallback(OnNetworkEventCallback callback);
+    virtual void addErrorCallback(OnNetworkEventCallback callback);
     WiFiUDP udp;
 
   private:

examples/ConnectionHandlerDev/ConnectionHandlerDev.ino

@@ -1,7 +1,10 @@
-#include <FTDebouncer.h>
+#include "arduino_secrets.h"
 
+#include <FTDebouncer.h>
 #include <Arduino_WiFiConnectionHandler.h>
-Arduino_WiFiConnectionHandler *conMan = new Arduino_WiFiConnectionHandler("Cilento Mare", "DonEmilioGatto");
+
+/*		SECRET_ fields are in arduino_secrets.h included above		*/
+WiFiConnectionHandler conMan(SECRET_SSID, SECRET_PASS);
 
 
 #define PIN_CONNECT 2
@@ -17,14 +20,15 @@ void setup(){
 	deb.addPin(PIN_CONNECT, HIGH, INPUT_PULLUP);
 	deb.addPin(PIN_DISCONNECT, HIGH, INPUT_PULLUP);
 	deb.init();
-	conMan->addCallback(NetworkConnectionEvent::CONNECTED, &onNetworkConnect);
-	conMan->addCallback(NetworkConnectionEvent::DISCONNECTED, &onNetworkDisconnect);
+	//conMan.addCallback(NetworkConnectionEvent::CONNECTED, &onNetworkConnect);
+	conMan.addConnectCallback(onNetworkConnect);
+	conMan.addDisconnectCallback(onNetworkDisconnect);
 }
 
 
 void loop(){
 	deb.update();
-	conMan->update();
+	conMan.update();
 }
 
 void connectionStateChanged(NetworkConnectionState _newState){
@@ -36,10 +40,10 @@ void onPinActivated(uint8_t _pinNr){
 	Serial.println(_pinNr);
 	switch(_pinNr){
 		case PIN_CONNECT:
-		conMan->connect();
+		conMan.connect();
 		break;
 		case PIN_DISCONNECT:
-		conMan->disconnect();
+		conMan.disconnect();
 		break;
 	}
 }

examples/ConnectionHandlerDev/arduino_secrets.h

@@ -0,0 +1,2 @@
+const char SECRET_SSID[] = "NETWORK_NAME";
+const char SECRET_PASS[] = "NETWORK_PASS";