Merge pull request #89 from brentru/master

brentru · web-flow · commit 63fc4e98b829 · 2019-05-22T10:43:39.000-04:00
Fix ESP8266 Compatibility and add SSL fingerprinting
diff --git a/.travis.yml b/.travis.yml
@@ -10,17 +10,17 @@ env:
   global:
      - PRETTYNAME="Adafruit IO Arduino Library"
 
-
 before_install:
    - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh)
+   - cd $HOME/arduino_ide/libraries/
+   - wget https://github.com/adafruit/WiFiNINA/archive/master.zip && unzip master.zip
+   - mv WiFiNINA-master/ WiFiNINA && rm master.zip
+   - cd /home/travis/build/adafruit/Adafruit_IO_Arduino
 
 install:
     - arduino --install-library "Adafruit IO Arduino","Adafruit MQTT Library","ArduinoHttpClient"
-    - arduino --install-library "Adafruit Unified Sensor","Adafruit NeoPixel","DHT sensor library"
+    - arduino --install-library "Adafruit Unified Sensor","Adafruit NeoPixel","DHT sensor library", "Ethernet"
 
 script:
-    # build ESP8266 target
-    # - build_platform esp8266
-    # build SAMD target
-    - arduino --install-library "WiFi101", "Ethernet"
-    - build_platform zero
+    - build_platform m4wifi
+    - build_platform esp8266
diff --git a/examples/adafruitio_00_publish/config.h b/examples/adafruitio_00_publish/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_01_subscribe/config.h b/examples/adafruitio_01_subscribe/config.h
@@ -29,19 +29,19 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
-// Configure the pins used for the ESP32 connection
-#if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
-// Don't change the names of these #define's! they match the variant ones
-#define SPIWIFI SPI
-#define SPIWIFI_SS 10  // Chip select pin
-#define SPIWIFI_ACK 9  // a.k.a BUSY or READY pin
-#define ESP32_RESETN 6 // Reset pin
-#define ESP32_GPIO0 -1 // Not connected
-#endif
-AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS, SPIWIFI_SS, SPIWIFI_ACK, ESP32_RESETN, ESP32_GPIO0, &SPIWIFI);
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+  // Configure the pins used for the ESP32 connection
+  #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
+    // Don't change the names of these #define's! they match the variant ones
+    #define SPIWIFI SPI
+    #define SPIWIFI_SS 10  // Chip select pin
+    #define SPIWIFI_ACK 9  // a.k.a BUSY or READY pin
+    #define ESP32_RESETN 6 // Reset pin
+    #define ESP32_GPIO0 -1 // Not connected
+  #endif
+  AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS, SPIWIFI_SS, SPIWIFI_ACK, ESP32_RESETN, ESP32_GPIO0, &SPIWIFI);
 #else
-AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
+  AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
 #endif
 /******************************* FONA **************************************/
 
