Skip to content

Commit 2376fa6

Browse files
Alba0404Alba0404
committed
Merge branch 'master' of https://github.com/esp8266/Arduino into ESP8266HTTPClient/Examples/PostHttpsClient
2 parents 5ff0e20 + 95c6fbb commit 2376fa6

File tree

12 files changed

+332
-9
lines changed

12 files changed

+332
-9
lines changed

‎boards.txt

+215
Original file line numberDiff line numberDiff line change
@@ -7948,6 +7948,221 @@ espinotee.menu.baud.921600.upload.speed=921600
79487948
espinotee.menu.baud.3000000=3000000
79497949
espinotee.menu.baud.3000000.upload.speed=3000000
79507950

7951+
##############################################################
7952+
wifi_kit_8.name=WiFi Kit 8
7953+
wifi_kit_8.build.board=wifi_kit_8
7954+
wifi_kit_8.build.variant=wifi_kit_8
7955+
wifi_kit_8.upload.tool=esptool
7956+
wifi_kit_8.upload.maximum_data_size=81920
7957+
wifi_kit_8.upload.wait_for_upload_port=true
7958+
wifi_kit_8.upload.erase_cmd=
7959+
wifi_kit_8.serial.disableDTR=true
7960+
wifi_kit_8.serial.disableRTS=true
7961+
wifi_kit_8.build.mcu=esp8266
7962+
wifi_kit_8.build.core=esp8266
7963+
wifi_kit_8.build.spiffs_pagesize=256
7964+
wifi_kit_8.build.debug_port=
7965+
wifi_kit_8.build.debug_level=
7966+
wifi_kit_8.menu.xtal.80=80 MHz
7967+
wifi_kit_8.menu.xtal.80.build.f_cpu=80000000L
7968+
wifi_kit_8.menu.xtal.160=160 MHz
7969+
wifi_kit_8.menu.xtal.160.build.f_cpu=160000000L
7970+
wifi_kit_8.menu.vt.flash=Flash
7971+
wifi_kit_8.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
7972+
wifi_kit_8.menu.vt.heap=Heap
7973+
wifi_kit_8.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
7974+
wifi_kit_8.menu.vt.iram=IRAM
7975+
wifi_kit_8.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
7976+
wifi_kit_8.menu.exception.disabled=Disabled (new aborts on oom)
7977+
wifi_kit_8.menu.exception.disabled.build.exception_flags=-fno-exceptions
7978+
wifi_kit_8.menu.exception.disabled.build.stdcpp_lib=-lstdc++
7979+
wifi_kit_8.menu.exception.enabled=Enabled
7980+
wifi_kit_8.menu.exception.enabled.build.exception_flags=-fexceptions
7981+
wifi_kit_8.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
7982+
wifi_kit_8.menu.stacksmash.disabled=Disabled
7983+
wifi_kit_8.menu.stacksmash.disabled.build.stacksmash_flags=
7984+
wifi_kit_8.menu.stacksmash.enabled=Enabled
7985+
wifi_kit_8.menu.stacksmash.enabled.build.stacksmash_flags=-fstack-protector
7986+
wifi_kit_8.menu.ssl.all=All SSL ciphers (most compatible)
7987+
wifi_kit_8.menu.ssl.all.build.sslflags=
7988+
wifi_kit_8.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
7989+
wifi_kit_8.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
7990+
wifi_kit_8.menu.mmu.3232=32KB cache + 32KB IRAM (balanced)
7991+
wifi_kit_8.menu.mmu.3232.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
7992+
wifi_kit_8.menu.mmu.4816=16KB cache + 48KB IRAM (IRAM)
7993+
wifi_kit_8.menu.mmu.4816.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000
7994+
wifi_kit_8.menu.mmu.4816H=16KB cache + 48KB IRAM and 2nd Heap (shared)
7995+
wifi_kit_8.menu.mmu.4816H.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP
7996+
wifi_kit_8.menu.mmu.3216=16KB cache + 32KB IRAM + 16KB 2nd Heap (not shared)
7997+
wifi_kit_8.menu.mmu.3216.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000
7998+
wifi_kit_8.menu.mmu.ext128k=128K External 23LC1024
7999+
wifi_kit_8.menu.mmu.ext128k.build.mmuflags=-DMMU_EXTERNAL_HEAP=128 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
8000+
wifi_kit_8.menu.mmu.ext1024k=1M External 64 MBit PSRAM
8001+
wifi_kit_8.menu.mmu.ext1024k.build.mmuflags=-DMMU_EXTERNAL_HEAP=256 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
8002+
wifi_kit_8.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM
8003+
wifi_kit_8.menu.non32xfer.fast.build.non32xferflags=
8004+
wifi_kit_8.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow)
8005+
wifi_kit_8.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER
8006+
wifi_kit_8.upload.resetmethod=--before default_reset --after hard_reset
8007+
wifi_kit_8.build.flash_mode=dio
8008+
wifi_kit_8.build.flash_flags=-DFLASHMODE_DIO
8009+
wifi_kit_8.build.flash_freq=40
8010+
wifi_kit_8.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
8011+
wifi_kit_8.menu.eesz.4M2M.build.flash_size=4M
8012+
wifi_kit_8.menu.eesz.4M2M.build.flash_size_bytes=0x400000
8013+
wifi_kit_8.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
8014+
wifi_kit_8.menu.eesz.4M2M.build.spiffs_pagesize=256
8015+
wifi_kit_8.menu.eesz.4M2M.upload.maximum_size=1044464
8016+
wifi_kit_8.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
8017+
wifi_kit_8.menu.eesz.4M2M.build.spiffs_start=0x200000
8018+
wifi_kit_8.menu.eesz.4M2M.build.spiffs_end=0x3FA000
8019+
wifi_kit_8.menu.eesz.4M2M.build.spiffs_blocksize=8192
8020+
wifi_kit_8.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
8021+
wifi_kit_8.menu.eesz.4M3M.build.flash_size=4M
8022+
wifi_kit_8.menu.eesz.4M3M.build.flash_size_bytes=0x400000
8023+
wifi_kit_8.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
8024+
wifi_kit_8.menu.eesz.4M3M.build.spiffs_pagesize=256
8025+
wifi_kit_8.menu.eesz.4M3M.upload.maximum_size=1044464
8026+
wifi_kit_8.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
8027+
wifi_kit_8.menu.eesz.4M3M.build.spiffs_start=0x100000
8028+
wifi_kit_8.menu.eesz.4M3M.build.spiffs_end=0x3FA000
8029+
wifi_kit_8.menu.eesz.4M3M.build.spiffs_blocksize=8192
8030+
wifi_kit_8.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
8031+
wifi_kit_8.menu.eesz.4M1M.build.flash_size=4M
8032+
wifi_kit_8.menu.eesz.4M1M.build.flash_size_bytes=0x400000
8033+
wifi_kit_8.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
8034+
wifi_kit_8.menu.eesz.4M1M.build.spiffs_pagesize=256
8035+
wifi_kit_8.menu.eesz.4M1M.upload.maximum_size=1044464
8036+
wifi_kit_8.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
8037+
wifi_kit_8.menu.eesz.4M1M.build.spiffs_start=0x300000
8038+
wifi_kit_8.menu.eesz.4M1M.build.spiffs_end=0x3FA000
8039+
wifi_kit_8.menu.eesz.4M1M.build.spiffs_blocksize=8192
8040+
wifi_kit_8.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
8041+
wifi_kit_8.menu.eesz.4M.build.flash_size=4M
8042+
wifi_kit_8.menu.eesz.4M.build.flash_size_bytes=0x400000
8043+
wifi_kit_8.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
8044+
wifi_kit_8.menu.eesz.4M.build.spiffs_pagesize=256
8045+
wifi_kit_8.menu.eesz.4M.upload.maximum_size=1044464
8046+
wifi_kit_8.menu.eesz.4M.build.rfcal_addr=0x3FC000
8047+
wifi_kit_8.menu.ip.lm2f=v2 Lower Memory
8048+
wifi_kit_8.menu.ip.lm2f.build.lwip_include=lwip2/include
8049+
wifi_kit_8.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
8050+
wifi_kit_8.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
8051+
wifi_kit_8.menu.ip.hb2f=v2 Higher Bandwidth
8052+
wifi_kit_8.menu.ip.hb2f.build.lwip_include=lwip2/include
8053+
wifi_kit_8.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
8054+
wifi_kit_8.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
8055+
wifi_kit_8.menu.ip.lm2n=v2 Lower Memory (no features)
8056+
wifi_kit_8.menu.ip.lm2n.build.lwip_include=lwip2/include
8057+
wifi_kit_8.menu.ip.lm2n.build.lwip_lib=-llwip2-536
8058+
wifi_kit_8.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
8059+
wifi_kit_8.menu.ip.hb2n=v2 Higher Bandwidth (no features)
8060+
wifi_kit_8.menu.ip.hb2n.build.lwip_include=lwip2/include
8061+
wifi_kit_8.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
8062+
wifi_kit_8.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
8063+
wifi_kit_8.menu.ip.lm6f=v2 IPv6 Lower Memory
8064+
wifi_kit_8.menu.ip.lm6f.build.lwip_include=lwip2/include
8065+
wifi_kit_8.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
8066+
wifi_kit_8.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
8067+
wifi_kit_8.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
8068+
wifi_kit_8.menu.ip.hb6f.build.lwip_include=lwip2/include
8069+
wifi_kit_8.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
8070+
wifi_kit_8.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
8071+
wifi_kit_8.menu.dbg.Disabled=Disabled
8072+
wifi_kit_8.menu.dbg.Disabled.build.debug_port=
8073+
wifi_kit_8.menu.dbg.Serial=Serial
8074+
wifi_kit_8.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
8075+
wifi_kit_8.menu.dbg.Serial1=Serial1
8076+
wifi_kit_8.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
8077+
wifi_kit_8.menu.lvl.None____=None
8078+
wifi_kit_8.menu.lvl.None____.build.debug_level=
8079+
wifi_kit_8.menu.lvl.SSL=SSL
8080+
wifi_kit_8.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
8081+
wifi_kit_8.menu.lvl.TLS_MEM=TLS_MEM
8082+
wifi_kit_8.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
8083+
wifi_kit_8.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
8084+
wifi_kit_8.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
8085+
wifi_kit_8.menu.lvl.HTTP_SERVER=HTTP_SERVER
8086+
wifi_kit_8.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
8087+
wifi_kit_8.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
8088+
wifi_kit_8.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
8089+
wifi_kit_8.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
8090+
wifi_kit_8.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
8091+
wifi_kit_8.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
8092+
wifi_kit_8.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
8093+
wifi_kit_8.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
8094+
wifi_kit_8.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
8095+
wifi_kit_8.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
8096+
wifi_kit_8.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
8097+
wifi_kit_8.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
8098+
wifi_kit_8.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
8099+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
8100+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
8101+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
8102+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
8103+
wifi_kit_8.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
8104+
wifi_kit_8.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
8105+
wifi_kit_8.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
8106+
wifi_kit_8.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
8107+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
8108+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
8109+
wifi_kit_8.menu.lvl.CORE=CORE
8110+
wifi_kit_8.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
8111+
wifi_kit_8.menu.lvl.WIFI=WIFI
8112+
wifi_kit_8.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
8113+
wifi_kit_8.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
8114+
wifi_kit_8.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
8115+
wifi_kit_8.menu.lvl.UPDATER=UPDATER
8116+
wifi_kit_8.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
8117+
wifi_kit_8.menu.lvl.OTA=OTA
8118+
wifi_kit_8.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
8119+
wifi_kit_8.menu.lvl.OOM=OOM
8120+
wifi_kit_8.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
8121+
wifi_kit_8.menu.lvl.MDNS=MDNS
8122+
wifi_kit_8.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
8123+
wifi_kit_8.menu.lvl.HWDT=HWDT
8124+
wifi_kit_8.menu.lvl.HWDT.build.debug_level= -DDEBUG_ESP_HWDT
8125+
wifi_kit_8.menu.lvl.HWDT_NOEXTRA4K=HWDT_NOEXTRA4K
8126+
wifi_kit_8.menu.lvl.HWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_HWDT_NOEXTRA4K
8127+
wifi_kit_8.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
8128+
wifi_kit_8.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
8129+
wifi_kit_8.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT
8130+
wifi_kit_8.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
8131+
wifi_kit_8.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K
8132+
wifi_kit_8.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
8133+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
8134+
wifi_kit_8.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
8135+
wifi_kit_8.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT
8136+
wifi_kit_8.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
8137+
wifi_kit_8.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
8138+
wifi_kit_8.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
8139+
wifi_kit_8.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
8140+
wifi_kit_8.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
8141+
wifi_kit_8.menu.wipe.none=Only Sketch
8142+
wifi_kit_8.menu.wipe.none.upload.erase_cmd=
8143+
wifi_kit_8.menu.wipe.sdk=Sketch + WiFi Settings
8144+
wifi_kit_8.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
8145+
wifi_kit_8.menu.wipe.all=All Flash Contents
8146+
wifi_kit_8.menu.wipe.all.upload.erase_cmd=erase_flash
8147+
wifi_kit_8.menu.baud.115200=115200
8148+
wifi_kit_8.menu.baud.115200.upload.speed=115200
8149+
wifi_kit_8.menu.baud.57600=57600
8150+
wifi_kit_8.menu.baud.57600.upload.speed=57600
8151+
wifi_kit_8.menu.baud.230400.linux=230400
8152+
wifi_kit_8.menu.baud.230400.macosx=230400
8153+
wifi_kit_8.menu.baud.230400.upload.speed=230400
8154+
wifi_kit_8.menu.baud.256000.windows=256000
8155+
wifi_kit_8.menu.baud.256000.upload.speed=256000
8156+
wifi_kit_8.menu.baud.460800.linux=460800
8157+
wifi_kit_8.menu.baud.460800.macosx=460800
8158+
wifi_kit_8.menu.baud.460800.upload.speed=460800
8159+
wifi_kit_8.menu.baud.512000.windows=512000
8160+
wifi_kit_8.menu.baud.512000.upload.speed=512000
8161+
wifi_kit_8.menu.baud.921600=921600
8162+
wifi_kit_8.menu.baud.921600.upload.speed=921600
8163+
wifi_kit_8.menu.baud.3000000=3000000
8164+
wifi_kit_8.menu.baud.3000000.upload.speed=3000000
8165+
79518166
##############################################################
79528167
wifiduino.name=WiFiduino
79538168
wifiduino.build.board=WIFIDUINO_ESP8266

