Merge pull request #82 from brentru/ethernet

ladyada · web-flow · commit 3c611fd219a1 · 2019-04-15T18:10:46.000-04:00
Replace Ethernet2 with Arduino Ethernet Library
diff --git a/.travis.yml b/.travis.yml
@@ -15,11 +15,12 @@ before_install:
    - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh)
 
 install:
-    - arduino --install-library "Adafruit IO Arduino","Adafruit MQTT Library","ArduinoHttpClient","Adafruit Unified Sensor","Adafruit NeoPixel","DHT sensor library", "Adafruit BME280 Library", "Adafruit SGP30 Sensor"
+    - arduino --install-library "Adafruit IO Arduino","Adafruit MQTT Library","ArduinoHttpClient"
+    - arduino --install-library "Adafruit Unified Sensor","Adafruit NeoPixel","DHT sensor library"
 
 script:
     # build ESP8266 target
-    - build_platform esp8266
+    # - build_platform esp8266
     # build SAMD target
-    - arduino --install-library "WiFi101"
+    - arduino --install-library "WiFi101", "Ethernet"
     - build_platform zero
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
 arduino {
   verify = false
   platforms = ["esp8266:esp8266", "esp32:esp32", "adafruit:avr", "arduino:samd", "adafruit:samd"]
-  libraries = ["Adafruit MQTT Library", "Adafruit FONA Library", "Ethernet2", "WiFi101"]
+  libraries = ["Adafruit MQTT Library", "Adafruit FONA Library", "Ethernet", "WiFi101"]
   boards = ["ESP8266", "M0_WINC1500", "WICED", "MKR1000", "M0_ETHERNETWING", "FONA_32U4", "ESP32"]
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Adafruit IO Arduino Library
 
-[![Documentation Status](https://readthedocs.org/projects/adafruit-io-arduino/badge/?version=latest)](https://adafruit-io-arduino.readthedocs.io/en/latest/) [![Build Status](https://travis-ci.org/adafruit/Adafruit_IO_Arduino.svg?branch=master)](https://travis-ci.org/adafruit/Adafruit_IO_Arduino) [![Discord](https://img.shields.io/discord/327254708534116352.svg)](https://discord.gg/nBQh6qu)
+[![Documentation Status](https://readthedocs.org/projects/adafruit-io-arduino/badge/?version=latest)](https://adafruit-io-arduino.readthedocs.io/en/latest/) [![Build Status](https://travis-ci.com/adafruit/Adafruit_IO_Arduino.svg?branch=master)](https://travis-ci.com/adafruit/Adafruit_IO_Arduino) [![Discord](https://img.shields.io/discord/327254708534116352.svg)](https://discord.gg/nBQh6qu)
 
 ![AIOArduino](https://cdn-learn.adafruit.com/assets/assets/000/057/496/original/adafruit_io_AIOA.png?1531335660)
 
diff --git a/docs/dependencies.rst b/docs/dependencies.rst
@@ -60,6 +60,6 @@ Adafruit Ethernet FeatherWing
 The Ethernet FeatherWing will also require a 32u4, M0, or ESP8266 based Feather. Any Arduino cores
 required by the host Feather board will also be required.
 
-* Latest version of the `Adafruit Ethernet2 Library <https://github.com/adafruit/Ethernet2>`_
+* Latest version of the `Ethernet Library <https://github.com/arduino-libraries/Ethernet>`_
 * Latest version of the `Adafruit MQTT Library <https://github.com/adafruit/Adafruit_MQTT_Library>`_
 * Latest version of the `Arduino HTTP Client Library <https://github.com/arduino-libraries/ArduinoHttpClient>`_
diff --git a/examples/adafruitio_23_ifttt/.zero.test.skip b/examples/adafruitio_23_ifttt/.zero.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/adafruitio_24_zapier/.zero.test.skip b/examples/adafruitio_24_zapier/.zero.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/io_home_series/io_garage/.zero.test.skip b/examples/io_home_series/io_garage/.zero.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/io_home_series/io_home_security/.zero.test.skip b/examples/io_home_series/io_home_security/.zero.test.skip
@@ -0,0 +1 @@
+
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit IO Arduino
-version=2.7.23
+version=2.7.3
 author=Adafruit
 maintainer=Adafruit <adafruitio@adafruit.com>
 sentence=Arduino library to access Adafruit IO.
diff --git a/src/AdafruitIO.h b/src/AdafruitIO.h
@@ -78,6 +78,7 @@ class AdafruitIO {
 
     const char *_host = "io.adafruit.com";
     uint16_t _mqtt_port = 8883;
+    uint16_t _mqtt_eth_port = 1883;
     uint16_t _http_port = 443;
 
     uint16_t _packetread_timeout;
diff --git a/src/AdafruitIO_Ethernet.h b/src/AdafruitIO_Ethernet.h
@@ -17,52 +17,61 @@
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
 
-#include <Ethernet2.h>
+#include <Ethernet.h>
 #include <EthernetClient.h>
 #include <Dns.h>
 #include <Dhcp.h>
 
 #include "AdafruitIO.h"
 
 // all logic in .h to avoid auto compile
-class AdafruitIO_Ethernet : public AdafruitIO {
+class AdafruitIO_Ethernet : public AdafruitIO
+{
 
-  public:
-    AdafruitIO_Ethernet(const char *user, const char *key):AdafruitIO(user, key)
-    {
-      _client = new EthernetClient();
-      _mqtt = new Adafruit_MQTT_Client(_client, _host, _mqtt_port);
-      _http = new HttpClient(*_client, _host, _http_port);
-    }
-
-    aio_status_t networkStatus()
-    {
-      if(_status == AIO_NET_CONNECTED)
-        return _status;
+public:
+  AdafruitIO_Ethernet(const char *user, const char *key) : AdafruitIO(user, key)
+  {
+    _client = new EthernetClient();
+    _mqtt = new Adafruit_MQTT_Client(_client, _host, _mqtt_eth_port, _username, _key);
+    _http = new HttpClient(*_client, _host, _http_port);
+  }
 
-      _connect();
+  aio_status_t networkStatus()
+  {
+    if (_status == AIO_NET_CONNECTED)
       return _status;
-    }
 
-    const char* connectionType()
-    {
-      return "ethernet_wing";
-    }
+    _connect();
+    return _status;
+  }
+
+  const char *connectionType()
+  {
+    return "ethernet_wing";
+  }
 
-  protected:
-    byte _mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
-    uint16_t _port = 1883;
+protected:
+  byte _mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
 
-    EthernetClient *_client;
+  EthernetClient *_client;
 
-    void _connect()
+  void _connect()
+  {
+    if (Ethernet.begin(_mac) == 0)
     {
-      if(Ethernet.begin(_mac) == 0)
-        _status = AIO_NET_DISCONNECTED;
-      else
-        _status = AIO_NET_CONNECTED;
+      _status = AIO_NET_DISCONNECTED;
+      if (Ethernet.hardwareStatus() == EthernetNoHardware)
+      {
+        AIO_DEBUG_PRINTLN("Ethernet FeatherWing not found! Please recheck wiring connections.");
+        while (true)
+          delay(1); // do nothing, no point running without Ethernet hardware
+      }
     }
-
+    else
+    {
+      _status = AIO_NET_CONNECTED;
+    }
+  }
 };
 
 #endif // ADAFRUITIO_ETHERNET_H

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`arduino {`
`2`	`2`	`verify = false`
`3`	`3`	`platforms = ["esp8266:esp8266", "esp32:esp32", "adafruit:avr", "arduino:samd", "adafruit:samd"]`
`4`		`- libraries = ["Adafruit MQTT Library", "Adafruit FONA Library", "Ethernet2", "WiFi101"]`
	`4`	`+ libraries = ["Adafruit MQTT Library", "Adafruit FONA Library", "Ethernet", "WiFi101"]`
`5`	`5`	`boards = ["ESP8266", "M0_WINC1500", "WICED", "MKR1000", "M0_ETHERNETWING", "FONA_32U4", "ESP32"]`
`6`	`6`	`}`