Skip to content

Commit e12b6ff

Browse files
Andrew MelvinAndrew Melvin
Andrew Melvin
authored and
Andrew Melvin
committed
Merge branch 'master' of https://github.com/esp8266/Arduino into MD5
2 parents 34db483 + 1581a8f commit e12b6ff

File tree

13 files changed

+153
-53
lines changed

13 files changed

+153
-53
lines changed

‎boards.txt

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ menu.FlashFreq=Flash Frequency
66
menu.UploadTool=Upload Using
77
menu.ResetMethod=Reset Method
88
menu.ESPModule=Module
9+
menu.Debug=Debug port
10+
menu.DebugLevel=Debug Level
911

1012
##############################################################
1113
generic.name=Generic ESP8266 Module
@@ -26,6 +28,8 @@ generic.build.core=esp8266
2628
generic.build.variant=generic
2729
generic.build.flash_mode=qio
2830
generic.build.spiffs_pagesize=256
31+
generic.build.debug_port=
32+
generic.build.debug_level=
2933

3034
generic.menu.UploadTool.esptool=Serial
3135
generic.menu.UploadTool.esptool.upload.tool=esptool
@@ -166,6 +170,42 @@ generic.menu.ResetMethod.ck.upload.resetmethod=ck
166170
generic.menu.ResetMethod.nodemcu=nodemcu
167171
generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
168172

173+
generic.menu.Debug.Disabled=Disabled
174+
generic.menu.Debug.Disabled.build.debug_port=
175+
generic.menu.Debug.Serial=Serial
176+
generic.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
177+
generic.menu.Debug.Serial1=Serial1
178+
generic.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
179+
180+
generic.menu.DebugLevel.None=None
181+
generic.menu.DebugLevel.None.build.debug_level=
182+
generic.menu.DebugLevel.Core=Core
183+
generic.menu.DebugLevel.Core.build.debug_level=-DDEBUG_ESP_CORE
184+
generic.menu.DebugLevel.SSL=Core + SSL
185+
generic.menu.DebugLevel.SSL.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
186+
generic.menu.DebugLevel.WiFic=Core + WiFi
187+
generic.menu.DebugLevel.WiFic.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
188+
generic.menu.DebugLevel.WiFi=WiFi
189+
generic.menu.DebugLevel.WiFi.build.debug_level=-DDEBUG_ESP_WIFI
190+
generic.menu.DebugLevel.HTTPClient=HTTPClient
191+
generic.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
192+
generic.menu.DebugLevel.HTTPUpdate=HTTPUpdate
193+
generic.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
194+
generic.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
195+
generic.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
196+
generic.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
197+
generic.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
198+
generic.menu.DebugLevel.HTTPServer=HTTPServer
199+
generic.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
200+
generic.menu.DebugLevel.UPDATER=Updater
201+
generic.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
202+
generic.menu.DebugLevel.OTA=OTA
203+
generic.menu.DebugLevel.OTA.build.debug_level=-DDEBUG_ESP_OTA
204+
generic.menu.DebugLevel.OTA2=OTA + Updater
205+
generic.menu.DebugLevel.OTA2.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
206+
generic.menu.DebugLevel.all=All
207+
generic.menu.DebugLevel.all.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA
208+
169209
# disabled because espressif's bootloader refuses to write above 4M
170210
# generic.menu.FlashSize.8M=8M (7M SPIFFS)
171211
# generic.menu.FlashSize.8M.build.flash_size=1M
@@ -200,6 +240,8 @@ espduino.build.variant=espduino
200240
espduino.build.flash_mode=dio
201241
espduino.build.flash_size=4M
202242
espduino.build.flash_freq=40
243+
espduino.build.debug_port=
244+
espduino.build.debug_level=
203245

204246
espduino.menu.CpuFrequency.80=80 MHz
205247
espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -267,6 +309,8 @@ huzzah.build.variant=adafruit
267309
huzzah.build.flash_mode=qio
268310
huzzah.build.flash_size=4M
269311
huzzah.build.flash_freq=40
312+
huzzah.build.debug_port=
313+
huzzah.build.debug_level=
270314

271315
huzzah.menu.CpuFrequency.80=80 MHz
272316
huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -324,6 +368,8 @@ nodemcu.build.variant=nodemcu
324368
nodemcu.build.flash_mode=qio
325369
nodemcu.build.flash_size=4M
326370
nodemcu.build.flash_freq=40
371+
nodemcu.build.debug_port=
372+
nodemcu.build.debug_level=
327373

328374
nodemcu.menu.CpuFrequency.80=80 MHz
329375
nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -390,6 +436,8 @@ nodemcuv2.build.variant=nodemcu
390436
nodemcuv2.build.flash_mode=dio
391437
nodemcuv2.build.flash_size=4M
392438
nodemcuv2.build.flash_freq=40
439+
nodemcuv2.build.debug_port=
440+
nodemcuv2.build.debug_level=
393441

