From 1f1497264b54f28f3e469f8be5b213af014a7dde Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Sat, 20 Jun 2015 20:55:08 +0200 Subject: [PATCH] disable WiFi DEBUG_WIFI_MULTI add _min and _max define as workaround --- cores/esp8266/Arduino.h | 2 ++ libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index 49420d0e4..bd94033e7 100644 --- a/cores/esp8266/Arduino.h +++ b/cores/esp8266/Arduino.h @@ -237,6 +237,8 @@ void loop(void); #define min(a,b) ((a)<(b)?(a):(b)) #define max(a,b) ((a)>(b)?(a):(b)) +#define _min(a,b) ((a)<(b)?(a):(b)) +#define _max(a,b) ((a)>(b)?(a):(b)) uint16_t makeWord(uint16_t w); uint16_t makeWord(byte h, byte l); diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h index 3f2692a50..63c180c31 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h @@ -32,7 +32,7 @@ #undef max #include -#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ ) +//#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ ) #ifndef DEBUG_WIFI_MULTI #define DEBUG_WIFI_MULTI(...)