Skip to content

Commit 2bbadca

Browse files
mhightower83mhightower83
authored
Merge branch 'master' into pr-heap-refactor3
2 parents 1c99daf + ccea728 commit 2bbadca

File tree

107 files changed

+2524
-831
lines changed

Some content is hidden

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

107 files changed

+2524
-831
lines changed

‎.github/workflows/style-check.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,9 @@ jobs:
2424
with:
2525
python-version: '3.x'
2626
- name: Style check
27-
env:
28-
LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
2927
run: |
30-
export GNUPGHOME=$(mktemp -d)
31-
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
32-
gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
33-
sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
34-
gpgconf --kill all
35-
rm -r $GNUPGHOME
36-
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | \
37-
sudo tee /etc/apt/sources.list.d/llvm.list
3828
sudo apt update
39-
sudo apt install clang-format-13
40-
pip3 install pyyaml
29+
python ./tests/test_restyle.py --quiet
4130
bash ./tests/ci/style_check.sh
4231
4332
# Validate orthography

‎boards.txt

Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5645,6 +5645,229 @@ agruminolemon.menu.iramfloat.no.build.iramfloat=-DFP_IN_IROM
56455645
agruminolemon.menu.iramfloat.yes=allowed in ISR
56465646
agruminolemon.menu.iramfloat.yes.build.iramfloat=-DFP_IN_IRAM
56475647