‎cores/esp8266/WString.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ bool String::concat(const char *cstr, unsigned int length) {
305305
return true;
306306
if (!reserve(newlen))
307307
return false;
308-
memmove_P(wbuffer() + len(), cstr, length + 1);
308+
memmove_P(wbuffer() + len(), cstr, length);
309309
setLen(newlen);
310310
wbuffer()[newlen] = 0;
311311
return true;

‎cores/esp8266/esp8266_undocumented.h

+12-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,22 @@ calls to ets_install_putc1().
5252
*/
5353
extern void uart_buff_switch(uint8_t);
5454

55+
/*
56+
ROM function, ets_install_uart_printf, is used to installs the internal ROM
57+
putc1 driver used to print on UART0 or UART1. The installed driver is use by ets_printf.
58+
Side note, ets_install_uart_printf just happens to return the address of the
59+
internal putc1 driver installed.
60+
*/
61+
extern void ets_install_uart_printf(void);
62+
5563
/*
5664
ROM function, ets_uart_printf(), prints on the UART selected by
5765
uart_buff_switch(). Supported format options are the same as vprintf(). Also
5866
has cooked newline behavior. No flash format/string support; however, ISR safe.
59-
Also, uses a static function in ROM to print characters which is only
60-
controlled by uart_buff_switch().
67+
It also uses a static function in ROM to print characters. The UART selection
68+
is handled by a prior call to uart_buff_switch(). An advantage over ets_printf,
69+
this call is not affected by calls made to ets_install_putc1 or
70+
ets_install_putc2.
6171
*/
6272
extern int ets_uart_printf(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
6373

@@ -236,7 +246,6 @@ extern void Cache_Read_Disable();
236246
extern int32_t system_func1(uint32_t);
237247
extern void clockgate_watchdog(uint32_t);
238248
extern void pm_open_rf();
239-
extern void ets_install_uart_printf(uint32_t uart_no);
240249
extern void UartDwnLdProc(uint8_t* ram_addr, uint32_t size, void (**user_start_ptr)());
241250
extern int boot_from_flash();
242251
extern void ets_run() __attribute__((noreturn));

‎cores/esp8266/reboot_uart_dwnld.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static inline void __wsr_vecbase(uint32_t vector_base) {
106106
const uint32_t uart_no = 0;
107107
uartAttach();
108108
Uart_Init(uart_no);
109-
ets_install_uart_printf(uart_no);
109+
ets_install_uart_printf();
110110

111111
/* reverse engineered from boot_from_something() */
112112
const uint16_t divlatch = uart_baudrate_detect(uart_no, 0);
@@ -148,4 +148,3 @@ static inline void __wsr_vecbase(uint32_t vector_base) {
148148

149149
esp8266UartDownloadMode();
150150
}
151-

‎doc/boards.rst

+7
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,13 @@ The Adafruit Feather HUZZAH ESP8266 is an Arduino-compatible Wi-Fi development b
231231

232232
Product page: https://www.adafruit.com/product/2821
233233

234+
WiFi Kit 8
235+
----------
236+
237+
The Heltec WiFi Kit 8 is an Arduino-compatible Wi-Fi development board powered by Ai-Thinker's ESP-12S, clocked at 80 MHz at 3.3V logic. A high-quality SiLabs CP2104 USB-Serial chip is included so that you can upload code at a blistering 921600 baud for fast development time. It also has auto-reset so no noodling with pins and reset button pressings. A 3.7V Lithium polymer battery connector is included, making it ideal for portable projects. The Heltec WiFi Kit 8 will automatically recharge a connected battery when USB power is available.
238+
239+
Product page: https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series
240+
234241
Invent One
235242
----------
236243

‎libraries/ESP8266WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino

+7-1
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,14 @@ void processKey(Print& out, int hotKey) {
173173
}
174174
break;
175175
}
176-
case 'P':
176+
#ifdef DEBUG_ESP_PORT
177+
// From this context stack_thunk_dump_stack() will only work when Serial
178+
// debug is enabled.
179+
case 'p':
177180
out.println(F("Calling stack_thunk_dump_stack();"));
178181
stack_thunk_dump_stack();
179182
break;
183+
#endif
180184
case 'R':
181185
out.printf_P(PSTR("Restart, ESP.restart(); ...\r\n"));
182186
ESP.restart();
@@ -191,7 +195,9 @@ void processKey(Print& out, int hotKey) {
191195
out.println(F(" h - Free Heap Report;"));
192196
out.println(F(" i - iRAM umm_info(null, true);"));
193197
out.println(F(" d - dRAM umm_info(null, true);"));
198+
#ifdef DEBUG_ESP_PORT
194199
out.println(F(" p - call stack_thunk_dump_stack();"));
200+
#endif
195201
out.println(F(" R - Restart, ESP.restart();"));
196202
out.println(F(" ? - Print Help"));
197203
out.println();

‎libraries/SoftwareSerial

‎package/package_esp8266com_index.template.json

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
{
3333
"name": "Adafruit Feather HUZZAH ESP8266"
3434
},
35+
{
36+
"name": "WiFi Kit 8"
37+
},
3538
{
3639
"name": "Invent One"
3740
},

‎tests/host/core/test_string.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -594,3 +594,13 @@ TEST_CASE("String chaining", "[core][String]")
594594
REQUIRE(static_cast<const void*>(result.c_str()) == static_cast<const void*>(ptr));
595595
}
596596
}
597+
598+
TEST_CASE("String concat OOB #8198", "[core][String]")
599+
{
600+
char *p = (char*)malloc(16);
601+
memset(p, 'x', 16);
602+
String s = "abcd";
603+
s.concat(p, 16);
604+
REQUIRE(!strcmp(s.c_str(), "abcdxxxxxxxxxxxxxxxx"));
605+
free(p);
606+
}

0 commit comments

Comments
 (0)