Merge branch 'master' into master_backup

tasmota · Aug 14, 2022 · 74da1e5 · 74da1e5
2 parents a059707 + 8d29568
commit 74da1e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/build_esptool.yml b/.github/workflows/build_esptool.yml
@@ -12,13 +12,17 @@ jobs:
         include:
         - os: macos-10.15
           TARGET: macos
+          SEPARATOR: ':'
         - os: ubuntu-latest
           TARGET: linux-amd64
+          SEPARATOR: ':'
         - os: windows-latest
           TARGET: win64
           EXTEN: .exe
+          SEPARATOR: ';'
     env:
       DISTPATH: esptool-${{ matrix.TARGET }}
+      STUBS_DIR: /esptool/targets/stub_flasher/
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -33,7 +37,7 @@ jobs:
           pip install --user -e .
       - name: Build with PyInstaller
         run: |
-          pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico esptool.py
+          pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico --add-data=".${{ env.STUBS_DIR }}*.json${{ matrix.SEPARATOR }}${{ env.STUBS_DIR }}" esptool.py
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico espefuse.py
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico espsecure.py
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico esp_rfc2217_server.py

diff --git a/esptool/__init__.py b/esptool/__init__.py
@@ -30,7 +30,7 @@
     "write_mem",
 ]
 
-__version__ = "4.2-dev"
+__version__ = "4.3-dev"
 
 import argparse
 import inspect

diff --git a/esptool/targets/esp32s2.py b/esptool/targets/esp32s2.py
@@ -268,6 +268,7 @@ def hard_reset(self):
             self._setRTS(False)
             time.sleep(0.2)
         else:
+            time.sleep(0.1)
             self._setRTS(False)
 
 

diff --git a/esptool/targets/esp32s3.py b/esptool/targets/esp32s3.py
@@ -208,6 +208,7 @@ def hard_reset(self):
             self._setRTS(False)
             time.sleep(0.2)
         else:
+            time.sleep(0.1)
             self._setRTS(False)