From 91031be07ab953c2f82f1e6f0ebb10ebe66c55f9 Mon Sep 17 00:00:00 2001 From: Stanimir-Petev Date: Tue, 31 Aug 2021 15:58:34 +0300 Subject: [PATCH 1/2] MOD-WIFI-ESP8266(-DEV) update Added Flash mode and reset method selection options for Olimex board MOD-WIFI-ESP8266(-DEV) --- boards.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/boards.txt b/boards.txt index fd05749760..0ed0e51a28 100644 --- a/boards.txt +++ b/boards.txt @@ -5828,6 +5828,24 @@ modwifi.menu.non32xfer.fast.build.non32xferflags= modwifi.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow) modwifi.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER modwifi.upload.resetmethod=--before no_reset --after soft_reset +modwifi.menu.FlashMode.qout=QOUT +modwifi.menu.FlashMode.qout.build.flash_mode=qout +modwifi.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT +modwifi.menu.FlashMode.dout=DOUT (compatible) +modwifi.menu.FlashMode.dout.build.flash_mode=dout +modwifi.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT +modwifi.menu.FlashMode.dio=DIO +modwifi.menu.FlashMode.dio.build.flash_mode=dio +modwifi.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO +modwifi.menu.FlashMode.qio=QIO (fast) +modwifi.menu.FlashMode.qio.build.flash_mode=qio +modwifi.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO +modwifi.menu.ResetMethod.ck=no dtr (aka ck) +modwifi.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset +modwifi.menu.ResetMethod.nodemcu=dtr (aka nodemcu) +modwifi.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset +modwifi.menu.ResetMethod.nodtr_nosync=no dtr, no_sync +modwifi.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset modwifi.build.flash_mode=qio modwifi.build.flash_flags=-DFLASHMODE_QIO modwifi.build.flash_freq=40 From 4634eb875f5a440ed641c05f575bd9872fef79bf Mon Sep 17 00:00:00 2001 From: Stanimir-Petev Date: Fri, 3 Sep 2021 09:58:32 +0300 Subject: [PATCH 2/2] Update to Olimex board MOD-WiFi-ESP8266(-DEV) The addition of the FlashMode and ResetMethod selection options via boards.txt.py generation file. --- boards.txt | 21 +++++++++------------ tools/boards.txt.py | 5 +++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/boards.txt b/boards.txt index 0ed0e51a28..61a0abb4c4 100644 --- a/boards.txt +++ b/boards.txt @@ -5827,27 +5827,24 @@ modwifi.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM modwifi.menu.non32xfer.fast.build.non32xferflags= modwifi.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow) modwifi.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER -modwifi.upload.resetmethod=--before no_reset --after soft_reset -modwifi.menu.FlashMode.qout=QOUT -modwifi.menu.FlashMode.qout.build.flash_mode=qout -modwifi.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT +modwifi.menu.ResetMethod.nodemcu=dtr (aka nodemcu) +modwifi.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset +modwifi.menu.ResetMethod.ck=no dtr (aka ck) +modwifi.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset +modwifi.menu.ResetMethod.nodtr_nosync=no dtr, no_sync +modwifi.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset modwifi.menu.FlashMode.dout=DOUT (compatible) modwifi.menu.FlashMode.dout.build.flash_mode=dout modwifi.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT modwifi.menu.FlashMode.dio=DIO modwifi.menu.FlashMode.dio.build.flash_mode=dio modwifi.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO +modwifi.menu.FlashMode.qout=QOUT +modwifi.menu.FlashMode.qout.build.flash_mode=qout +modwifi.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT modwifi.menu.FlashMode.qio=QIO (fast) modwifi.menu.FlashMode.qio.build.flash_mode=qio modwifi.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO -modwifi.menu.ResetMethod.ck=no dtr (aka ck) -modwifi.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset -modwifi.menu.ResetMethod.nodemcu=dtr (aka nodemcu) -modwifi.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset -modwifi.menu.ResetMethod.nodtr_nosync=no dtr, no_sync -modwifi.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset -modwifi.build.flash_mode=qio -modwifi.build.flash_flags=-DFLASHMODE_QIO modwifi.build.flash_freq=40 modwifi.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB) modwifi.menu.eesz.2M64.build.flash_size=2M diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 673f8d8068..6282026c88 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -531,8 +531,9 @@ '.build.variant': 'modwifi', }, 'macro': [ - 'resetmethod_ck', - 'flashmode_qio', + 'resetmethod_menu', + 'resetmethod_menu_extra', + 'flashmode_menu', 'flashfreq_40', '2M', ],