Skip to content

Commit 7b297d2

Browse files
author
Me No Dev
committed
Merge remote-tracking branch 'esp8266/master'
2 parents b28be23 + 1581a8f commit 7b297d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2766
-1529
lines changed

‎boards.txt‎

Lines changed: 129 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
@@ -180,6 +220,75 @@ generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
180220
# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
181221
# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
182222

223+
##############################################################
224+
espduino.name=ESPDuino (ESP-13 Module)
225+
226+
espduino.upload.tool=esptool
227+
espduino.upload.speed=115200
228+
espduino.upload.resetmethod=ck
229+
espduino.upload.maximum_size=1044464
230+
espduino.upload.maximum_data_size=81920
231+
espduino.upload.wait_for_upload_port=true
232+
espduino.serial.disableDTR=true
233+
espduino.serial.disableRTS=true
234+
235+
espduino.build.mcu=esp8266
236+
espduino.build.f_cpu=80000000L
237+
espduino.build.board=ESP8266_ESP13
238+
espduino.build.core=esp8266
239+
espduino.build.variant=espduino
240+
espduino.build.flash_mode=dio
241+
espduino.build.flash_size=4M
242+
espduino.build.flash_freq=40
243+
espduino.build.debug_port=
244+
espduino.build.debug_level=
245+
246+
espduino.menu.CpuFrequency.80=80 MHz
247+
espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
248+
espduino.menu.CpuFrequency.160=160 MHz
249+
espduino.menu.CpuFrequency.160.build.f_cpu=160000000L
250+
251+
espduino.menu.UploadTool.esptool=Serial
252+
espduino.menu.UploadTool.esptool.upload.tool=esptool
253+
espduino.menu.UploadTool.esptool.upload.verbose=-vv
254+
espduino.menu.UploadTool.espota=OTA
255+
espduino.menu.UploadTool.espota.upload.tool=espota
256+
257+
espduino.menu.UploadSpeed.115200=115200
258+
espduino.menu.UploadSpeed.115200.upload.speed=115200
259+
espduino.menu.UploadSpeed.9600=9600
260+
espduino.menu.UploadSpeed.9600.upload.speed=9600
261+
espduino.menu.UploadSpeed.57600=57600
262+
espduino.menu.UploadSpeed.57600.upload.speed=57600
263+
espduino.menu.UploadSpeed.256000.windows=256000
264+
espduino.menu.UploadSpeed.256000.upload.speed=256000
265+
espduino.menu.UploadSpeed.230400.linux=230400
266+
espduino.menu.UploadSpeed.230400.macosx=230400
267+
espduino.menu.UploadSpeed.230400.macosx=230400
268+
espduino.menu.UploadSpeed.230400.upload.speed=230400
269+
espduino.menu.UploadSpeed.460800.linux=460800
270+
espduino.menu.UploadSpeed.460800.macosx=460800
271+
espduino.menu.UploadSpeed.460800.upload.speed=460800
272+
espduino.menu.UploadSpeed.512000.windows=512000
273+
espduino.menu.UploadSpeed.512000.upload.speed=512000
274+
espduino.menu.UploadSpeed.921600=921600
275+
espduino.menu.UploadSpeed.921600.upload.speed=921600
276+
277+
espduino.menu.FlashSize.4M3M=4M (3M SPIFFS)
278+
espduino.menu.FlashSize.4M3M.build.flash_size=4M
279+
espduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
280+
espduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
281+
espduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
282+
espduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
283+
espduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
284+
285+
espduino.menu.FlashSize.4M1M=4M (1M SPIFFS)
286+
espduino.menu.FlashSize.4M1M.build.flash_size=4M
287+
espduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
288+
espduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
289+
espduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
290+
espduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
291+
espduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
183292
##############################################################
184293
huzzah.name=Adafruit HUZZAH ESP8266
185294

@@ -200,6 +309,8 @@ huzzah.build.variant=adafruit
200309
huzzah.build.flash_mode=qio
201310
huzzah.build.flash_size=4M
202311
huzzah.build.flash_freq=40
312+
huzzah.build.debug_port=
313+
huzzah.build.debug_level=
203314

204315
huzzah.menu.CpuFrequency.80=80 MHz
205316
huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -257,6 +368,8 @@ nodemcu.build.variant=nodemcu
257368
nodemcu.build.flash_mode=qio
258369
nodemcu.build.flash_size=4M
259370
nodemcu.build.flash_freq=40
371+
nodemcu.build.debug_port=
372+
nodemcu.build.debug_level=
260373

261374
nodemcu.menu.CpuFrequency.80=80 MHz
262375
nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -323,6 +436,8 @@ nodemcuv2.build.variant=nodemcu
323436
nodemcuv2.build.flash_mode=dio
324437
nodemcuv2.build.flash_size=4M
325438
nodemcuv2.build.flash_freq=40
439+
nodemcuv2.build.debug_port=
440+
nodemcuv2.build.debug_level=
326441

