From 0d3587638169176b94b793b510246e9763631e9b Mon Sep 17 00:00:00 2001 From: Paul Kendall Date: Sat, 20 Jul 2024 17:07:05 +1200 Subject: [PATCH 1/3] Rename flasher file used by configurator --- python/{binary_flash.py => binary_configurator.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename python/{binary_flash.py => binary_configurator.py} (100%) diff --git a/python/binary_flash.py b/python/binary_configurator.py similarity index 100% rename from python/binary_flash.py rename to python/binary_configurator.py From 3df4d3fb7f7931a8e132068b95153f95fc8eb2f6 Mon Sep 17 00:00:00 2001 From: Paul Kendall Date: Sun, 21 Jul 2024 14:51:27 +1200 Subject: [PATCH 2/3] Fix missed files used to build the binary flasher --- python/__init__.py | 4 ++-- python/__main__.py | 4 ++-- python/setup.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/__init__.py b/python/__init__.py index 955a3736..64fc5087 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -1,4 +1,4 @@ -import binary_flash +import binary_configurator if __name__ == '__main__': - binary_flash.main() + binary_configurator.main() diff --git a/python/__main__.py b/python/__main__.py index 955a3736..64fc5087 100644 --- a/python/__main__.py +++ b/python/__main__.py @@ -1,4 +1,4 @@ -import binary_flash +import binary_configurator if __name__ == '__main__': - binary_flash.main() + binary_configurator.main() diff --git a/python/setup.py b/python/setup.py index a3bbc500..e4330432 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,6 +1,6 @@ import setuptools setuptools.setup( - name="binary_flash", + name="flasher", version="3.3.0", author="ExpressLRS Team", author_email="", @@ -11,7 +11,7 @@ packages=['.'] + setuptools.find_packages(), include_package_data=True, entry_points={ - "console_scripts": ["flash=binary_flash:main"], + "console_scripts": ["flash=binary_configurator:main"], }, install_requires=['pyserial'], classifiers=[ From f81cf2c8af3de91f860fb3f468d79004d84acc6e Mon Sep 17 00:00:00 2001 From: Paul Kendall Date: Sun, 21 Jul 2024 21:08:53 +1200 Subject: [PATCH 3/3] Add missing extraction of platform --- python/binary_configurator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/binary_configurator.py b/python/binary_configurator.py index a93fb2f8..932b66d1 100644 --- a/python/binary_configurator.py +++ b/python/binary_configurator.py @@ -244,7 +244,8 @@ def main(): with open('hardware/targets.json') as f: targets = json.load(f) - mcu = MCUType.ESP8266 if targets[vendor][hardware][target]['platform'] == "esp8285" else MCUType.ESP32 + args.platform = targets[vendor][hardware][target]['platform'] + mcu = MCUType.ESP8266 if args.platform == "esp8285" else MCUType.ESP32 if args.file is None: srcdir = targets[vendor][hardware][target]['firmware']