From bc251382a6250dce3e29be66f3c425a38d373f63 Mon Sep 17 00:00:00 2001 From: iotgupta <155143564+iotgupta@users.noreply.github.com> Date: Thu, 29 May 2025 18:50:52 +0530 Subject: [PATCH] Boards - fix & update Mercury (#9238) * update Mercury Board * fix --------- Co-authored-by: Maxim Prokhorov --- boards.txt | 442 +++++++++--------- doc/boards.rst | 8 +- .../package_esp8266com_index.template.json | 2 +- tools/boards.txt.py | 10 +- .../{mercury_v1 => mercury}/pins_arduino.h | 21 +- 5 files changed, 243 insertions(+), 240 deletions(-) rename variants/{mercury_v1 => mercury}/pins_arduino.h (89%) diff --git a/boards.txt b/boards.txt index 1b44fe331..de7f875ee 100644 --- a/boards.txt +++ b/boards.txt @@ -5646,227 +5646,227 @@ agruminolemon.menu.iramfloat.yes=allowed in ISR agruminolemon.menu.iramfloat.yes.build.iramfloat=-DFP_IN_IRAM ############################################################## -mercury1.name=Mercury 1.0 -mercury1.build.board=mercury -mercury1.build.variant=mercury_v1 -mercury1.upload.tool=esptool -mercury1.upload.maximum_data_size=81920 -mercury1.upload.wait_for_upload_port=true -mercury1.upload.erase_cmd= -mercury1.serial.disableDTR=true -mercury1.serial.disableRTS=true -mercury1.build.mcu=esp8266 -mercury1.build.core=esp8266 -mercury1.build.spiffs_pagesize=256 -mercury1.build.debug_optim= -mercury1.build.debug_port= -mercury1.build.debug_level= -mercury1.menu.xtal.80=80 MHz -mercury1.menu.xtal.80.build.f_cpu=80000000L -mercury1.menu.xtal.160=160 MHz -mercury1.menu.xtal.160.build.f_cpu=160000000L -mercury1.menu.vt.flash=Flash -mercury1.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH -mercury1.menu.vt.heap=Heap -mercury1.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM -mercury1.menu.vt.iram=IRAM -mercury1.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM -mercury1.menu.exception.disabled=Disabled (new aborts on oom) -mercury1.menu.exception.disabled.build.exception_flags=-fno-exceptions -mercury1.menu.exception.disabled.build.stdcpp_lib=-lstdc++ -mercury1.menu.exception.enabled=Enabled -mercury1.menu.exception.enabled.build.exception_flags=-fexceptions -mercury1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc -mercury1.menu.stacksmash.disabled=Disabled -mercury1.menu.stacksmash.disabled.build.stacksmash_flags= -mercury1.menu.stacksmash.enabled=Enabled -mercury1.menu.stacksmash.enabled.build.stacksmash_flags=-fstack-protector -mercury1.menu.ssl.all=All SSL ciphers (most compatible) -mercury1.menu.ssl.all.build.sslflags= -mercury1.menu.ssl.basic=Basic SSL ciphers (lower ROM use) -mercury1.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC -mercury1.menu.mmu.3232=32KB cache + 32KB IRAM (balanced) -mercury1.menu.mmu.3232.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000 -mercury1.menu.mmu.4816=16KB cache + 48KB IRAM (IRAM) -mercury1.menu.mmu.4816.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -mercury1.menu.mmu.4816H=16KB cache + 48KB IRAM and 2nd Heap (shared) -mercury1.menu.mmu.4816H.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP -mercury1.menu.mmu.3216=16KB cache + 32KB IRAM + 16KB 2nd Heap (not shared) -mercury1.menu.mmu.3216.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000 -mercury1.menu.mmu.ext128k=128K Heap External 23LC1024 -mercury1.menu.mmu.ext128k.build.mmuflags=-DMMU_EXTERNAL_HEAP=128 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000 -mercury1.menu.mmu.ext8192k=8M w/256K Heap External 64 MBit PSRAM -mercury1.menu.mmu.ext8192k.build.mmuflags=-DMMU_EXTERNAL_HEAP=256 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000 -mercury1.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM -mercury1.menu.non32xfer.fast.build.non32xferflags= -mercury1.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow) -mercury1.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER -mercury1.upload.resetmethod=--before default_reset --after hard_reset -mercury1.build.flash_mode=dio -mercury1.build.flash_flags=-DFLASHMODE_DIO -mercury1.build.flash_freq=40 -mercury1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB) -mercury1.menu.eesz.4M2M.build.flash_size=4M -mercury1.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld -mercury1.menu.eesz.4M2M.build.spiffs_pagesize=256 -mercury1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000 -mercury1.menu.eesz.4M2M.build.spiffs_start=0x200000 -mercury1.menu.eesz.4M2M.build.spiffs_end=0x3FA000 -mercury1.menu.eesz.4M2M.build.spiffs_blocksize=8192 -mercury1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB) -mercury1.menu.eesz.4M3M.build.flash_size=4M -mercury1.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld -mercury1.menu.eesz.4M3M.build.spiffs_pagesize=256 -mercury1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000 -mercury1.menu.eesz.4M3M.build.spiffs_start=0x100000 -mercury1.menu.eesz.4M3M.build.spiffs_end=0x3FA000 -mercury1.menu.eesz.4M3M.build.spiffs_blocksize=8192 -mercury1.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB) -mercury1.menu.eesz.4M1M.build.flash_size=4M -mercury1.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld -mercury1.menu.eesz.4M1M.build.spiffs_pagesize=256 -mercury1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000 -mercury1.menu.eesz.4M1M.build.spiffs_start=0x300000 -mercury1.menu.eesz.4M1M.build.spiffs_end=0x3FA000 -mercury1.menu.eesz.4M1M.build.spiffs_blocksize=8192 -mercury1.menu.eesz.4M=4MB (FS:none OTA:~1019KB) -mercury1.menu.eesz.4M.build.flash_size=4M -mercury1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld -mercury1.menu.eesz.4M.build.spiffs_pagesize=256 -mercury1.menu.eesz.4M.build.rfcal_addr=0x3FC000 -mercury1.menu.ip.lm2f=v2 Lower Memory -mercury1.menu.ip.lm2f.build.lwip_include=lwip2/include -mercury1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat -mercury1.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 -mercury1.menu.ip.hb2f=v2 Higher Bandwidth -mercury1.menu.ip.hb2f.build.lwip_include=lwip2/include -mercury1.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat -mercury1.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 -mercury1.menu.ip.lm2n=v2 Lower Memory (no features) -mercury1.menu.ip.lm2n.build.lwip_include=lwip2/include -mercury1.menu.ip.lm2n.build.lwip_lib=-llwip2-536 -mercury1.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0 -mercury1.menu.ip.hb2n=v2 Higher Bandwidth (no features) -mercury1.menu.ip.hb2n.build.lwip_include=lwip2/include -mercury1.menu.ip.hb2n.build.lwip_lib=-llwip2-1460 -mercury1.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0 -mercury1.menu.ip.lm6f=v2 IPv6 Lower Memory -mercury1.menu.ip.lm6f.build.lwip_include=lwip2/include -mercury1.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat -mercury1.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1 -mercury1.menu.ip.hb6f=v2 IPv6 Higher Bandwidth -mercury1.menu.ip.hb6f.build.lwip_include=lwip2/include -mercury1.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat -mercury1.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1 -mercury1.menu.dbg.Disabled=Disabled -mercury1.menu.dbg.Disabled.build.debug_port= -mercury1.menu.dbg.Serial=Serial -mercury1.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial -mercury1.menu.dbg.Serial1=Serial1 -mercury1.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 -mercury1.menu.lvl.None____=None -mercury1.menu.lvl.None____.build.debug_level= -mercury1.menu.optim.Smallest=None -mercury1.menu.optim.Smallest.build.debug_optim=-Os -mercury1.menu.optim.Lite=Lite -mercury1.menu.optim.Lite.build.debug_optim=-Os -fno-optimize-sibling-calls -mercury1.menu.optim.Full=Optimum -mercury1.menu.optim.Full.build.debug_optim=-Og -mercury1.menu.lvl.SSL=SSL -mercury1.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL -mercury1.menu.lvl.TLS_MEM=TLS_MEM -mercury1.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM -mercury1.menu.lvl.HTTP_CLIENT=HTTP_CLIENT -mercury1.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -mercury1.menu.lvl.HTTP_SERVER=HTTP_SERVER -mercury1.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM -mercury1.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -mercury1.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT -mercury1.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -mercury1.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER -mercury1.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT -mercury1.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -mercury1.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER -mercury1.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER -mercury1.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT -mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -mercury1.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER -mercury1.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER -mercury1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER -mercury1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER -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 -mercury1.menu.lvl.CORE=CORE -mercury1.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE -mercury1.menu.lvl.WIFI=WIFI -mercury1.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI -mercury1.menu.lvl.HTTP_UPDATE=HTTP_UPDATE -mercury1.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE -mercury1.menu.lvl.UPDATER=UPDATER -mercury1.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER -mercury1.menu.lvl.OTA=OTA -mercury1.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA -mercury1.menu.lvl.OOM=OOM -mercury1.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM -mercury1.menu.lvl.MDNS=MDNS -mercury1.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS -mercury1.menu.lvl.HWDT=HWDT -mercury1.menu.lvl.HWDT.build.debug_level= -DDEBUG_ESP_HWDT -mercury1.menu.lvl.HWDT_NOEXTRA4K=HWDT_NOEXTRA4K -mercury1.menu.lvl.HWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_HWDT_NOEXTRA4K -mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS -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 -mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT -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 -mercury1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K -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 -mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS -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 -mercury1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT -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 -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 -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 -mercury1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG -mercury1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG -mercury1.menu.wipe.none=Only Sketch -mercury1.menu.wipe.none.upload.erase_cmd= -mercury1.menu.wipe.sdk=Sketch + WiFi Settings -mercury1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000 -mercury1.menu.wipe.all=All Flash Contents -mercury1.menu.wipe.all.upload.erase_cmd=erase_flash -mercury1.menu.baud.115200=115200 -mercury1.menu.baud.115200.upload.speed=115200 -mercury1.menu.baud.57600=57600 -mercury1.menu.baud.57600.upload.speed=57600 -mercury1.menu.baud.230400.linux=230400 -mercury1.menu.baud.230400.macosx=230400 -mercury1.menu.baud.230400.upload.speed=230400 -mercury1.menu.baud.256000.windows=256000 -mercury1.menu.baud.256000.upload.speed=256000 -mercury1.menu.baud.460800.linux=460800 -mercury1.menu.baud.460800.macosx=460800 -mercury1.menu.baud.460800.upload.speed=460800 -mercury1.menu.baud.512000.windows=512000 -mercury1.menu.baud.512000.upload.speed=512000 -mercury1.menu.baud.921600=921600 -mercury1.menu.baud.921600.upload.speed=921600 -mercury1.menu.baud.3000000=3000000 -mercury1.menu.baud.3000000.upload.speed=3000000 -mercury1.menu.eesz.autoflash=Mapping defined by Hardware and Sketch -mercury1.menu.eesz.autoflash.build.flash_size=16M -mercury1.menu.eesz.autoflash.build.flash_ld=eagle.flash.auto.ld -mercury1.menu.eesz.autoflash.build.extra_flags=-DFLASH_MAP_SUPPORT=1 -mercury1.menu.eesz.autoflash.upload.maximum_size=1044464 -mercury1.menu.iramfloat.no=in IROM -mercury1.menu.iramfloat.no.build.iramfloat=-DFP_IN_IROM -mercury1.menu.iramfloat.yes=allowed in ISR -mercury1.menu.iramfloat.yes.build.iramfloat=-DFP_IN_IRAM +mercury.name=Mercury +mercury.build.board=mercury +mercury.build.variant=mercury +mercury.upload.tool=esptool +mercury.upload.maximum_data_size=81920 +mercury.upload.wait_for_upload_port=true +mercury.upload.erase_cmd= +mercury.serial.disableDTR=true +mercury.serial.disableRTS=true +mercury.build.mcu=esp8266 +mercury.build.core=esp8266 +mercury.build.spiffs_pagesize=256 +mercury.build.debug_optim= +mercury.build.debug_port= +mercury.build.debug_level= +mercury.menu.xtal.80=80 MHz +mercury.menu.xtal.80.build.f_cpu=80000000L +mercury.menu.xtal.160=160 MHz +mercury.menu.xtal.160.build.f_cpu=160000000L +mercury.menu.vt.flash=Flash +mercury.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH +mercury.menu.vt.heap=Heap +mercury.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM +mercury.menu.vt.iram=IRAM +mercury.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM +mercury.menu.exception.disabled=Disabled (new aborts on oom) +mercury.menu.exception.disabled.build.exception_flags=-fno-exceptions +mercury.menu.exception.disabled.build.stdcpp_lib=-lstdc++ +mercury.menu.exception.enabled=Enabled +mercury.menu.exception.enabled.build.exception_flags=-fexceptions +mercury.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc +mercury.menu.stacksmash.disabled=Disabled +mercury.menu.stacksmash.disabled.build.stacksmash_flags= +mercury.menu.stacksmash.enabled=Enabled +mercury.menu.stacksmash.enabled.build.stacksmash_flags=-fstack-protector +mercury.menu.ssl.all=All SSL ciphers (most compatible) +mercury.menu.ssl.all.build.sslflags= +mercury.menu.ssl.basic=Basic SSL ciphers (lower ROM use) +mercury.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC +mercury.menu.mmu.3232=32KB cache + 32KB IRAM (balanced) +mercury.menu.mmu.3232.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000 +mercury.menu.mmu.4816=16KB cache + 48KB IRAM (IRAM) +mercury.menu.mmu.4816.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 +mercury.menu.mmu.4816H=16KB cache + 48KB IRAM and 2nd Heap (shared) +mercury.menu.mmu.4816H.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP +mercury.menu.mmu.3216=16KB cache + 32KB IRAM + 16KB 2nd Heap (not shared) +mercury.menu.mmu.3216.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000 +mercury.menu.mmu.ext128k=128K Heap External 23LC1024 +mercury.menu.mmu.ext128k.build.mmuflags=-DMMU_EXTERNAL_HEAP=128 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000 +mercury.menu.mmu.ext8192k=8M w/256K Heap External 64 MBit PSRAM +mercury.menu.mmu.ext8192k.build.mmuflags=-DMMU_EXTERNAL_HEAP=256 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000 +mercury.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM +mercury.menu.non32xfer.fast.build.non32xferflags= +mercury.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow) +mercury.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER +mercury.upload.resetmethod=--before default_reset --after hard_reset +mercury.build.flash_mode=dio +mercury.build.flash_flags=-DFLASHMODE_DIO +mercury.build.flash_freq=40 +mercury.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB) +mercury.menu.eesz.4M2M.build.flash_size=4M +mercury.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld +mercury.menu.eesz.4M2M.build.spiffs_pagesize=256 +mercury.menu.eesz.4M2M.build.rfcal_addr=0x3FC000 +mercury.menu.eesz.4M2M.build.spiffs_start=0x200000 +mercury.menu.eesz.4M2M.build.spiffs_end=0x3FA000 +mercury.menu.eesz.4M2M.build.spiffs_blocksize=8192 +mercury.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB) +mercury.menu.eesz.4M3M.build.flash_size=4M +mercury.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld +mercury.menu.eesz.4M3M.build.spiffs_pagesize=256 +mercury.menu.eesz.4M3M.build.rfcal_addr=0x3FC000 +mercury.menu.eesz.4M3M.build.spiffs_start=0x100000 +mercury.menu.eesz.4M3M.build.spiffs_end=0x3FA000 +mercury.menu.eesz.4M3M.build.spiffs_blocksize=8192 +mercury.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB) +mercury.menu.eesz.4M1M.build.flash_size=4M +mercury.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld +mercury.menu.eesz.4M1M.build.spiffs_pagesize=256 +mercury.menu.eesz.4M1M.build.rfcal_addr=0x3FC000 +mercury.menu.eesz.4M1M.build.spiffs_start=0x300000 +mercury.menu.eesz.4M1M.build.spiffs_end=0x3FA000 +mercury.menu.eesz.4M1M.build.spiffs_blocksize=8192 +mercury.menu.eesz.4M=4MB (FS:none OTA:~1019KB) +mercury.menu.eesz.4M.build.flash_size=4M +mercury.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld +mercury.menu.eesz.4M.build.spiffs_pagesize=256 +mercury.menu.eesz.4M.build.rfcal_addr=0x3FC000 +mercury.menu.ip.lm2f=v2 Lower Memory +mercury.menu.ip.lm2f.build.lwip_include=lwip2/include +mercury.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat +mercury.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 +mercury.menu.ip.hb2f=v2 Higher Bandwidth +mercury.menu.ip.hb2f.build.lwip_include=lwip2/include +mercury.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat +mercury.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 +mercury.menu.ip.lm2n=v2 Lower Memory (no features) +mercury.menu.ip.lm2n.build.lwip_include=lwip2/include +mercury.menu.ip.lm2n.build.lwip_lib=-llwip2-536 +mercury.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0 +mercury.menu.ip.hb2n=v2 Higher Bandwidth (no features) +mercury.menu.ip.hb2n.build.lwip_include=lwip2/include +mercury.menu.ip.hb2n.build.lwip_lib=-llwip2-1460 +mercury.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0 +mercury.menu.ip.lm6f=v2 IPv6 Lower Memory +mercury.menu.ip.lm6f.build.lwip_include=lwip2/include +mercury.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat +mercury.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1 +mercury.menu.ip.hb6f=v2 IPv6 Higher Bandwidth +mercury.menu.ip.hb6f.build.lwip_include=lwip2/include +mercury.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat +mercury.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1 +mercury.menu.dbg.Disabled=Disabled +mercury.menu.dbg.Disabled.build.debug_port= +mercury.menu.dbg.Serial=Serial +mercury.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +mercury.menu.dbg.Serial1=Serial1 +mercury.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +mercury.menu.lvl.None____=None +mercury.menu.lvl.None____.build.debug_level= +mercury.menu.optim.Smallest=None +mercury.menu.optim.Smallest.build.debug_optim=-Os +mercury.menu.optim.Lite=Lite +mercury.menu.optim.Lite.build.debug_optim=-Os -fno-optimize-sibling-calls +mercury.menu.optim.Full=Optimum +mercury.menu.optim.Full.build.debug_optim=-Og +mercury.menu.lvl.SSL=SSL +mercury.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL +mercury.menu.lvl.TLS_MEM=TLS_MEM +mercury.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +mercury.menu.lvl.HTTP_CLIENT=HTTP_CLIENT +mercury.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +mercury.menu.lvl.HTTP_SERVER=HTTP_SERVER +mercury.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM +mercury.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +mercury.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +mercury.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +mercury.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER +mercury.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +mercury.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +mercury.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +mercury.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +mercury.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +mercury.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +mercury.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +mercury.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +mercury.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +mercury.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +mercury.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +mercury.menu.lvl.CORE=CORE +mercury.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE +mercury.menu.lvl.WIFI=WIFI +mercury.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +mercury.menu.lvl.HTTP_UPDATE=HTTP_UPDATE +mercury.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +mercury.menu.lvl.UPDATER=UPDATER +mercury.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +mercury.menu.lvl.OTA=OTA +mercury.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA +mercury.menu.lvl.OOM=OOM +mercury.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM +mercury.menu.lvl.MDNS=MDNS +mercury.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS +mercury.menu.lvl.HWDT=HWDT +mercury.menu.lvl.HWDT.build.debug_level= -DDEBUG_ESP_HWDT +mercury.menu.lvl.HWDT_NOEXTRA4K=HWDT_NOEXTRA4K +mercury.menu.lvl.HWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_HWDT_NOEXTRA4K +mercury.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS +mercury.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 +mercury.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT +mercury.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 +mercury.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K +mercury.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 +mercury.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS +mercury.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 +mercury.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT +mercury.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 +mercury.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 +mercury.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 +mercury.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG +mercury.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +mercury.menu.wipe.none=Only Sketch +mercury.menu.wipe.none.upload.erase_cmd= +mercury.menu.wipe.sdk=Sketch + WiFi Settings +mercury.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000 +mercury.menu.wipe.all=All Flash Contents +mercury.menu.wipe.all.upload.erase_cmd=erase_flash +mercury.menu.baud.115200=115200 +mercury.menu.baud.115200.upload.speed=115200 +mercury.menu.baud.57600=57600 +mercury.menu.baud.57600.upload.speed=57600 +mercury.menu.baud.230400.linux=230400 +mercury.menu.baud.230400.macosx=230400 +mercury.menu.baud.230400.upload.speed=230400 +mercury.menu.baud.256000.windows=256000 +mercury.menu.baud.256000.upload.speed=256000 +mercury.menu.baud.460800.linux=460800 +mercury.menu.baud.460800.macosx=460800 +mercury.menu.baud.460800.upload.speed=460800 +mercury.menu.baud.512000.windows=512000 +mercury.menu.baud.512000.upload.speed=512000 +mercury.menu.baud.921600=921600 +mercury.menu.baud.921600.upload.speed=921600 +mercury.menu.baud.3000000=3000000 +mercury.menu.baud.3000000.upload.speed=3000000 +mercury.menu.eesz.autoflash=Mapping defined by Hardware and Sketch +mercury.menu.eesz.autoflash.build.flash_size=16M +mercury.menu.eesz.autoflash.build.flash_ld=eagle.flash.auto.ld +mercury.menu.eesz.autoflash.build.extra_flags=-DFLASH_MAP_SUPPORT=1 +mercury.menu.eesz.autoflash.upload.maximum_size=1044464 +mercury.menu.iramfloat.no=in IROM +mercury.menu.iramfloat.no.build.iramfloat=-DFP_IN_IROM +mercury.menu.iramfloat.yes=allowed in ISR +mercury.menu.iramfloat.yes.build.iramfloat=-DFP_IN_IRAM ############################################################## nodemcu.name=NodeMCU 0.9 (ESP-12 Module) diff --git a/doc/boards.rst b/doc/boards.rst index 99421d86b..8977c5b92 100644 --- a/doc/boards.rst +++ b/doc/boards.rst @@ -271,11 +271,11 @@ ESPresso Lite 2.0 ESPresso Lite 2.0 is an Arduino-compatible Wi-Fi development board based on an earlier V1 (beta version). Re-designed together with Cytron Technologies, the newly-revised ESPresso Lite V2.0 features the auto-load/auto-program function, eliminating the previous need to reset the board manually before flashing a new program. It also feature two user programmable side buttons and a reset button. The special distinctive features of on-board pads for I2C sensor and actuator is retained. -Mercury 1.0 ------------ - -Based on ESP8266, Mercury is board developed by Ralio Technologies. Board supports on motor drivers and direct-connect feature for various endpoints. +Mercury +------- +ESP8266 based development board supercharged with onboard motor driver, RGB LED, support for servo motors and etc. +Git: https://github.com/raliotech/products/tree/master Product page: https://www.raliotech.com Phoenix 1.0 diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index 3c8d1bed3..4d44ddb0a 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -48,7 +48,7 @@ "name": "ESPresso Lite 2.0" }, { - "name": "Mercury 1.0" + "name": "Mercury" }, { "name": "Phoenix 1.0" diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 576e02a61..e94149a08 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -445,11 +445,11 @@ boards = collections.OrderedDict([ ], 'desc': [ 'ESPresso Lite 2.0 is an Arduino-compatible Wi-Fi development board based on an earlier V1 (beta version). Re-designed together with Cytron Technologies, the newly-revised ESPresso Lite V2.0 features the auto-load/auto-program function, eliminating the previous need to reset the board manually before flashing a new program. It also feature two user programmable side buttons and a reset button. The special distinctive features of on-board pads for I2C sensor and actuator is retained.', ] }), -( 'mercury1', { - 'name': 'Mercury 1.0', + ( 'mercury', { + 'name': 'Mercury', 'opts': { '.build.board': 'mercury', - '.build.variant': 'mercury_v1', + '.build.variant': 'mercury', }, 'macro': [ 'resetmethod_nodemcu', @@ -457,8 +457,8 @@ boards = collections.OrderedDict([ 'flashfreq_40', '4M', ], - 'desc': [ 'Based on ESP8266, Mercury is board developed by Ralio Technologies. Board supports on motor drivers and direct-connect feature for various endpoints.', - '', + 'desc': [ 'ESP8266 based development board supercharged with onboard motor driver, RGB LED, support for servo motors and etc.', + 'Git: https://github.com/raliotech/products/tree/master', 'Product page: https://www.raliotech.com', ], }), diff --git a/variants/mercury_v1/pins_arduino.h b/variants/mercury/pins_arduino.h similarity index 89% rename from variants/mercury_v1/pins_arduino.h rename to variants/mercury/pins_arduino.h index 747afb591..df9860aac 100644 --- a/variants/mercury_v1/pins_arduino.h +++ b/variants/mercury/pins_arduino.h @@ -28,7 +28,7 @@ #include "../generic/common.h" -#define LED_BUILTIN 0 +#define LED_BUILTIN 2 #define BUILTIN_LED LED_BUILTIN #define A0 (17) @@ -49,14 +49,10 @@ static const uint8_t D10 = 10; #define PIN_WIRE_SCL (14) // Brushed DC Motors -#define MOTOR_1_DIR (16) -#define MOTOR_1_PWM (12) -#define MOTOR_2_DIR (5) -#define MOTOR_2_PWM (4) - -//Ultrasonic Sensor -static const uint8_t USST = D7; -static const uint8_t USSE = D8; +static const uint8_t MOTOR_1_DIR = D3; +static const uint8_t MOTOR_1_PWM = D1; +static const uint8_t MOTOR_2_DIR = D4; +static const uint8_t MOTOR_2_PWM = D2; //Servo static const uint8_t SERVO1 = D4; @@ -64,8 +60,15 @@ static const uint8_t SERVO2 = D6; static const uint8_t SERVO3 = D3; static const uint8_t SERVO4 = D5; +//Ultrasonic Sensor +static const uint8_t USST = D7; +static const uint8_t USSE = D8; + //IR static const uint8_t IR1 = D9; static const uint8_t IR2 = D10; +//RGB LED +static const uint8_t RGB = D0; + #endif /* Pins_Arduino_h */