327442
nodemcuv2.menu.CpuFrequency.80=80 MHz
328443
nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -398,6 +513,8 @@ modwifi.build.spiffs_start=0x100000
398513
modwifi.build.spiffs_end=0x1FB000
399514
modwifi.build.spiffs_pagesize=256
400515
modwifi.build.spiffs_blocksize=8192
516+
modwifi.build.debug_port=
517+
modwifi.build.debug_level=
401518

402519
modwifi.menu.CpuFrequency.80=80 MHz
403520
modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -454,6 +571,8 @@ thing.build.spiffs_start=0x6B000
454571
thing.build.spiffs_end=0x7B000
455572
thing.build.spiffs_blocksize=4096
456573
thing.build.spiffs_pagesize=256
574+
thing.build.debug_port=
575+
thing.build.debug_level=
457576

458577
thing.menu.CpuFrequency.80=80 MHz
459578
thing.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -503,6 +622,8 @@ esp210.build.variant=generic
503622
esp210.build.flash_mode=qio
504623
esp210.build.flash_size=4M
505624
esp210.build.flash_freq=40
625+
esp210.build.debug_port=
626+
esp210.build.debug_level=
506627

507628
esp210.menu.CpuFrequency.80=80 MHz
508629
esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -596,6 +717,8 @@ d1_mini.build.variant=d1_mini
596717
d1_mini.build.flash_mode=dio
597718
d1_mini.build.flash_size=4M
598719
d1_mini.build.flash_freq=40
720+
d1_mini.build.debug_port=
721+
d1_mini.build.debug_level=
599722

600723
d1_mini.menu.CpuFrequency.80=80 MHz
601724
d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -667,6 +790,8 @@ d1.build.variant=d1
667790
d1.build.flash_mode=dio
668791
d1.build.flash_size=4M
669792
d1.build.flash_freq=40
793+
d1.build.debug_port=
794+
d1.build.debug_level=
670795

671796
d1.menu.CpuFrequency.80=80 MHz
672797
d1.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -740,6 +865,8 @@ espino.build.flash_mode=qio
740865
espino.build.flash_size=4M
741866
espino.build.flash_freq=40
742867
espino.build.spiffs_pagesize=256
868+
espino.build.debug_port=
869+
espino.build.debug_level=
743870

744871
espino.menu.UploadTool.esptool=Serial
745872
espino.menu.UploadTool.esptool.upload.tool=esptool
@@ -817,6 +944,8 @@ wifinfo.build.variant=wifinfo
817944
wifinfo.build.flash_mode=qio
818945
wifinfo.build.board=ESP8266_ESP12
819946
wifinfo.build.spiffs_pagesize=256
947+
wifinfo.build.debug_port=
948+
wifinfo.build.debug_level=
820949

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

‎cores/esp8266/Arduino.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ extern "C" {
3737
#include "binary.h"
3838
#include "esp8266_peri.h"
3939
#include "twi.h"
40+
#include "core_esp8266_features.h"
4041

4142
#define HIGH 0x1
4243
#define LOW 0x0
@@ -247,8 +248,12 @@ void optimistic_yield(uint32_t interval_us);
247248
#include "Updater.h"
248249
#include "debug.h"
249250

251+
#ifndef _GLIBCXX_VECTOR
252+
// arduino is not compatible with std::vector
250253
#define min(a,b) ((a)<(b)?(a):(b))
251254
#define max(a,b) ((a)>(b)?(a):(b))
255+
#endif
256+
252257
#define _min(a,b) ((a)<(b)?(a):(b))
253258
#define _max(a,b) ((a)>(b)?(a):(b))
254259

‎cores/esp8266/IPAddress.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ class IPAddress: public Printable {
5656
bool operator==(const IPAddress& addr) const {
5757
return _address.dword == addr._address.dword;
5858
}
59+
bool operator==(uint32_t addr) const {
60+
return _address.dword == addr;
61+
}
5962
bool operator==(const uint8_t* addr) const;
6063

6164
// Overloaded index operator to allow getting and setting individual octets of the address

‎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_features.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#define CORE_HAS_LIBB64
2929
#define CORE_HAS_BASE64_CLASS
3030

31+
#define WIFI_HAS_EVENT_CALLBACK
32+
3133

3234
#endif
3335

‎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(...)

‎doc/filesystem.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
4949
SparkFun Thing | 512k | 64k
5050
SweetPea ESP-210 | 4M | 1M, 3M
5151
WeMos D1 & D1 mini | 4M | 1M, 3M
52+
ESPDuino | 4M | 1M, 3M
5253

5354
**Note:** to use any of file system functions in the sketch, add the following include to the sketch:
5455

‎doc/ota_updates/a-ota-external-serial-terminal-output.png‎

59.6 KB
Loading

‎doc/ota_updates/a-ota-ota-port-selection.png‎

100 KB
Loading

0 commit comments

Comments
 (0)