V1.6.0

.github/workflows/build-linux.yml

@@ -33,12 +33,14 @@ jobs:
       # Setup python
       - name: System Setup
         run: |
-          pip3 install pyinstaller pyqt5 darkdetect pyserial
+          pip install pyinstaller pyqt5 darkdetect argparse intelhex esptool
 
       # Build the installer
       - name: Build Linux Installer
         run: |
-          pyinstaller --onefile --clean --name RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader/resource/RTK.ico --add-binary="RTK_Firmware_Uploader/resource/RTK_Surveyor_Partitions_4MB.bin:." --add-binary="RTK_Firmware_Uploader/resource/RTK_Surveyor_Partitions_16MB.bin:." --add-binary="RTK_Firmware_Uploader/resource/RTK_Surveyor.ino.bootloader.bin:." --add-binary="RTK_Firmware_Uploader/resource/boot_app0.bin:." --add-binary="RTK_Firmware_Uploader/resource/RTK.png:." --add-data="RTK_Firmware_Uploader/resource/*:resource/" RTK_Firmware_Upload.py
+          ESPTOOL_LOCATION=$(pip show esptool | grep "Location: " | cut -c 11- | tr -d '\n')
+          ESPTOOL_TARGETS=$(echo "${ESPTOOL_LOCATION}/esptool/targets/stub_flasher/*.json:./esptool/targets/stub_flasher/")
+          pyinstaller --onefile --clean --name RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader/resource/RTK.ico --add-data="RTK_Firmware_Uploader/resource/*:resource/" --add-data="${ESPTOOL_TARGETS}" RTK_Firmware_Upload.py
           gzip RTKUploader
           mv RTKUploader.gz RTKUploader.linux.gz
 

.github/workflows/build-macos.yml

@@ -33,13 +33,15 @@ jobs:
       # Setup python
       - name: System Setup
         run: |
-          pip3 install pyserial pyinstaller Pillow pyqt5 darkdetect
+          pip install pyinstaller Pillow pyqt5 darkdetect argparse intelhex esptool
           brew install create-dmg
 
       # Build the installer
       - name: Build Mac Installer
         run: |
-          pyinstaller --windowed -n RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader/resource/RTK.ico --add-binary="RTK_Firmware_Uploader/resource/RTK_Surveyor_Partitions_4MB.bin:." --add-binary="RTK_Firmware_Uploader/resource/RTK_Surveyor_Partitions_16MB.bin:." --add-binary="RTK_Firmware_Uploader/resource/RTK_Surveyor.ino.bootloader.bin:." --add-binary="RTK_Firmware_Uploader/resource/boot_app0.bin:." --add-binary="RTK_Firmware_Uploader/resource/RTK.png:." --add-data="RTK_Firmware_Uploader/resource/*:resource/" RTK_Firmware_Upload.py
+          ESPTOOL_LOCATION=$(pip show esptool | grep "Location: " | cut -c 11- | tr -d '\n')
+          ESPTOOL_TARGETS=$(echo "${ESPTOOL_LOCATION}/esptool/targets/stub_flasher/*.json:./esptool/targets/stub_flasher/")
+          pyinstaller --windowed -n RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader/resource/RTK.ico --add-data="RTK_Firmware_Uploader/resource/*:resource/" --add-data="${ESPTOOL_TARGETS}" RTK_Firmware_Upload.py
           mkdir tmp
           mv "RTKUploader.app" "tmp/"
           create-dmg --volicon "RTK_Firmware_Uploader/resource/sparkdisk.icns" --background "RTK_Firmware_Uploader/resource/sfe_logo_med.png" --hide-extension "RTKUploader.app" --icon "RTKUploader.app" 100 100 --window-size 600 440 --app-drop-link 400 100 "RTKUploader.dmg" "tmp/"

.github/workflows/build-windows.yml

@@ -33,12 +33,16 @@ jobs:
       # Setup python
       - name: System Setup
         run: |
-          pip3 install pyinstaller pyqt5 darkdetect pyserial
-        
+          pip install pyinstaller pyqt5 darkdetect argparse intelhex esptool
+
       # Build the installer
       - name: Build Windows Installer
+        shell: powershell
         run: |
