Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump mdloader to 1.0.6 #312

Merged
merged 4 commits into from
Oct 24, 2021
Merged

Bump mdloader to 1.0.6 #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b6fb65
Update macos
zvecr Oct 22, 2021
d9bb746
Update win
zvecr Oct 23, 2021
93a7587
Remove applet
zvecr Oct 23, 2021
e562443
chmod
zvecr Oct 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed common/applet-mdflash.bin
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions macos/QMK Toolbox.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
3AB4BC9D2495540A00204A3F /* bootloadHID in Resources */ = {isa = PBXBuildFile; fileRef = 3AB4BC9C2495540A00204A3F /* bootloadHID */; };
C93A0FF42292232E0006C88F /* reset.eep in Resources */ = {isa = PBXBuildFile; fileRef = C93A0FF32292232D0006C88F /* reset.eep */; };
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 */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -98,7 +97,6 @@
3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = bootloadHID; sourceTree = "<group>"; };
C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../../common/reset.eep; sourceTree = "<group>"; };
C9A09B5622EE6826008C3CF3 /* mdloader */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader; sourceTree = "<group>"; };
C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "applet-mdflash.bin"; path = "../../../common/applet-mdflash.bin"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -178,7 +176,6 @@
3A53FB5B268A33F10020BAB0 /* Resources */ = {
isa = PBXGroup;
children = (
C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */,
09522BBA1F6216BA00AEBC5E /* avrdude.conf */,
09522BB21F61E32700AEBC5E /* mcu-list.txt */,
C93A0FF32292232D0006C88F /* reset.eep */,
Expand Down Expand Up @@ -272,7 +269,6 @@
3A8F9EFF26E75012007480A7 /* KeyTesterWindow.xib in Resources */,
3A8F9F0226E7501E007480A7 /* KeyView.xib in Resources */,
092964051F5C8B2C004F2D3F /* MainMenu.xib in Resources */,
C9A09B5922EE6837008C3CF3 /* applet-mdflash.bin in Resources */,
09522BBB1F6216BA00AEBC5E /* avrdude.conf in Resources */,
09522BB31F61E32700AEBC5E /* mcu-list.txt in Resources */,
C93A0FF42292232E0006C88F /* reset.eep in Resources */,
Expand Down
Binary file modified macos/QMK Toolbox/Resources/mdloader
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion windows/QMK Toolbox/Flashing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public class Flashing : EventArgs
public Usb Usb;

private readonly string[] _resources = {
"applet-mdflash.bin",
"avrdude.conf",
"reset.eep",
"reset_left.eep",
Expand Down
4 changes: 1 addition & 3 deletions windows/QMK Toolbox/QMK Toolbox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@
</ItemGroup>
<ItemGroup>
<Content Include="Resources\output.ico" />
<EmbeddedResource Include="..\..\common\applet-mdflash.bin">
<Link>Resources\applet-mdflash.bin</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\common\avrdude.conf">
<Link>Resources\avrdude.conf</Link>
</EmbeddedResource>
Expand Down Expand Up @@ -211,4 +208,5 @@
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

</Project>
Binary file modified windows/QMK Toolbox/Resources/mdloader.exe
View file
Open in desktop
Binary file not shown.