Skip to content

Commit 374c3d2

Browse files
fauxparkfauxpark
authored
Increment version to 0.1.0 (#289)
1 parent 80a3f4a commit 374c3d2

File tree

8 files changed

+26
-21
lines changed

8 files changed

+26
-21
lines changed

‎macos/QMK Toolbox.pkgproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
<key>OVERWRITE_PERMISSIONS</key>
454454
<false/>
455455
<key>VERSION</key>
456-
<string>0.0.21</string>
456+
<string>0.1.0</string>
457457
</dict>
458458
<key>UUID</key>
459459
<string>9890D281-1549-46B1-8075-2C3C14A67FB9</string>

‎macos/QMK Toolbox/AppDelegate.m

+5-4
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,17 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
261261
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
262262
[_printer print:[NSString stringWithFormat:@"QMK Toolbox %@ (http://qmk.fm/toolbox)", version] withType:MessageType_Info];
263263
[_printer printResponse:@"Supported bootloaders:\n" withType:MessageType_Info];
264+
[_printer printResponse:@" - ARM DFU (APM32, Kiibohd, STM32, STM32duino) via dfu-util (http://dfu-util.sourceforge.net/)\n" withType:MessageType_Info];
264265
[_printer printResponse:@" - Atmel/LUFA/QMK DFU via dfu-programmer (http://dfu-programmer.github.io/)\n" withType:MessageType_Info];
265-
[_printer printResponse:@" - Caterina (Arduino, Pro Micro) via avrdude (http://nongnu.org/avrdude/)\n" withType:MessageType_Info];
266-
[_printer printResponse:@" - Halfkay (Teensy, Ergodox EZ) via Teensy Loader (https://pjrc.com/teensy/loader_cli.html)\n" withType:MessageType_Info];
267-
[_printer printResponse:@" - ARM DFU (STM32, APM32, Kiibohd, STM32duino) via dfu-util (http://dfu-util.sourceforge.net/)\n" withType:MessageType_Info];
268266
[_printer printResponse:@" - Atmel SAM-BA (Massdrop) via Massdrop Loader (https://github.com/massdrop/mdloader)\n" withType:MessageType_Info];
269267
[_printer printResponse:@" - BootloadHID (Atmel, PS2AVRGB) via bootloadHID (https://www.obdev.at/products/vusb/bootloadhid.html)\n" withType:MessageType_Info];
268+
[_printer printResponse:@" - Caterina (Arduino, Pro Micro) via avrdude (http://nongnu.org/avrdude/)\n" withType:MessageType_Info];
269+
[_printer printResponse:@" - HalfKay (Teensy, Ergodox EZ) via Teensy Loader (https://pjrc.com/teensy/loader_cli.html)\n" withType:MessageType_Info];
270+
[_printer printResponse:@" - LUFA Mass Storage\n" withType:MessageType_Info];
270271
[_printer printResponse:@"Supported ISP flashers:\n" withType:MessageType_Info];
271-
[_printer printResponse:@" - USBTiny (AVR Pocket)\n" withType:MessageType_Info];
272272
[_printer printResponse:@" - AVRISP (Arduino ISP)\n" withType:MessageType_Info];
273273
[_printer printResponse:@" - USBasp (AVR ISP)\n" withType:MessageType_Info];
274+
[_printer printResponse:@" - USBTiny (AVR Pocket)\n" withType:MessageType_Info];
274275

275276
[HID setupWithPrinter:_printer];
276277
[USB setupWithPrinter:_printer andDelegate:self];

‎macos/QMK Toolbox/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<key>CFBundlePackageType</key>
6969
<string>APPL</string>
7070
<key>CFBundleShortVersionString</key>
71-
<string>0.0.21</string>
71+
<string>0.1.0</string>
7272
<key>CFBundleSignature</key>
7373
<string>????</string>
7474
<key>CFBundleURLTypes</key>
@@ -87,7 +87,7 @@
8787
</dict>
8888
</array>
8989
<key>CFBundleVersion</key>
90-
<string>0.0.21</string>
90+
<string>0.1.0</string>
9191
<key>LSApplicationCategoryType</key>
9292
<string>public.app-category.utilities</string>
9393
<key>LSMinimumSystemVersion</key>

‎readme.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,27 @@
99

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

12-
![](https://i.imgur.com/cfRVWY7.png)
12+
|Windows|macOS|
13+
|-------|-----|
14+
|[![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)|
1315

1416
## Flashing
1517

1618
QMK Toolbox supports the following bootloaders:
1719

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

2528
And the following ISP flashers:
2629

27-
- USBTiny (AVR Pocket)
2830
- AVRISP (Arduino ISP)
2931
- USBasp (AVR ISP)
32+
- USBTiny (AVR Pocket)
3033

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

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

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

39-
![](https://i.imgur.com/SWCFLCz.png)
42+
![Hello world from Console](https://i.imgur.com/iYTa5PB.png)
4043

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

‎windows/QMK Toolbox/MainWindow.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,17 @@ private void MainWindow_Load(object sender, EventArgs e)
171171

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

185186
ManagementObjectCollection collection;
186187
using (var searcher = new ManagementObjectSearcher(@"SELECT * FROM Win32_PnPEntity WHERE DeviceID LIKE 'USB%'"))

‎windows/QMK Toolbox/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("0.0.21")]
35-
[assembly: AssemblyFileVersion("0.0.21")]
34+
[assembly: AssemblyVersion("0.1.0")]
35+
[assembly: AssemblyFileVersion("0.1.0")]

‎windows/QMK Toolbox/Properties/DataSources/WindowState.datasource

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
cause the file to be unrecognizable by the program.
77
-->
88
<GenericObjectDataSource DisplayName="WindowState" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
9-
<TypeInfo>QMK_Toolbox.WindowState, qmk_toolbox, Version=0.0.21.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
9+
<TypeInfo>QMK_Toolbox.WindowState, qmk_toolbox, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
1010
</GenericObjectDataSource>

‎windows/install_compiler.iss

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define MyAppName "QMK Toolbox"
55
#define MyAppHandle "qmk"
6-
#define MyAppVersion "0.0.21"
6+
#define MyAppVersion "0.1.0"
77
#define MyAppPublisher "QMK"
88
#define MyAppURL "https://qmk.fm"
99
#define MyAppExeName "qmk_toolbox.exe"

0 commit comments

Comments
 (0)