Skip to content

Commit f9d8244

Browse files
committed
Final tweaks?
1 parent 920c9d1 commit f9d8244

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/build-windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
$ESPTOOL_TARGETS = echo "$(pip show esptool | findstr "Location: ")"
4343
$ESPTOOL_TARGETS = $ESPTOOL_TARGETS.Substring(10)
4444
$ESPTOOL_TARGETS = echo "${ESPTOOL_TARGETS}\esptool\targets\stub_flasher\*.json;.\esptool\targets\stub_flasher\"
45-
echo "${ESPTOOL_TARGETS}"
4645
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
4746
4847
- name: Compress Installer

RTK_Firmware_Uploader/au_act_esptool.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import esptool # pip install esptool
44

5-
from platform import system
6-
import os.path
7-
8-
import sys
9-
5+
# # When I couldn't get the windowed executable to work on MacOS, I suspected that esptool still could not
6+
# # find the stub_flasher json files. Turns out it was actually the baud rate that was the issue...
7+
# # 921600 fails on my Mac Mini, but 460800 works fine...
8+
# # I'm leaving the following commented code for future reference. I really like the exec trick!
9+
#
10+
# from platform import system
11+
# import os.path
12+
# import sys
1013
# if (system() == "Darwin") and hasattr(sys, '_MEIPASS'): # Fix for MacOS pyinstaller windowed executable
11-
1214
# head_tail = os.path.split(os.path.dirname(__file__))
1315
# base_path = os.path.abspath(head_tail[0])
1416
# STUBS_DIR = os.path.join(base_path, "esptool", "targets", "stub_flasher")

0 commit comments

Comments
 (0)