arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

disable WiFi DEBUG_WIFI_MULTI

Browse Source 
add _min and _max define as workaround
This commit is contained in:
Markus Sattler 2015-06-20 20:55:08 +02:00
parent 874cf0ef98
commit 1f1497264b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp8266/Arduino.h
View File

@ -237,6 +237,8 @@ void loop(void);
#define min(a,b) ((a)<(b)?(a):(b)) #define min(a,b) ((a)<(b)?(a):(b))
#define max(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(uint16_t w);
uint16_t makeWord(byte h, byte l); uint16_t makeWord(byte h, byte l);

2
libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
View File

@ -32,7 +32,7 @@
#undef max #undef max
#include <vector> #include <vector>
#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ ) //#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ )
#ifndef DEBUG_WIFI_MULTI #ifndef DEBUG_WIFI_MULTI
#define DEBUG_WIFI_MULTI(...) #define DEBUG_WIFI_MULTI(...)