Added support for mac os (Darwin) (ExpressLRS#365)

brandonrc · web-flow · commit c3a8405efd11 · 2021-02-28T01:02:15.000+10:00
* Removed os checks in runpython.py and added addition print statment to stlink.py

* Fix print statement in stlink.py

* Updating print statement in bootloader stlink.py

* Updating stlink to check for dawin (Mac OS)
diff --git a/src/bootloader/src/python/stlink.py b/src/bootloader/src/python/stlink.py
@@ -44,11 +44,18 @@ def get_commands(env, firmware):
         if bootloader is not None:
             BL_CMD = [TOOL, "write", bootloader, hex(flash_start)]
         APP_CMD = [TOOL, "--reset", "write", firmware, hex(app_start)]
+    elif "darwin" in platform_name:
+        TOOL = os.path.join(
+            env_dir,
+            "tool-stm32duino", "stlink", "st-flash")
+        if bootloader is not None:
+            BL_CMD = [TOOL, "write", bootloader, hex(flash_start)]
+        APP_CMD = [TOOL, "--reset", "write", firmware, hex(app_start)]
     elif "os x" in platform_name:
         print("OS X not supported at the moment\n")
         raise OSError
     else:
-        print("Unknown operating system...\n")
+        print("Operating system: "+ platform_name +  " is not supported.\n")
         raise OSError
 
     return " ".join(BL_CMD), " ".join(APP_CMD)
diff --git a/src/python/runpython.py b/src/python/runpython.py
diff --git a/src/python/stlink.py b/src/python/stlink.py
@@ -43,11 +43,18 @@ def get_commands(env, firmware):
         if bootloader is not None:
             BL_CMD = [TOOL, "write", bootloader, hex(flash_start)]
         APP_CMD = [TOOL, "--reset", "write", firmware, hex(app_start)]
+    elif "darwin" in platform_name:
+        TOOL = os.path.join(
+            env_dir,
+            "tool-stm32duino", "stlink", "st-flash")
+        if bootloader is not None:
+            BL_CMD = [TOOL, "write", bootloader, hex(flash_start)]
+        APP_CMD = [TOOL, "--reset", "write", firmware, hex(app_start)]
     elif "os x" in platform_name:
         print("OS X not supported at the moment\n")
         raise OSError
     else:
-        print("Unknown operating system...\n")
+        print("Operating system: "+ platform_name +  " is not supported.\n")
         raise OSError
 
     return " ".join(BL_CMD), " ".join(APP_CMD)
