Skip to content

Commit

Permalink
Increment version to 0.1.0 (#289)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored Aug 1, 2021
1 parent 80a3f4a commit 374c3d2
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 21 deletions.
2 changes: 1 addition & 1 deletion macos/QMK Toolbox.pkgproj
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>0.0.21</string>
<string>0.1.0</string>
</dict>
<key>UUID</key>
<string>9890D281-1549-46B1-8075-2C3C14A67FB9</string>
Expand Down
9 changes: 5 additions & 4 deletions macos/QMK Toolbox/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -261,16 +261,17 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
[_printer print:[NSString stringWithFormat:@"QMK Toolbox %@ (http://qmk.fm/toolbox)", version] withType:MessageType_Info];
[_printer printResponse:@"Supported bootloaders:\n" withType:MessageType_Info];
[_printer printResponse:@" - ARM DFU (APM32, Kiibohd, STM32, STM32duino) via dfu-util (http://dfu-util.sourceforge.net/)\n" withType:MessageType_Info];
[_printer printResponse:@" - Atmel/LUFA/QMK DFU via dfu-programmer (http://dfu-programmer.github.io/)\n" withType:MessageType_Info];
[_printer printResponse:@" - Caterina (Arduino, Pro Micro) via avrdude (http://nongnu.org/avrdude/)\n" withType:MessageType_Info];
[_printer printResponse:@" - Halfkay (Teensy, Ergodox EZ) via Teensy Loader (https://pjrc.com/teensy/loader_cli.html)\n" withType:MessageType_Info];
[_printer printResponse:@" - ARM DFU (STM32, APM32, Kiibohd, STM32duino) via dfu-util (http://dfu-util.sourceforge.net/)\n" withType:MessageType_Info];
[_printer printResponse:@" - Atmel SAM-BA (Massdrop) via Massdrop Loader (https://github.com/massdrop/mdloader)\n" withType:MessageType_Info];
[_printer printResponse:@" - BootloadHID (Atmel, PS2AVRGB) via bootloadHID (https://www.obdev.at/products/vusb/bootloadhid.html)\n" withType:MessageType_Info];
[_printer printResponse:@" - Caterina (Arduino, Pro Micro) via avrdude (http://nongnu.org/avrdude/)\n" withType:MessageType_Info];
[_printer printResponse:@" - HalfKay (Teensy, Ergodox EZ) via Teensy Loader (https://pjrc.com/teensy/loader_cli.html)\n" withType:MessageType_Info];
[_printer printResponse:@" - LUFA Mass Storage\n" withType:MessageType_Info];
[_printer printResponse:@"Supported ISP flashers:\n" withType:MessageType_Info];
[_printer printResponse:@" - USBTiny (AVR Pocket)\n" withType:MessageType_Info];
[_printer printResponse:@" - AVRISP (Arduino ISP)\n" withType:MessageType_Info];
[_printer printResponse:@" - USBasp (AVR ISP)\n" withType:MessageType_Info];
[_printer printResponse:@" - USBTiny (AVR Pocket)\n" withType:MessageType_Info];

[HID setupWithPrinter:_printer];
[USB setupWithPrinter:_printer andDelegate:self];
Expand Down
4 changes: 2 additions & 2 deletions macos/QMK Toolbox/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.21</string>
<string>0.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -87,7 +87,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0.0.21</string>
<string>0.1.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
15 changes: 9 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,27 @@

This is a collection of flashing tools packaged into one app. It supports auto-detection and auto-flashing of firmware to keyboards.

![](https://i.imgur.com/cfRVWY7.png)
|Windows|macOS|
|-------|-----|
|[![Windows](https://i.imgur.com/NjOaPrE.png)](https://i.imgur.com/NjOaPrE.png)|[![macOS](https://i.imgur.com/A6mfa5h.png)](https://i.imgur.com/A6mfa5h.png)|

## Flashing

QMK Toolbox supports the following bootloaders:

- ARM DFU (APM32, Kiibohd, STM32, STM32duino) via [dfu-util](http://dfu-util.sourceforge.net/)
- Atmel/LUFA/QMK DFU via [dfu-programmer](http://dfu-programmer.github.io/)
- Caterina (Arduino, Pro Micro) via [avrdude](http://nongnu.org/avrdude/)
- Halfkay (Teensy, Ergodox EZ) via [Teensy Loader](https://pjrc.com/teensy/loader_cli.html)
- ARM DFU (STM32, APM32, Kiibohd, STM32duino) via [dfu-util](http://dfu-util.sourceforge.net/)
- Atmel SAM-BA (Massdrop) via [Massdrop Loader](https://github.com/massdrop/mdloader)
- BootloadHID (Atmel, PS2AVRGB) via [bootloadHID](https://www.obdev.at/products/vusb/bootloadhid.html)
- Caterina (Arduino, Pro Micro) via [avrdude](http://nongnu.org/avrdude/)
- HalfKay (Teensy, Ergodox EZ) via [Teensy Loader](https://pjrc.com/teensy/loader_cli.html)
- LUFA Mass Storage

And the following ISP flashers:

- USBTiny (AVR Pocket)
- AVRISP (Arduino ISP)
- USBasp (AVR ISP)
- USBTiny (AVR Pocket)

If there's an interest in any others, they can be added if their commands are known.

Expand All @@ -36,7 +39,7 @@ The Toolbox also listens to HID messages on usage page `0xFF31` and usage `0x007

If you have `CONSOLE_ENABLE = yes` in your keyboard's `rules.mk`, you can print messages with `xprintf()`, useful for debugging:

![](https://i.imgur.com/SWCFLCz.png)
![Hello world from Console](https://i.imgur.com/iYTa5PB.png)

See the [QMK Docs](https://docs.qmk.fm/#/newbs_testing_debugging?id=debugging) for more information.

Expand Down
9 changes: 5 additions & 4 deletions windows/QMK Toolbox/MainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,17 @@ private void MainWindow_Load(object sender, EventArgs e)

_printer.Print($"QMK Toolbox {Application.ProductVersion} (https://qmk.fm/toolbox)", MessageType.Info);
_printer.PrintResponse("Supported bootloaders:\n", MessageType.Info);
_printer.PrintResponse(" - ARM DFU (APM32, Kiibohd, STM32, STM32duino) via dfu-util (http://dfu-util.sourceforge.net/)\n", MessageType.Info);
_printer.PrintResponse(" - Atmel/LUFA/QMK DFU via dfu-programmer (http://dfu-programmer.github.io/)\n", MessageType.Info);
_printer.PrintResponse(" - Caterina (Arduino, Pro Micro) via avrdude (http://nongnu.org/avrdude/)\n", MessageType.Info);
_printer.PrintResponse(" - Halfkay (Teensy, Ergodox EZ) via Teensy Loader (https://pjrc.com/teensy/loader_cli.html)\n", MessageType.Info);
_printer.PrintResponse(" - ARM DFU (STM32, APM32, Kiibohd, STM32duino) via dfu-util (http://dfu-util.sourceforge.net/)\n", MessageType.Info);
_printer.PrintResponse(" - Atmel SAM-BA (Massdrop) via Massdrop Loader (https://github.com/massdrop/mdloader)\n", MessageType.Info);
_printer.PrintResponse(" - BootloadHID (Atmel, PS2AVRGB) via bootloadHID (https://www.obdev.at/products/vusb/bootloadhid.html)\n", MessageType.Info);
_printer.PrintResponse(" - Caterina (Arduino, Pro Micro) via avrdude (http://nongnu.org/avrdude/)\n", MessageType.Info);
_printer.PrintResponse(" - HalfKay (Teensy, Ergodox EZ) via Teensy Loader (https://pjrc.com/teensy/loader_cli.html)\n", MessageType.Info);
_printer.PrintResponse(" - LUFA Mass Storage\n", MessageType.Info);
_printer.PrintResponse("Supported ISP flashers:\n", MessageType.Info);
_printer.PrintResponse(" - USBTiny (AVR Pocket)\n", MessageType.Info);
_printer.PrintResponse(" - AVRISP (Arduino ISP)\n", MessageType.Info);
_printer.PrintResponse(" - USBasp (AVR ISP)\n", MessageType.Info);
_printer.PrintResponse(" - USBTiny (AVR Pocket)\n", MessageType.Info);

ManagementObjectCollection collection;
using (var searcher = new ManagementObjectSearcher(@"SELECT * FROM Win32_PnPEntity WHERE DeviceID LIKE 'USB%'"))
Expand Down
4 changes: 2 additions & 2 deletions windows/QMK Toolbox/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.21")]
[assembly: AssemblyFileVersion("0.0.21")]
[assembly: AssemblyVersion("0.1.0")]
[assembly: AssemblyFileVersion("0.1.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="WindowState" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>QMK_Toolbox.WindowState, qmk_toolbox, Version=0.0.21.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>QMK_Toolbox.WindowState, qmk_toolbox, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
2 changes: 1 addition & 1 deletion windows/install_compiler.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define MyAppName "QMK Toolbox"
#define MyAppHandle "qmk"
#define MyAppVersion "0.0.21"
#define MyAppVersion "0.1.0"
#define MyAppPublisher "QMK"
#define MyAppURL "https://qmk.fm"
#define MyAppExeName "qmk_toolbox.exe"
Expand Down

0 comments on commit 374c3d2

Please sign in to comment.