394442
nodemcuv2.menu.CpuFrequency.80=80 MHz
395443
nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -465,6 +513,8 @@ modwifi.build.spiffs_start=0x100000
465513
modwifi.build.spiffs_end=0x1FB000
466514
modwifi.build.spiffs_pagesize=256
467515
modwifi.build.spiffs_blocksize=8192
516+
modwifi.build.debug_port=
517+
modwifi.build.debug_level=
468518

469519
modwifi.menu.CpuFrequency.80=80 MHz
470520
modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -521,6 +571,8 @@ thing.build.spiffs_start=0x6B000
521571
thing.build.spiffs_end=0x7B000
522572
thing.build.spiffs_blocksize=4096
523573
thing.build.spiffs_pagesize=256
574+
thing.build.debug_port=
575+
thing.build.debug_level=
524576

525577
thing.menu.CpuFrequency.80=80 MHz
526578
thing.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -570,6 +622,8 @@ esp210.build.variant=generic
570622
esp210.build.flash_mode=qio
571623
esp210.build.flash_size=4M
572624
esp210.build.flash_freq=40
625+
esp210.build.debug_port=
626+
esp210.build.debug_level=
573627

574628
esp210.menu.CpuFrequency.80=80 MHz
575629
esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -663,6 +717,8 @@ d1_mini.build.variant=d1_mini
663717
d1_mini.build.flash_mode=dio
664718
d1_mini.build.flash_size=4M
665719
d1_mini.build.flash_freq=40
720+
d1_mini.build.debug_port=
721+
d1_mini.build.debug_level=
666722

667723
d1_mini.menu.CpuFrequency.80=80 MHz
668724
d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -734,6 +790,8 @@ d1.build.variant=d1
734790
d1.build.flash_mode=dio
735791
d1.build.flash_size=4M
736792
d1.build.flash_freq=40
793+
d1.build.debug_port=
794+
d1.build.debug_level=
737795

738796
d1.menu.CpuFrequency.80=80 MHz
739797
d1.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -807,6 +865,8 @@ espino.build.flash_mode=qio
807865
espino.build.flash_size=4M
808866
espino.build.flash_freq=40
809867
espino.build.spiffs_pagesize=256
868+
espino.build.debug_port=
869+
espino.build.debug_level=
810870

811871
espino.menu.UploadTool.esptool=Serial
812872
espino.menu.UploadTool.esptool.upload.tool=esptool
@@ -884,6 +944,8 @@ wifinfo.build.variant=wifinfo
884944
wifinfo.build.flash_mode=qio
885945
wifinfo.build.board=ESP8266_ESP12
886946
wifinfo.build.spiffs_pagesize=256
947+
wifinfo.build.debug_port=
948+
wifinfo.build.debug_level=
887949

888950
#wifinfo.menu.ESPModule.ESP07512=ESP07 (1M/512K SPIFFS)
889951
#wifinfo.menu.ESPModule.ESP07512.build.board=ESP8266_ESP07

‎cores/esp8266/Updater.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
#define U_SPIFFS 100
2323
#define U_AUTH 200
2424

25-
//#define DEBUG_UPDATER Serial
25+
#ifdef DEBUG_ESP_UPDATER
26+
#ifdef DEBUG_ESP_PORT
27+
#define DEBUG_UPDATER DEBUG_ESP_PORT
28+
#endif
29+
#endif
2630