5648+
##############################################################
5649+
mercury1.name=Mercury 1.0
5650+
mercury1.build.board=mercury
5651+
mercury1.build.variant=mercury_v1
5652+
mercury1.upload.tool=esptool
5653+
mercury1.upload.maximum_data_size=81920
5654+
mercury1.upload.wait_for_upload_port=true
5655+
mercury1.upload.erase_cmd=
5656+
mercury1.serial.disableDTR=true
5657+
mercury1.serial.disableRTS=true
5658+
mercury1.build.mcu=esp8266
5659+
mercury1.build.core=esp8266
5660+
mercury1.build.spiffs_pagesize=256
5661+
mercury1.build.debug_optim=
5662+
mercury1.build.debug_port=
5663+
mercury1.build.debug_level=
5664+
mercury1.menu.xtal.80=80 MHz
5665+
mercury1.menu.xtal.80.build.f_cpu=80000000L
5666+
mercury1.menu.xtal.160=160 MHz
5667+
mercury1.menu.xtal.160.build.f_cpu=160000000L
5668+
mercury1.menu.vt.flash=Flash
5669+
mercury1.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
5670+
mercury1.menu.vt.heap=Heap
5671+
mercury1.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
5672+
mercury1.menu.vt.iram=IRAM
5673+
mercury1.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
5674+
mercury1.menu.exception.disabled=Disabled (new aborts on oom)
5675+
mercury1.menu.exception.disabled.build.exception_flags=-fno-exceptions
5676+
mercury1.menu.exception.disabled.build.stdcpp_lib=-lstdc++
5677+
mercury1.menu.exception.enabled=Enabled
5678+
mercury1.menu.exception.enabled.build.exception_flags=-fexceptions
5679+
mercury1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
5680+
mercury1.menu.stacksmash.disabled=Disabled
5681+
mercury1.menu.stacksmash.disabled.build.stacksmash_flags=
5682+
mercury1.menu.stacksmash.enabled=Enabled
5683+
mercury1.menu.stacksmash.enabled.build.stacksmash_flags=-fstack-protector
5684+
mercury1.menu.ssl.all=All SSL ciphers (most compatible)
5685+
mercury1.menu.ssl.all.build.sslflags=
5686+
mercury1.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
5687+
mercury1.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
5688+
mercury1.menu.mmu.3232=32KB cache + 32KB IRAM (balanced)
5689+
mercury1.menu.mmu.3232.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
5690+
mercury1.menu.mmu.4816=16KB cache + 48KB IRAM (IRAM)
5691+
mercury1.menu.mmu.4816.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000
5692+
mercury1.menu.mmu.4816H=16KB cache + 48KB IRAM and 2nd Heap (shared)
5693+
mercury1.menu.mmu.4816H.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP
5694+
mercury1.menu.mmu.3216=16KB cache + 32KB IRAM + 16KB 2nd Heap (not shared)
5695+
mercury1.menu.mmu.3216.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000
5696+
mercury1.menu.mmu.ext128k=128K Heap External 23LC1024
5697+
mercury1.menu.mmu.ext128k.build.mmuflags=-DMMU_EXTERNAL_HEAP=128 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
5698+
mercury1.menu.mmu.ext8192k=8M w/256K Heap External 64 MBit PSRAM
5699+
mercury1.menu.mmu.ext8192k.build.mmuflags=-DMMU_EXTERNAL_HEAP=256 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
5700+
mercury1.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM
5701+
mercury1.menu.non32xfer.fast.build.non32xferflags=
5702+
mercury1.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow)
5703+
mercury1.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER
5704+
mercury1.upload.resetmethod=--before default_reset --after hard_reset
5705+
mercury1.build.flash_mode=dio
5706+
mercury1.build.flash_flags=-DFLASHMODE_DIO
5707+
mercury1.build.flash_freq=40
5708+
mercury1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
5709+
mercury1.menu.eesz.4M2M.build.flash_size=4M
5710+
mercury1.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
5711+
mercury1.menu.eesz.4M2M.build.spiffs_pagesize=256
5712+
mercury1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
5713+
mercury1.menu.eesz.4M2M.build.spiffs_start=0x200000
5714+
mercury1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
5715+
mercury1.menu.eesz.4M2M.build.spiffs_blocksize=8192
5716+
mercury1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
5717+
mercury1.menu.eesz.4M3M.build.flash_size=4M
5718+
mercury1.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
5719+
mercury1.menu.eesz.4M3M.build.spiffs_pagesize=256
5720+
mercury1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
5721+
mercury1.menu.eesz.4M3M.build.spiffs_start=0x100000
5722+
mercury1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
5723+
mercury1.menu.eesz.4M3M.build.spiffs_blocksize=8192
5724+
mercury1.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
5725+
mercury1.menu.eesz.4M1M.build.flash_size=4M
5726+
mercury1.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
5727+
mercury1.menu.eesz.4M1M.build.spiffs_pagesize=256
5728+
mercury1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
5729+
mercury1.menu.eesz.4M1M.build.spiffs_start=0x300000
5730+
mercury1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
5731+
mercury1.menu.eesz.4M1M.build.spiffs_blocksize=8192
5732+
mercury1.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
5733+
mercury1.menu.eesz.4M.build.flash_size=4M
5734+
mercury1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
5735+
mercury1.menu.eesz.4M.build.spiffs_pagesize=256
5736+
mercury1.menu.eesz.4M.build.rfcal_addr=0x3FC000
5737+
mercury1.menu.ip.lm2f=v2 Lower Memory
5738+
mercury1.menu.ip.lm2f.build.lwip_include=lwip2/include
5739+
mercury1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
5740+
mercury1.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
5741+
mercury1.menu.ip.hb2f=v2 Higher Bandwidth
5742+
mercury1.menu.ip.hb2f.build.lwip_include=lwip2/include
5743+
mercury1.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
5744+
mercury1.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
5745+
mercury1.menu.ip.lm2n=v2 Lower Memory (no features)
5746+
mercury1.menu.ip.lm2n.build.lwip_include=lwip2/include
5747+
mercury1.menu.ip.lm2n.build.lwip_lib=-llwip2-536
5748+
mercury1.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
5749+
mercury1.menu.ip.hb2n=v2 Higher Bandwidth (no features)
5750+
mercury1.menu.ip.hb2n.build.lwip_include=lwip2/include
5751+
mercury1.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
5752+
mercury1.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
5753+
mercury1.menu.ip.lm6f=v2 IPv6 Lower Memory
5754+
mercury1.menu.ip.lm6f.build.lwip_include=lwip2/include
5755+
mercury1.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
5756+
mercury1.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
5757+
mercury1.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
5758+
mercury1.menu.ip.hb6f.build.lwip_include=lwip2/include
5759+
mercury1.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
5760+
mercury1.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
5761+
mercury1.menu.dbg.Disabled=Disabled
5762+
mercury1.menu.dbg.Disabled.build.debug_port=
5763+
mercury1.menu.dbg.Serial=Serial
5764+
mercury1.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
5765+
mercury1.menu.dbg.Serial1=Serial1
5766+
mercury1.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
5767+
mercury1.menu.lvl.None____=None
5768+
mercury1.menu.lvl.None____.build.debug_level=
5769+
mercury1.menu.optim.Smallest=None
5770+
mercury1.menu.optim.Smallest.build.debug_optim=-Os
5771+
mercury1.menu.optim.Lite=Lite
5772+
mercury1.menu.optim.Lite.build.debug_optim=-Os -fno-optimize-sibling-calls
5773+
mercury1.menu.optim.Full=Optimum
5774+
mercury1.menu.optim.Full.build.debug_optim=-Og
5775+
mercury1.menu.lvl.SSL=SSL
5776+
mercury1.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
5777+
mercury1.menu.lvl.TLS_MEM=TLS_MEM
5778+
mercury1.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
5779+
mercury1.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
5780+
mercury1.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
5781+
mercury1.menu.lvl.HTTP_SERVER=HTTP_SERVER
5782+
mercury1.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
5783+
mercury1.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
5784+
mercury1.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
5785+
mercury1.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
5786+
mercury1.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
5787+
mercury1.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
5788+
mercury1.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
5789+
mercury1.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
5790+
mercury1.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
5791+
mercury1.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
5792+
mercury1.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
5793+
mercury1.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
5794+
mercury1.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
5795+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
5796+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
5797+
mercury1.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
5798+
mercury1.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
5799+
mercury1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
5800+
mercury1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
5801+
mercury1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
5802+
mercury1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
5803+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
5804+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
5805+
mercury1.menu.lvl.CORE=CORE
5806+
mercury1.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
5807+
mercury1.menu.lvl.WIFI=WIFI
5808+
mercury1.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
5809+
mercury1.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
5810+
mercury1.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
5811+
mercury1.menu.lvl.UPDATER=UPDATER
5812+
mercury1.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
5813+
mercury1.menu.lvl.OTA=OTA
5814+
mercury1.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
5815+
mercury1.menu.lvl.OOM=OOM
5816+
mercury1.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
5817+
mercury1.menu.lvl.MDNS=MDNS
5818+
mercury1.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
5819+
mercury1.menu.lvl.HWDT=HWDT
5820+
mercury1.menu.lvl.HWDT.build.debug_level= -DDEBUG_ESP_HWDT
5821+
mercury1.menu.lvl.HWDT_NOEXTRA4K=HWDT_NOEXTRA4K
5822+
mercury1.menu.lvl.HWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_HWDT_NOEXTRA4K
5823+
mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
5824+
mercury1.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
5825+
mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT
5826+
mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT.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 -DDEBUG_ESP_HWDT
5827+
mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K
5828+
mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K.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 -DDEBUG_ESP_HWDT_NOEXTRA4K
5829+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
5830+
mercury1.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
5831+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT
5832+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT.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 -DDEBUG_ESP_HWDT
5833+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K
5834+
mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K.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 -DDEBUG_ESP_HWDT_NOEXTRA4K
5835+
mercury1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
5836+
mercury1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
5837+
mercury1.menu.wipe.none=Only Sketch
5838+
mercury1.menu.wipe.none.upload.erase_cmd=
5839+
mercury1.menu.wipe.sdk=Sketch + WiFi Settings
5840+
mercury1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
5841+
mercury1.menu.wipe.all=All Flash Contents
5842+
mercury1.menu.wipe.all.upload.erase_cmd=erase_flash
5843+
mercury1.menu.baud.115200=115200
5844+
mercury1.menu.baud.115200.upload.speed=115200
5845+
mercury1.menu.baud.57600=57600
5846+
mercury1.menu.baud.57600.upload.speed=57600
5847+
mercury1.menu.baud.230400.linux=230400
5848+
mercury1.menu.baud.230400.macosx=230400
5849+
mercury1.menu.baud.230400.upload.speed=230400
5850+
mercury1.menu.baud.256000.windows=256000
5851+
mercury1.menu.baud.256000.upload.speed=256000
5852+
mercury1.menu.baud.460800.linux=460800
5853+
mercury1.menu.baud.460800.macosx=460800
5854+
mercury1.menu.baud.460800.upload.speed=460800
5855+
mercury1.menu.baud.512000.windows=512000
5856+
mercury1.menu.baud.512000.upload.speed=512000
5857+
mercury1.menu.baud.921600=921600
5858+
mercury1.menu.baud.921600.upload.speed=921600
5859+
mercury1.menu.baud.3000000=3000000
5860+
mercury1.menu.baud.3000000.upload.speed=3000000
5861+
mercury1.menu.eesz.autoflash=Mapping defined by Hardware and Sketch
5862+
mercury1.menu.eesz.autoflash.build.flash_size=16M
5863+
mercury1.menu.eesz.autoflash.build.flash_ld=eagle.flash.auto.ld
5864+
mercury1.menu.eesz.autoflash.build.extra_flags=-DFLASH_MAP_SUPPORT=1
5865+
mercury1.menu.eesz.autoflash.upload.maximum_size=1044464
5866+
mercury1.menu.iramfloat.no=in IROM
5867+
mercury1.menu.iramfloat.no.build.iramfloat=-DFP_IN_IROM
5868+
mercury1.menu.iramfloat.yes=allowed in ISR
5869+
mercury1.menu.iramfloat.yes.build.iramfloat=-DFP_IN_IRAM
5870+
56485871
##############################################################
56495872
nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
56505873
nodemcu.build.board=ESP8266_NODEMCU_ESP12