-          pyinstaller --onefile --clean --name RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader\resource\RTK.ico --add-binary="RTK_Firmware_Uploader\resource\RTK_Surveyor_Partitions_4MB.bin;." --add-binary="RTK_Firmware_Uploader\resource\RTK_Surveyor_Partitions_16MB.bin;." --add-binary="RTK_Firmware_Uploader\resource\RTK_Surveyor.ino.bootloader.bin;." --add-binary="RTK_Firmware_Uploader\resource\boot_app0.bin;." --add-binary="RTK_Firmware_Uploader\resource\RTK.png;." --add-data="RTK_Firmware_Uploader\resource\*;resource\" RTK_Firmware_Upload.py
+          $ESPTOOL_TARGETS = echo "$(pip show esptool | findstr "Location: ")"
+          $ESPTOOL_TARGETS = $ESPTOOL_TARGETS.Substring(10)
+          $ESPTOOL_TARGETS = echo "${ESPTOOL_TARGETS}\esptool\targets\stub_flasher\*.json;.\esptool\targets\stub_flasher\"
+          pyinstaller --onefile --clean --name RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader\resource\RTK.ico --add-data="RTK_Firmware_Uploader\resource\*;resource\" --add-data="${ESPTOOL_TARGETS}" RTK_Firmware_Upload.py
 
       - name: Compress Installer
         shell: powershell

.gitignore

@@ -1,3 +1,7 @@
+#Python
+__pycache__/
+*.py[co]
+
 #VSCode
 
 /.vscode/*

README.md

@@ -7,6 +7,9 @@ The RTK Firmware Uploader is a simple, easy to use method for updating the firmw
 
 If you need to install the application, see the [Installation Section](#installation) of this page.
 
+## Notes:
+
+From v1.6.0, this GUI does not contain a copy of ```esptool.py```. Instead the latest ```esptool.py``` is installed and used by the build workflow. If you want to run ```RTK_Firmware_Uploader.py``` locally, you will need to ```pip install esptool``` first.
 
 # Using the RTK Firmware Uploader
 

RTK_Firmware_Uploader/RTK_Firmware_Uploader.py

@@ -375,7 +375,8 @@ def update_baud_rates(self) -> None:
         # Highest speed first so code defaults to that
         # if settings.value(SETTING_BAUD_RATE) is None
         self.baud_combobox.clear()
-        self.baud_combobox.addItem("921600", 921600)
+        if (platform.system() != "Darwin"): # 921600 fails on MacOS
+            self.baud_combobox.addItem("921600", 921600)
         self.baud_combobox.addItem("460800", 460800)
         self.baud_combobox.addItem("115200", 115200)
 

RTK_Firmware_Uploader/au_act_esptool.py

@@ -1,11 +1,26 @@
 from .au_action import AxAction, AxJob
-from .esptool import main as esptool_main
-from .esptool import ESPLoader
-from .esptool import UnsupportedCommandError
-from .esptool import NotSupportedError
-from .esptool import NotImplementedInROMError
-from .esptool import FatalError
 
+import esptool # pip install esptool
+
+# # When I couldn't get the windowed executable to work on MacOS, I suspected that esptool still could not
+# # find the stub_flasher json files. Turns out it was actually the baud rate that was the issue...
+# # 921600 fails on my Mac Mini, but 460800 works fine...
+# # I'm leaving the following commented code for future reference. I really like the exec trick!
+# 
+# from platform import system
+# import os.path
+# import sys
+# if (system() == "Darwin") and hasattr(sys, '_MEIPASS'): # Fix for MacOS pyinstaller windowed executable
+#     head_tail = os.path.split(os.path.dirname(__file__))
+#     base_path = os.path.abspath(head_tail[0])
+#     STUBS_DIR = os.path.join(base_path, "esptool", "targets", "stub_flasher")
+#     # Python hackiness: change the path to stub json files in the context of the esptool
+#     # module, so it edits the esptool's global variables
+#     exec(
+#         "loader.STUBS_DIR = '{}'".format(STUBS_DIR),
+#         esptool.__dict__,
+#         esptool.__dict__,
+#         )
 
 #--------------------------------------------------------------------------------------
 # action testing
@@ -20,7 +35,7 @@ def __init__(self) -> None:
     def run_job(self, job:AxJob):
 
         try:
-            esptool_main(job.command)
+            esptool.main(job.command)
 
         except Exception:
             return 1
@@ -38,7 +53,7 @@ def __init__(self) -> None:
     def run_job(self, job:AxJob):
 
         try:
-            esptool_main(job.command)
+            esptool.main(job.command)
 
         except Exception:
             return 1
@@ -56,7 +71,7 @@ def __init__(self) -> None:
     def run_job(self, job:AxJob):
 
         try:
-            esptool_main(job.command)
+            esptool.main(job.command)
 
         except Exception:
             return 1