2731
class UpdaterClass {
2832
public:

‎cores/esp8266/core_esp8266_main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ static void loop_wrapper() {
101101
preloop_update_frequency();
102102
if(!setup_done) {
103103
setup();
104+
#ifdef DEBUG_ESP_PORT
105+
DEBUG_ESP_PORT.setDebugOutput(true);
106+
#endif
104107
setup_done = true;
105108
}
106109
loop();

‎cores/esp8266/debug.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
#include <stddef.h>
55
#include <stdint.h>
66

7-
//#define DEBUGV(...) ets_printf(__VA_ARGS__)
7+
#ifdef DEBUG_ESP_CORE
8+
#define DEBUGV(...) ets_printf(__VA_ARGS__)
9+
#endif
810

911
#ifndef DEBUGV
1012
#define DEBUGV(...)

‎libraries/ArduinoOTA/ArduinoOTA.cpp

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ extern "C" {
1818
#include "include/UdpContext.h"
1919
#include <ESP8266mDNS.h>
2020

21-
//#define OTA_DEBUG 1
21+
22+
#ifdef DEBUG_ESP_OTA
23+
#ifdef DEBUG_ESP_PORT
24+
#define OTA_DEBUG DEBUG_ESP_PORT
25+
#endif
26+
#endif
2227

2328
ArduinoOTAClass::ArduinoOTAClass()
2429
: _port(0)
@@ -109,8 +114,8 @@ void ArduinoOTAClass::begin() {
109114
}
110115
_initialized = true;
111116
_state = OTA_IDLE;
112-
#if OTA_DEBUG
113-
Serial.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
117+
#ifdef OTA_DEBUG
118+
OTA_DEBUG.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
114119
#endif
115120
}
116121

@@ -226,8 +231,8 @@ void ArduinoOTAClass::_onRx(){
226231

227232
void ArduinoOTAClass::_runUpdate() {
228233
if (!Update.begin(_size, _cmd)) {
229-
#if OTA_DEBUG
230-
Serial.println("Update Begin Error");
234+
#ifdef OTA_DEBUG
235+
OTA_DEBUG.println("Update Begin Error");
231236
#endif
232237
if (_error_callback) {
233238
_error_callback(OTA_BEGIN_ERROR);
@@ -249,8 +254,8 @@ void ArduinoOTAClass::_runUpdate() {
249254

250255
WiFiClient client;
251256
if (!client.connect(_ota_ip, _ota_port)) {
252-
#if OTA_DEBUG
253-
Serial.printf("Connect Failed\n");
257+
#ifdef OTA_DEBUG
258+
OTA_DEBUG.printf("Connect Failed\n");
254259
#endif
255260
_udp_ota->listen(*IP_ADDR_ANY, _port);
256261
if (_error_callback) {
@@ -265,8 +270,8 @@ void ArduinoOTAClass::_runUpdate() {
265270
while (!client.available() && waited--)
266271
delay(1);
267272
if (!waited){
268-
#if OTA_DEBUG
269-
Serial.printf("Receive Failed\n");
273+
#ifdef OTA_DEBUG
274+
OTA_DEBUG.printf("Receive Failed\n");
270275
#endif
271276
_udp_ota->listen(*IP_ADDR_ANY, _port);
272277
if (_error_callback) {
@@ -288,8 +293,8 @@ void ArduinoOTAClass::_runUpdate() {
288293
client.print("OK");
289294
client.stop();
290295
delay(10);
291-
#if OTA_DEBUG
292-
Serial.printf("Update Success\nRebooting...\n");
296+
#ifdef OTA_DEBUG
297+
OTA_DEBUG.printf("Update Success\nRebooting...\n");
293298
#endif
294299
if (_end_callback) {
295300
_end_callback();
@@ -301,8 +306,8 @@ void ArduinoOTAClass::_runUpdate() {
301306
_error_callback(OTA_END_ERROR);
302307
}
303308
Update.printError(client);
304-
#if OTA_DEBUG
305-
Update.printError(Serial);
309+
#ifdef OTA_DEBUG
310+
Update.printError(OTA_DEBUG);
306311
#endif
307312
_state = OTA_IDLE;
308313
}

‎libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
#ifndef ESP8266HTTPClient_H_
2626
#define ESP8266HTTPClient_H_
2727

28-
//#define DEBUG_HTTPCLIENT(...) Serial1.printf( __VA_ARGS__ )
28+
#ifdef DEBUG_ESP_HTTP_CLIENT
29+
#ifdef DEBUG_ESP_PORT
30+
#define DEBUG_HTTPCLIENT(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
31+
#endif
32+
#endif
2933

3034
#ifndef DEBUG_HTTPCLIENT
3135
#define DEBUG_HTTPCLIENT(...)

‎libraries/ESP8266WebServer/src/ESP8266WebServer.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@
2828
#include "ESP8266WebServer.h"
2929
#include "FS.h"
3030
#include "detail/RequestHandlersImpl.h"
31-
// #define DEBUG
31+
32+
//#define DEBUG_ESP_HTTP_SERVER
33+
#ifdef DEBUG_ESP_PORT
34+
#define DEBUG_OUTPUT DEBUG_ESP_PORT
35+
#else
3236
#define DEBUG_OUTPUT Serial
37+
#endif
3338

3439
const char * AUTHORIZATION_HEADER = "Authorization";
3540

@@ -155,7 +160,7 @@ void ESP8266WebServer::handleClient() {
155160
return;
156161
}
157162

158-
#ifdef DEBUG
163+
#ifdef DEBUG_ESP_HTTP_SERVER
159164
DEBUG_OUTPUT.println("New client");
160165
#endif
161166

@@ -416,13 +421,13 @@ void ESP8266WebServer::onNotFound(THandlerFunction fn) {
416421
void ESP8266WebServer::_handleRequest() {
417422
bool handled = false;
418423
if (!_currentHandler){
419-
#ifdef DEBUG
424+
#ifdef DEBUG_ESP_HTTP_SERVER
420425
DEBUG_OUTPUT.println("request handler not found");
421426
#endif
422427
}
423428
else {
424429
handled = _currentHandler->handle(*this, _currentMethod, _currentUri);
425-
#ifdef DEBUG
430+
#ifdef DEBUG_ESP_HTTP_SERVER
426431
if (!handled) {
427432
DEBUG_OUTPUT.println("request handler failed to handle request");
428433
}

0 commit comments

Comments
 (0)