diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84a79e90a3..316ba1367e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Check binary permissions working-directory: ./macos/QMK Toolbox/Resources env: - QMK_BINARIES: avrdude bootloadHID dfu-programmer dfu-util mdloader_mac teensy_loader_cli + QMK_BINARIES: avrdude bootloadHID dfu-programmer dfu-util mdloader teensy_loader_cli run: | status=0 for b in $QMK_BINARIES; do diff --git a/macos/QMK Toolbox.xcodeproj/project.pbxproj b/macos/QMK Toolbox.xcodeproj/project.pbxproj index 5915cd476f..820e90a937 100644 --- a/macos/QMK Toolbox.xcodeproj/project.pbxproj +++ b/macos/QMK Toolbox.xcodeproj/project.pbxproj @@ -31,7 +31,7 @@ 3A7770DA22BD3BA300398C40 /* libftdi.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3A7770D822BD3B8200398C40 /* libftdi.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3AB4BC9D2495540A00204A3F /* bootloadHID in Resources */ = {isa = PBXBuildFile; fileRef = 3AB4BC9C2495540A00204A3F /* bootloadHID */; }; C93A0FF42292232E0006C88F /* reset.eep in Resources */ = {isa = PBXBuildFile; fileRef = C93A0FF32292232D0006C88F /* reset.eep */; }; - C9A09B5722EE6826008C3CF3 /* mdloader_mac in Resources */ = {isa = PBXBuildFile; fileRef = C9A09B5622EE6826008C3CF3 /* mdloader_mac */; }; + C9A09B5722EE6826008C3CF3 /* mdloader in Resources */ = {isa = PBXBuildFile; fileRef = C9A09B5622EE6826008C3CF3 /* mdloader */; }; C9A09B5922EE6837008C3CF3 /* applet-mdflash.bin in Resources */ = {isa = PBXBuildFile; fileRef = C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */; }; /* End PBXBuildFile section */ @@ -84,7 +84,7 @@ 3A7770D822BD3B8200398C40 /* libftdi.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libftdi.1.dylib; sourceTree = ""; }; 3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = bootloadHID; sourceTree = ""; }; C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../../common/reset.eep; sourceTree = ""; }; - C9A09B5622EE6826008C3CF3 /* mdloader_mac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader_mac; sourceTree = ""; }; + C9A09B5622EE6826008C3CF3 /* mdloader */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader; sourceTree = ""; }; C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "applet-mdflash.bin"; path = "../../../common/applet-mdflash.bin"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -164,7 +164,7 @@ 3AB4BC9C2495540A00204A3F /* bootloadHID */, 0929640C1F5E403C004F2D3F /* dfu-programmer */, 098AEDFA1F5E45C300CA054D /* dfu-util */, - C9A09B5622EE6826008C3CF3 /* mdloader_mac */, + C9A09B5622EE6826008C3CF3 /* mdloader */, 0929640E1F5E4068004F2D3F /* teensy_loader_cli */, 3A7770D822BD3B8200398C40 /* libftdi.1.dylib */, 09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */, @@ -243,7 +243,7 @@ 3AB4BC9D2495540A00204A3F /* bootloadHID in Resources */, 0929640D1F5E403C004F2D3F /* dfu-programmer in Resources */, 098AEDFB1F5E45C300CA054D /* dfu-util in Resources */, - C9A09B5722EE6826008C3CF3 /* mdloader_mac in Resources */, + C9A09B5722EE6826008C3CF3 /* mdloader in Resources */, 0929640F1F5E4068004F2D3F /* teensy_loader_cli in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/macos/QMK Toolbox/Flashing.m b/macos/QMK Toolbox/Flashing.m index 10d5d1e3de..4a978e4819 100644 --- a/macos/QMK Toolbox/Flashing.m +++ b/macos/QMK Toolbox/Flashing.m @@ -252,11 +252,11 @@ - (void)flashUSBAsp:(NSString *)mcu withFile:(NSString *)file { } - (void)flashAtmelSAMBAwithFile: (NSString *)file { - [self runProcess:@"mdloader_mac" withArgs:@[@"-p", serialPort, @"-D", file, @"--restart"]]; + [self runProcess:@"mdloader" withArgs:@[@"-p", serialPort, @"-D", file, @"--restart"]]; } - (void)resetAtmelSAMBA { - [self runProcess:@"mdloader_mac" withArgs:@[@"-p", serialPort, @"--restart"]]; + [self runProcess:@"mdloader" withArgs:@[@"-p", serialPort, @"--restart"]]; } - (void)flashBootloadHIDwithFile: (NSString *)file { diff --git a/macos/QMK Toolbox/Resources/avrdude b/macos/QMK Toolbox/Resources/avrdude index 5b032a5601..96a599da53 100755 Binary files a/macos/QMK Toolbox/Resources/avrdude and b/macos/QMK Toolbox/Resources/avrdude differ diff --git a/macos/QMK Toolbox/Resources/bootloadHID b/macos/QMK Toolbox/Resources/bootloadHID index 3a6691619e..927fd8aa50 100755 Binary files a/macos/QMK Toolbox/Resources/bootloadHID and b/macos/QMK Toolbox/Resources/bootloadHID differ diff --git a/macos/QMK Toolbox/Resources/dfu-programmer b/macos/QMK Toolbox/Resources/dfu-programmer index 46b8741a85..a96ec1f6b3 100755 Binary files a/macos/QMK Toolbox/Resources/dfu-programmer and b/macos/QMK Toolbox/Resources/dfu-programmer differ diff --git a/macos/QMK Toolbox/Resources/dfu-util b/macos/QMK Toolbox/Resources/dfu-util index c99944e095..5c6f5796a9 100755 Binary files a/macos/QMK Toolbox/Resources/dfu-util and b/macos/QMK Toolbox/Resources/dfu-util differ diff --git a/macos/QMK Toolbox/Resources/libftdi.1.dylib b/macos/QMK Toolbox/Resources/libftdi.1.dylib index 25c919300a..7d3162b6a8 100644 Binary files a/macos/QMK Toolbox/Resources/libftdi.1.dylib and b/macos/QMK Toolbox/Resources/libftdi.1.dylib differ diff --git a/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib b/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib index 2f1bbbfd0a..e4c2f9f3db 100644 Binary files a/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib and b/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib differ diff --git a/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib b/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib index 0de4826a03..64ab245188 100644 Binary files a/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib and b/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib differ diff --git a/macos/QMK Toolbox/Resources/mdloader_mac b/macos/QMK Toolbox/Resources/mdloader similarity index 51% rename from macos/QMK Toolbox/Resources/mdloader_mac rename to macos/QMK Toolbox/Resources/mdloader index 943d16648a..fb578a03ec 100755 Binary files a/macos/QMK Toolbox/Resources/mdloader_mac and b/macos/QMK Toolbox/Resources/mdloader differ diff --git a/macos/QMK Toolbox/Resources/teensy_loader_cli b/macos/QMK Toolbox/Resources/teensy_loader_cli index ae388bd9e5..23f6584713 100755 Binary files a/macos/QMK Toolbox/Resources/teensy_loader_cli and b/macos/QMK Toolbox/Resources/teensy_loader_cli differ