Merge pull request #142 from pkendall64/fix-configurator

Rename flasher file used by configurator
ExpressLRS · Jul 25, 2024 · ad85322 · ad85322
2 parents be1601d + f81cf2c
commit ad85322
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -1,4 +1,4 @@
-import binary_flash
+import binary_configurator
 
 if __name__ == '__main__':
-    binary_flash.main()
+    binary_configurator.main()
diff --git a/python/binary_flash.py → python/binary_configurator.py b/python/binary_flash.py → 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']

diff --git 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=[