diff --git a/examples/adafruitio_02_pubsub/config.h b/examples/adafruitio_02_pubsub/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_03_multiple_feeds/config.h b/examples/adafruitio_03_multiple_feeds/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_04_location/config.h b/examples/adafruitio_04_location/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_05_type_conversion/config.h b/examples/adafruitio_05_type_conversion/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_06_digital_in/config.h b/examples/adafruitio_06_digital_in/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_07_digital_out/config.h b/examples/adafruitio_07_digital_out/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_08_analog_in/config.h b/examples/adafruitio_08_analog_in/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_09_analog_out/config.h b/examples/adafruitio_09_analog_out/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_10_dashboard_creation/config.h b/examples/adafruitio_10_dashboard_creation/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_11_group_pub/config.h b/examples/adafruitio_11_group_pub/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_12_group_sub/config.h b/examples/adafruitio_12_group_sub/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_13_rgb/config.h b/examples/adafruitio_13_rgb/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_14_neopixel/config.h b/examples/adafruitio_14_neopixel/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_15_temp_humidity/config.h b/examples/adafruitio_15_temp_humidity/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_16_servo/.m4wifi.test.skip b/examples/adafruitio_16_servo/.m4wifi.test.skip
diff --git a/examples/adafruitio_16_servo/config.h b/examples/adafruitio_16_servo/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_17_time_subscribe/config.h b/examples/adafruitio_17_time_subscribe/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_18_device_info/config.h b/examples/adafruitio_18_device_info/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_19_deepsleep/.m4wifi.test.skip b/examples/adafruitio_19_deepsleep/.m4wifi.test.skip
diff --git a/examples/adafruitio_19_deepsleep/config.h b/examples/adafruitio_19_deepsleep/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_20_shared_feed_write/config.h b/examples/adafruitio_20_shared_feed_write/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_21_feed_read/config.h b/examples/adafruitio_21_feed_read/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_22_environmental_monitor/.m4wifi.test.skip b/examples/adafruitio_22_environmental_monitor/.m4wifi.test.skip
diff --git a/examples/adafruitio_22_environmental_monitor/config.h b/examples/adafruitio_22_environmental_monitor/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_23_ifttt/.m4wifi.test.skip b/examples/adafruitio_23_ifttt/.m4wifi.test.skip
diff --git a/examples/adafruitio_23_ifttt/config.h b/examples/adafruitio_23_ifttt/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/adafruitio_24_zapier/.esp8266.test.skip b/examples/adafruitio_24_zapier/.esp8266.test.skip
diff --git a/examples/adafruitio_24_zapier/.m4wifi.test.skip b/examples/adafruitio_24_zapier/.m4wifi.test.skip
diff --git a/examples/adafruitio_24_zapier/config.h b/examples/adafruitio_24_zapier/config.h
@@ -29,7 +29,7 @@
 // comment out the following lines if you are using fona or ethernet
 #include "AdafruitIO_WiFi.h"
 
-#ifdef USE_AIRLIFT
+#if defined(USE_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // Configure the pins used for the ESP32 connection
   #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
     // Don't change the names of these #define's! they match the variant ones
diff --git a/examples/io_home_series/io_garage/.esp8266.test.skip b/examples/io_home_series/io_garage/.esp8266.test.skip
diff --git a/examples/io_home_series/io_garage/.m4wifi.test.skip b/examples/io_home_series/io_garage/.m4wifi.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/io_home_series/io_home_security/.esp8266.test.skip b/examples/io_home_series/io_home_security/.esp8266.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/io_home_series/io_home_security/.m4wifi.test.skip b/examples/io_home_series/io_home_security/.m4wifi.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/io_home_series/neopixel_and_thermometer/.m4wifi.test.skip b/examples/io_home_series/neopixel_and_thermometer/.m4wifi.test.skip
@@ -0,0 +1 @@
+
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit IO Arduino
-version=3.1.0
+version=3.2.0
 author=Adafruit
 maintainer=Adafruit <adafruitio@adafruit.com>
 sentence=Arduino library to access Adafruit IO.
diff --git a/src/AdafruitIO_Definitions.h b/src/AdafruitIO_Definitions.h
@@ -13,7 +13,7 @@
 #define ADAFRUITIO_DEFINITIONS_H_
 
 #define ADAFRUITIO_VERSION_MAJOR 3
-#define ADAFRUITIO_VERSION_MINOR 1
+#define ADAFRUITIO_VERSION_MINOR 2
 #define ADAFRUITIO_VERSION_PATCH 0
 
 // forward declaration
diff --git a/src/wifi/AdafruitIO_ESP8266.cpp b/src/wifi/AdafruitIO_ESP8266.cpp
@@ -18,6 +18,7 @@ AdafruitIO_ESP8266::AdafruitIO_ESP8266(const char *user, const char *key, const
   _ssid = ssid;
   _pass = pass;
   _client = new WiFiClientSecure;
+  _client->setFingerprint(AIO_SSL_FINGERPRINT);
   _mqtt = new Adafruit_MQTT_Client(_client, _host, _mqtt_port);
   _http = new HttpClient(*_client, _host, _http_port);
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ AdafruitIO_ESP8266::AdafruitIO_ESP8266(const char user, const char key, const`
`18`	`18`	`_ssid = ssid;`
`19`	`19`	`_pass = pass;`
`20`	`20`	`_client = new WiFiClientSecure;`
	`21`	`+ _client->setFingerprint(AIO_SSL_FINGERPRINT);`
`21`	`22`	`_mqtt = new Adafruit_MQTT_Client(_client, _host, _mqtt_port);`
`22`	`23`	`_http = new HttpClient(*_client, _host, _http_port);`
`23`	`24`	`}`