Skip to content

Commit 3bf8244

Browse files
committed
Merge branch 'master' into esptool_reset_method
2 parents a396bcd + 2abcd16 commit 3bf8244

File tree

192 files changed

+19023
-14688
lines changed

Some content is hidden

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

192 files changed

+19023
-14688
lines changed

.travis.yml

+16-25
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
language: bash
22
os: linux
3-
dist: trusty
3+
dist: bionic
44

55
git:
66
depth: 1
77
submodules: false
88

9-
addons:
10-
apt:
11-
sources:
12-
- ubuntu-toolchain-r-test
13-
packages:
14-
- g++-7
15-
- gcc-7
16-
179
before_install:
1810
- git submodule update --init # no recursive update
1911

@@ -84,17 +76,29 @@ jobs:
8476
env:
8577
- BUILD_PARITY=odd
8678

79+
- name: "Mac OSX can build sketches"
80+
os: osx
81+
stage: build
82+
script: $TRAVIS_BUILD_DIR/tests/build.sh
83+
env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
84+
85+
- name: "Windows can build sketches"
86+
os: windows
87+
stage: build
88+
script: $TRAVIS_BUILD_DIR/tests/build.sh
89+
env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
90+
8791
- name: "Host tests"
8892
stage: build
8993
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
90-
install: sudo apt-get install valgrind lcov
91-
env: CC=gcc-7 CXX=g++-7
94+
install:
95+
- sudo apt-get install valgrind lcov
9296

9397
- name: "Docs"
9498
stage: build
9599
script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
96100
install:
97-
- sudo apt-get install python3-pip
101+
- sudo apt-get install python3-pip python3-setuptools
98102
- pip3 install --user -r doc/requirements.txt;
99103

100104
- name: "Style check"
@@ -105,19 +109,6 @@ jobs:
105109
- name: "Mock trivial test"
106110
stage: build
107111
script: $TRAVIS_BUILD_DIR/tests/buildm.sh
108-
env: CC=gcc-7 CXX=g++-7
109-
110-
- name: "Mac OSX can build sketches"
111-
os: osx
112-
stage: build
113-
script: $TRAVIS_BUILD_DIR/tests/build.sh
114-
env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
115-
116-
- name: "Windows can build sketches"
117-
os: windows
118-
stage: build
119-
script: $TRAVIS_BUILD_DIR/tests/build.sh
120-
env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
121112

122113
- name: "Boards"
123114
stage: build

README.md

