Merge branch 'master' of https://github.com/noisymime/SpeedyLoader

speeduino · Oct 22, 2020 · 995d3e1 · 995d3e1
2 parents ada8ccd + aaa637f
commit 995d3e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/main.js b/main.js
@@ -237,11 +237,13 @@ ipcMain.on('uploadFW', (e, args) => {
     var executableName = __dirname + "/bin/" + platform + "/teensy_post_compile";
     executableName = executableName.replace('app.asar',''); //This is important for allowing the binary to be found once the app is packaed into an asar
     var configName = executableName + ".conf";
-    if(process.platform == "win32") { executableName = executableName + '.exe'; } //This must come after the configName line above
+
 
     var execArgs = ['-board=TEENSY35', '-reboot', '-file='+path.basename(args.firmwareFile, '.hex'), '-path='+path.dirname(args.firmwareFile), '-tools='+executableName.replace('/teensy_post_compile', "")];
     //console.log(execArgs);
 
+    if(process.platform == "win32") { executableName = executableName + '.exe'; } //This must come after the configName line above
+
     console.log(executableName);
     const child = execFile(executableName, execArgs);
 

diff --git a/renderer.js b/renderer.js
@@ -46,7 +46,7 @@ function refreshSerialPorts()
                 isMega = true;
               }
             }
-            else if(ports[i].vendorId == "16c0")
+            else if(ports[i].vendorId == "16c0" || ports[i].vendorId == "16C0")
             {
               //Teensy
               if(ports[i].productId == "0483")