‎cores/esp8266/LwipIntf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern "C"
4343
// can return nullptr when STA is down
4444
// - Because WiFi is started in off mode at boot time,
4545
// wifi_station_set/get_hostname() is now no more used
46-
// because setting hostname firt does not work anymore
46+
// because setting hostname first does not work anymore
4747
// - wifi_station_hostname is overwritten by SDK when wifi is
4848
// woken up in WiFi::mode()
4949
//

‎cores/esp8266/LwipIntfDev.h

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,11 @@ class LwipIntfDev: public LwipIntf, public RawDev
8383
return &_netif;
8484
}
8585

86-
uint8_t* macAddress(uint8_t* mac) // WiFi lib way
86+
uint8_t* macAddress(uint8_t* mac)
8787
{
8888
memcpy(mac, &_netif.hwaddr, 6);
8989
return mac;
9090
}
91-
void MACAddress(uint8_t* mac) // Ethernet lib way
92-
{
93-
macAddress(mac);
94-
}
9591
IPAddress localIP() const
9692
{
9793
return IPAddress(ip4_addr_get_u32(ip_2_ip4(&_netif.ip_addr)));
@@ -104,15 +100,11 @@ class LwipIntfDev: public LwipIntf, public RawDev
104100
{
105101
return IPAddress(ip4_addr_get_u32(ip_2_ip4(&_netif.gw)));
106102
}
107-
IPAddress dnsIP(int n = 0) const // WiFi lib way
103+
IPAddress dnsIP(int n = 0) const
108104
{
109105
return IPAddress(dns_getserver(n));
110106
}
111-
IPAddress dnsServerIP() const // Ethernet lib way
112-
{
113-
return dnsIP(0);
114-
}
115-
void setDNS(IPAddress dns1, IPAddress dns2 = INADDR_ANY) // WiFi lib way
107+
void setDNS(IPAddress dns1, IPAddress dns2 = INADDR_ANY)
116108
{
117109
if (dns1.isSet())
118110
{
@@ -123,10 +115,6 @@ class LwipIntfDev: public LwipIntf, public RawDev
123115
dns_setserver(1, dns2);
124116
}
125117
}
126-
void setDnsServerIP(const IPAddress dnsIP) // Ethernet lib way
127-
{
128-
setDNS(dnsIP);
129-
}
130118

131119
// 1. Currently when no default is set, esp8266-Arduino uses the first
132120
// DHCP client interface receiving a valid address and gateway to
@@ -361,9 +349,12 @@ boolean LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu
361349
template<class RawDev>
362350
void LwipIntfDev<RawDev>::end()
363351
{
364-
netif_remove(&_netif);
365-
_started = false;
366-
RawDev::end();
352+
if (_started)
353+
{
354+
netif_remove(&_netif);
355+
_started = false;
356+
RawDev::end();
357+
}
367358
}
368359

369360
template<class RawDev>

‎cores/esp8266/Stream.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,21 +196,25 @@ class Stream: public Print {
196196
// returns number of transferred bytes
197197
size_t sendAvailable (Stream* to) { return sendGeneric(to, -1, -1, oneShotMs::alwaysExpired); }
198198
size_t sendAvailable (Stream& to) { return sendAvailable(&to); }
199+
size_t sendAvailable (Stream&& to) { return sendAvailable(&to); }
199200

200201
// transfers data until timeout
201202
// returns number of transferred bytes
202203
size_t sendAll (Stream* to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, -1, timeoutMs); }
203204
size_t sendAll (Stream& to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendAll(&to, timeoutMs); }
205+
size_t sendAll (Stream&& to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendAll(&to, timeoutMs); }
204206

205207
// transfers data until a char is encountered (the char is swallowed but not transferred) with timeout
206208
// returns number of transferred bytes
207209
size_t sendUntil (Stream* to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, readUntilChar, timeoutMs); }
208210
size_t sendUntil (Stream& to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendUntil(&to, readUntilChar, timeoutMs); }
211+
size_t sendUntil (Stream&& to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendUntil(&to, readUntilChar, timeoutMs); }
209212

210213
// transfers data until requested size or timeout
211214
// returns number of transferred bytes
212215
size_t sendSize (Stream* to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, maxLen, -1, timeoutMs); }
213216
size_t sendSize (Stream& to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendSize(&to, maxLen, timeoutMs); }
217+
size_t sendSize (Stream&& to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendSize(&to, maxLen, timeoutMs); }
214218

215219
// remaining size (-1 by default = unknown)
216220
virtual ssize_t streamRemaining () { return -1; }

0 commit comments

Comments
 (0)