+5-27
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and
1616
# Contents
1717
- Installing options:
1818
- [Using Boards Manager](#installing-with-boards-manager)
19-
- [Using git version](#using-git-version-basic-instructions)
19+
- [Using git version](#using-git-version)
2020
- [Using PlatformIO](#using-platformio)
2121
- [Building with make](#building-with-make)
2222
- [Documentation](#documentation)
@@ -38,35 +38,13 @@ Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_inde
3838

3939
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.2/](https://arduino-esp8266.readthedocs.io/en/2.5.2/)
4040

41-
### Using git version (basic instructions)
41+
### Using git version
4242
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
4343

44+
Also known as latest git or master branch.
45+
4446
- Install the current upstream Arduino IDE at the 1.8 level or later. The current version is on the [Arduino website](https://www.arduino.cc/en/main/software).
45-
- Go to Arduino directory
46-
- For Mac OS X, it is `Arduino.app` showing as the Arduino icon.
47-
This location may be your `~/Downloads`, `~/Desktop` or even `/Applications`.
48-
```bash
49-
cd <application-directory>/Arduino.app/Contents/Java
50-
```
51-
- For Linux, it is ~/Arduino by default.
52-
```bash
53-
cd ~/Arduino
54-
```
55-
- Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
56-
```bash
57-
cd hardware
58-
mkdir esp8266com
59-
cd esp8266com
60-
git clone https://github.com/esp8266/Arduino.git esp8266
61-
cd esp8266
62-
git submodule update --init
63-
```
64-
- Download binary tools (you need Python 2.7)
65-
```bash
66-
cd esp8266/tools
67-
python get.py
68-
```
69-
- Restart Arduino
47+
- Follow the [instructions in the documentation](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version).
7048

7149
### Using PlatformIO
7250

boards.txt

+198-3
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,13 @@ generic.menu.led.15=15
372372
generic.menu.led.15.build.led=-DLED_BUILTIN=15
373373
generic.menu.led.16=16
374374
generic.menu.led.16.build.led=-DLED_BUILTIN=16
375-
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
376-
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
375+
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (190703 approved)
376+
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22x_190703
377+
generic.menu.sdk.nonosdk222_111=nonos-sdk 2.2.1+111 (191024 testing)
378+
generic.menu.sdk.nonosdk222_111.build.sdk=NONOSDK22x_191024
377379
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
378380
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
379-
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
381+
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
380382
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
381383
generic.menu.ip.lm2f=v2 Lower Memory
382384
generic.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -3319,6 +3321,199 @@ thingdev.menu.baud.921600.upload.speed=921600
33193321
thingdev.menu.baud.3000000=3000000
33203322
thingdev.menu.baud.3000000.upload.speed=3000000
33213323

3324+
##############################################################
3325+
blynk.name=SparkFun Blynk Board
3326+
blynk.build.board=ESP8266_THING
3327+
blynk.build.variant=thing
3328+
blynk.upload.tool=esptool
3329+
blynk.upload.maximum_data_size=81920
3330+
blynk.upload.wait_for_upload_port=true
3331+
blynk.upload.erase_cmd=version
3332+
blynk.serial.disableDTR=true
3333+
blynk.serial.disableRTS=true
3334+
blynk.build.mcu=esp8266
3335+
blynk.build.core=esp8266
3336+
blynk.build.spiffs_pagesize=256
3337+
blynk.build.debug_port=
3338+
blynk.build.debug_level=
3339+
blynk.menu.xtal.80=80 MHz
3340+
blynk.menu.xtal.80.build.f_cpu=80000000L
3341+
blynk.menu.xtal.160=160 MHz
3342+
blynk.menu.xtal.160.build.f_cpu=160000000L
3343+
blynk.menu.vt.flash=Flash
3344+
blynk.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
3345+
blynk.menu.vt.heap=Heap
3346+
blynk.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
3347+
blynk.menu.vt.iram=IRAM
3348+
blynk.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
3349+
blynk.menu.exception.legacy=Legacy (new can return nullptr)
3350+
blynk.menu.exception.legacy.build.exception_flags=-fno-exceptions
3351+
blynk.menu.exception.legacy.build.stdcpp_lib=-lstdc++
3352+
blynk.menu.exception.disabled=Disabled (new can abort)
3353+
blynk.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
3354+
blynk.menu.exception.disabled.build.stdcpp_lib=-lstdc++
3355+
blynk.menu.exception.enabled=Enabled
3356+
blynk.menu.exception.enabled.build.exception_flags=-fexceptions
3357+
blynk.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
3358+
blynk.menu.ssl.all=All SSL ciphers (most compatible)
3359+
blynk.menu.ssl.all.build.sslflags=
3360+
blynk.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
3361+
blynk.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
3362+
blynk.upload.resetmethod=nodemcu
3363+
blynk.build.flash_mode=qio
3364+
blynk.build.flash_flags=-DFLASHMODE_QIO
3365+
blynk.build.flash_freq=40
3366+
blynk.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
3367+
blynk.menu.eesz.4M2M.build.flash_size=4M
3368+
blynk.menu.eesz.4M2M.build.flash_size_bytes=0x400000
3369+
blynk.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
3370+
blynk.menu.eesz.4M2M.build.spiffs_pagesize=256
3371+
blynk.menu.eesz.4M2M.upload.maximum_size=1044464
3372+
blynk.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
3373+
blynk.menu.eesz.4M2M.build.spiffs_start=0x200000
3374+
blynk.menu.eesz.4M2M.build.spiffs_end=0x3FA000
3375+
blynk.menu.eesz.4M2M.build.spiffs_blocksize=8192
3376+
blynk.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
3377+
blynk.menu.eesz.4M3M.build.flash_size=4M
3378+
blynk.menu.eesz.4M3M.build.flash_size_bytes=0x400000
3379+
blynk.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
3380+
blynk.menu.eesz.4M3M.build.spiffs_pagesize=256
3381+
blynk.menu.eesz.4M3M.upload.maximum_size=1044464
3382+
blynk.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
3383+
blynk.menu.eesz.4M3M.build.spiffs_start=0x100000
3384+
blynk.menu.eesz.4M3M.build.spiffs_end=0x3FA000
3385+
blynk.menu.eesz.4M3M.build.spiffs_blocksize=8192
3386+
blynk.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
3387+
blynk.menu.eesz.4M1M.build.flash_size=4M
3388+
blynk.menu.eesz.4M1M.build.flash_size_bytes=0x400000
3389+
blynk.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
3390+
blynk.menu.eesz.4M1M.build.spiffs_pagesize=256
3391+
blynk.menu.eesz.4M1M.upload.maximum_size=1044464
3392+
blynk.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
3393+
blynk.menu.eesz.4M1M.build.spiffs_start=0x300000
3394+
blynk.menu.eesz.4M1M.build.spiffs_end=0x3FA000
3395+
blynk.menu.eesz.4M1M.build.spiffs_blocksize=8192
3396+
blynk.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
3397+
blynk.menu.eesz.4M.build.flash_size=4M
3398+
blynk.menu.eesz.4M.build.flash_size_bytes=0x400000
3399+
blynk.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
3400+
blynk.menu.eesz.4M.build.spiffs_pagesize=256
3401+
blynk.menu.eesz.4M.upload.maximum_size=1044464
3402+
blynk.menu.eesz.4M.build.rfcal_addr=0x3FC000
3403+
blynk.menu.ip.lm2f=v2 Lower Memory
3404+
blynk.menu.ip.lm2f.build.lwip_include=lwip2/include
3405+
blynk.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
3406+
blynk.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
3407+
blynk.menu.ip.hb2f=v2 Higher Bandwidth
3408+
blynk.menu.ip.hb2f.build.lwip_include=lwip2/include
3409+
blynk.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
3410+
blynk.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
3411+
blynk.menu.ip.lm2n=v2 Lower Memory (no features)
3412+
blynk.menu.ip.lm2n.build.lwip_include=lwip2/include
3413+
blynk.menu.ip.lm2n.build.lwip_lib=-llwip2-536
3414+
blynk.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
3415+
blynk.menu.ip.hb2n=v2 Higher Bandwidth (no features)
3416+
blynk.menu.ip.hb2n.build.lwip_include=lwip2/include
3417+
blynk.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
3418+
blynk.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
3419+
blynk.menu.ip.lm6f=v2 IPv6 Lower Memory
3420+
blynk.menu.ip.lm6f.build.lwip_include=lwip2/include
3421+
blynk.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
3422+
blynk.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
3423+
blynk.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
3424+
blynk.menu.ip.hb6f.build.lwip_include=lwip2/include
3425+
blynk.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
3426+
blynk.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
3427+
blynk.menu.ip.hb1=v1.4 Higher Bandwidth
3428+
blynk.menu.ip.hb1.build.lwip_lib=-llwip_gcc
3429+
blynk.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
3430+
blynk.menu.ip.src=v1.4 Compile from source
3431+
blynk.menu.ip.src.build.lwip_lib=-llwip_src
3432+
blynk.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
3433+
blynk.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
3434+
blynk.menu.dbg.Disabled=Disabled
3435+
blynk.menu.dbg.Disabled.build.debug_port=
3436+
blynk.menu.dbg.Serial=Serial
3437+
blynk.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
3438+
blynk.menu.dbg.Serial1=Serial1
3439+
blynk.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
3440+
blynk.menu.lvl.None____=None
3441+
blynk.menu.lvl.None____.build.debug_level=
3442+
blynk.menu.lvl.SSL=SSL
3443+
blynk.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
3444+
blynk.menu.lvl.TLS_MEM=TLS_MEM
3445+
blynk.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
3446+
blynk.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
3447+
blynk.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
3448+
blynk.menu.lvl.HTTP_SERVER=HTTP_SERVER
3449+
blynk.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
3450+
blynk.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
3451+
blynk.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
3452+
blynk.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
3453+
blynk.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
3454+
blynk.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
3455+
blynk.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
3456+
blynk.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
3457+
blynk.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
3458+
blynk.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
3459+
blynk.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
3460+
blynk.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
3461+
blynk.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
3462+
blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
3463+
blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
3464+
blynk.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
3465+
blynk.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
3466+
blynk.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
3467+
blynk.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
3468+
blynk.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
3469+
blynk.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
3470+
blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
3471+
blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
3472+
blynk.menu.lvl.CORE=CORE
3473+
blynk.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
3474+
blynk.menu.lvl.WIFI=WIFI
3475+
blynk.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
3476+
blynk.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
3477+
blynk.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
3478+
blynk.menu.lvl.UPDATER=UPDATER
3479+
blynk.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
3480+
blynk.menu.lvl.OTA=OTA
3481+
blynk.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
3482+
blynk.menu.lvl.OOM=OOM
3483+
blynk.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
3484+
blynk.menu.lvl.MDNS=MDNS
3485+
blynk.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
3486+
blynk.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
3487+
blynk.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
3488+
blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
3489+
blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
3490+
blynk.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
3491+
blynk.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
3492+
blynk.menu.wipe.none=Only Sketch
3493+
blynk.menu.wipe.none.upload.erase_cmd=version
3494+
blynk.menu.wipe.sdk=Sketch + WiFi Settings
3495+
blynk.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
3496+
blynk.menu.wipe.all=All Flash Contents
3497+
blynk.menu.wipe.all.upload.erase_cmd=erase_flash
3498+
blynk.menu.baud.115200=115200
3499+
blynk.menu.baud.115200.upload.speed=115200
3500+
blynk.menu.baud.57600=57600
3501+
blynk.menu.baud.57600.upload.speed=57600
3502+
blynk.menu.baud.230400.linux=230400
3503+
blynk.menu.baud.230400.macosx=230400
3504+
blynk.menu.baud.230400.upload.speed=230400
3505+
blynk.menu.baud.256000.windows=256000
3506+
blynk.menu.baud.256000.upload.speed=256000
3507+
blynk.menu.baud.460800.linux=460800
3508+
blynk.menu.baud.460800.macosx=460800
3509+
blynk.menu.baud.460800.upload.speed=460800
3510+
blynk.menu.baud.512000.windows=512000
3511+
blynk.menu.baud.512000.upload.speed=512000
3512+
blynk.menu.baud.921600=921600
3513+
blynk.menu.baud.921600.upload.speed=921600
3514+
blynk.menu.baud.3000000=3000000
3515+
blynk.menu.baud.3000000.upload.speed=3000000
3516+
33223517
##############################################################
33233518
esp210.name=SweetPea ESP-210
33243519
esp210.build.board=ESP8266_ESP210

cores/esp8266/Arduino.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -275,16 +275,15 @@ long secureRandom(long);
275275
long secureRandom(long, long);
276276
long map(long, long, long, long, long);
277277

278-
extern "C" void configTime(long timezone, int daylightOffset_sec,
279-
const char* server1, const char* server2 = nullptr, const char* server3 = nullptr);
278+
void configTime(int timezone, int daylightOffset_sec, const char* server1,
279+
const char* server2 = nullptr, const char* server3 = nullptr);
280280

281-
#endif
281+
void configTime(const char* tz, const char* server1,
282+
const char* server2 = nullptr, const char* server3 = nullptr);
282283

283-
#include "pins_arduino.h"
284+
#endif // __cplusplus
284285

285-
#ifndef PUYA_SUPPORT
286-
#define PUYA_SUPPORT 1
287-
#endif
286+
#include "pins_arduino.h"
288287

289288
#endif
290289

0 commit comments

Comments
 (0)