From 374c3d23aafcf059f44c9827f846e76ca031ed8c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 1 Aug 2021 17:20:24 +1000 Subject: [PATCH] Increment version to 0.1.0 (#289) --- macos/QMK Toolbox.pkgproj | 2 +- macos/QMK Toolbox/AppDelegate.m | 9 +++++---- macos/QMK Toolbox/Info.plist | 4 ++-- readme.md | 15 +++++++++------ windows/QMK Toolbox/MainWindow.cs | 9 +++++---- windows/QMK Toolbox/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/DataSources/WindowState.datasource | 2 +- windows/install_compiler.iss | 2 +- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/macos/QMK Toolbox.pkgproj b/macos/QMK Toolbox.pkgproj index 63a23b641e..acbe0fd61c 100755 --- a/macos/QMK Toolbox.pkgproj +++ b/macos/QMK Toolbox.pkgproj @@ -453,7 +453,7 @@ OVERWRITE_PERMISSIONS VERSION - 0.0.21 + 0.1.0 UUID 9890D281-1549-46B1-8075-2C3C14A67FB9 diff --git a/macos/QMK Toolbox/AppDelegate.m b/macos/QMK Toolbox/AppDelegate.m index e9cb64e579..f2be937e96 100644 --- a/macos/QMK Toolbox/AppDelegate.m +++ b/macos/QMK Toolbox/AppDelegate.m @@ -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]; diff --git a/macos/QMK Toolbox/Info.plist b/macos/QMK Toolbox/Info.plist index 0795176a5e..4cebf031a7 100644 --- a/macos/QMK Toolbox/Info.plist +++ b/macos/QMK Toolbox/Info.plist @@ -68,7 +68,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.0.21 + 0.1.0 CFBundleSignature ???? CFBundleURLTypes @@ -87,7 +87,7 @@ CFBundleVersion - 0.0.21 + 0.1.0 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/readme.md b/readme.md index 8d167b1245..d98416ae83 100644 --- a/readme.md +++ b/readme.md @@ -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. @@ -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. diff --git a/windows/QMK Toolbox/MainWindow.cs b/windows/QMK Toolbox/MainWindow.cs index 0c77a48656..0c5f6a710e 100644 --- a/windows/QMK Toolbox/MainWindow.cs +++ b/windows/QMK Toolbox/MainWindow.cs @@ -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%'")) diff --git a/windows/QMK Toolbox/Properties/AssemblyInfo.cs b/windows/QMK Toolbox/Properties/AssemblyInfo.cs index a3eb2ca50d..a0b2af455e 100644 --- a/windows/QMK Toolbox/Properties/AssemblyInfo.cs +++ b/windows/QMK Toolbox/Properties/AssemblyInfo.cs @@ -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")] \ No newline at end of file +[assembly: AssemblyVersion("0.1.0")] +[assembly: AssemblyFileVersion("0.1.0")] \ No newline at end of file diff --git a/windows/QMK Toolbox/Properties/DataSources/WindowState.datasource b/windows/QMK Toolbox/Properties/DataSources/WindowState.datasource index 6f4c4aef6a..45f2e20697 100644 --- a/windows/QMK Toolbox/Properties/DataSources/WindowState.datasource +++ b/windows/QMK Toolbox/Properties/DataSources/WindowState.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - QMK_Toolbox.WindowState, qmk_toolbox, Version=0.0.21.0, Culture=neutral, PublicKeyToken=null + QMK_Toolbox.WindowState, qmk_toolbox, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/windows/install_compiler.iss b/windows/install_compiler.iss index 4664a48526..0a02b26341 100644 --- a/windows/install_compiler.iss +++ b/windows/install_compiler.iss @@ -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"