[osx] auto-flash working

qmk · Sep 8, 2017 · d534218 · d534218
1 parent 98bbe49
commit d534218
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/osx/qmk_toolbox/AppDelegate.m b/osx/qmk_toolbox/AppDelegate.m
@@ -109,6 +109,9 @@ - (BOOL)canFlash:(Chipset)chipset {
 
 - (void)deviceConnected:(Chipset)chipset {
     devicesAvailable[chipset]+=1;
+    if ([_autoFlashButton state] == NSOnState) {
+        [self flashButtonClick:NULL];
+    }
 }
 
 - (void)deviceDisconnected:(Chipset)chipset {

diff --git a/osx/qmk_toolbox/Flashing.m b/osx/qmk_toolbox/Flashing.m
@@ -81,9 +81,9 @@ - (void)flashDFU:(NSString *)mcu withFile:(NSString *)file {
     result = [self runProcess:@"dfu-programmer" withArgs:@[mcu, @"erase", @"--force"]];
     result = [self runProcess:@"dfu-programmer" withArgs:@[mcu, @"flash", file]];
     if ([result containsString:@"Bootloader and code overlap."]) {
-        result = [self runProcess:@"dfu-programmer" withArgs:@[mcu, @"reset"]];
-    } else {
         [_printer print:@"File is too large for device" withType:MessageType_Error];
+    } else {
+        result = [self runProcess:@"dfu-programmer" withArgs:@[mcu, @"reset"]];
     }
 }
 
@@ -100,7 +100,7 @@ - (void)eepromResetDFU:(NSString *)mcu {
 }
 
 - (void)flashCaterina:(NSString *)mcu withFile:(NSString *)file {
-    [self runProcess:@"avrdude" withArgs:@[@"-p", mcu, @"-c", @"avr109", @"-U", [NSString stringWithFormat:@"flash:w:\"%@\":i", file], @"-P", caterinaPort, @"-C", @"avrdude.conf"]];
+    [self runProcess:@"avrdude" withArgs:@[@"-p", mcu, @"-c", @"avr109", @"-U", [NSString stringWithFormat:@"flash:w:%@:i", file], @"-P", caterinaPort, @"-C", @"avrdude.conf"]];
 }
 
 - (void)eepromResetCaterina:(NSString *)mcu {