speeduino
/
SpeedyLoader
mirror of https://github.com/speeduino/SpeedyLoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for stm32 upload on Windows

This commit is contained in:
Josh Stewart 2024-06-12 11:13:58 +10:00
parent d385644f26
commit 4f4c3b74be
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.js
View File

@ -14,6 +14,7 @@ var teensyLoaderIsRunning = false;
var dfuutilIsRunning = false; var dfuutilIsRunning = false;
var teensyLoaderErr = "" var teensyLoaderErr = ""
var dfuutilErr = "" var dfuutilErr = ""
var dfuUtilStatus = ""
function createWindow () function createWindow ()
{ {
@ -238,7 +239,6 @@ ipcMain.on('uploadFW', (e, args) => {
}); });
ipcMain.on("uploadFW_stm32", (e, args) => { ipcMain.on("uploadFW_stm32", (e, args) => {
//"dfu-util" -d 0x0483:0xDF11 -a 0 -s 0x08000000:leave -D"
if(dfuutilIsRunning == true) { return; } if(dfuutilIsRunning == true) { return; }
dfuutilIsRunning = true; //Indicate that an avrdude process has started dfuutilIsRunning = true; //Indicate that an avrdude process has started
var platform; var platform;
@ -270,20 +270,21 @@ ipcMain.on("uploadFW_stm32", (e, args) => {
var execArgs = ['-d', deviceString, '-a', '0', '-s', '0x08000000:leave', '-D', args.firmwareFile]; var execArgs = ['-d', deviceString, '-a', '0', '-s', '0x08000000:leave', '-D', args.firmwareFile];
//console.log(execArgs); //console.log(execArgs);
if(process.platform == "win32") { executableName = executableName + '.exe'; } //This must come after the configName line above if(process.platform == "win32") { executableName = executableName + '-static.exe'; } //This must come after the configName line above
console.log(executableName); console.log(executableName);
dfuutilErr = "Executing Cmd: "+ executableName; dfuutilErr = "Executing Cmd: "+ executableName + "\n";
const child = execFile(executableName, execArgs); const child = execFile(executableName, execArgs);
child.stderr.on('data', (data) => { child.stderr.on('data', (data) => {
console.log(`dfu-util stderr:\n${data}`); console.log(`dfu-util stderr:\n${data}`);
dfuutilErr = dfuutilErr + data;
}); });
child.stdout.on('data', (data) => { child.stdout.on('data', (data) => {
console.log(`dfu-util stdout: ${data}`); console.log(`dfu-util stdout: ${data}`);
console.log("Data Length: "+data.length); console.log("Data Length: "+data.length);
dfuutilErr = dfuutilErr + data; dfuUtilStatus = dfuUtilStatus + data;
//Check if avrdude has started the actual burn yet, and if so, track the '#' characters that it prints. Each '#' represents 1% of the total burn process (50 for write and 50 for read) //Check if avrdude has started the actual burn yet, and if so, track the '#' characters that it prints. Each '#' represents 1% of the total burn process (50 for write and 50 for read)
if (burnStarted == true) if (burnStarted == true)
@ -293,7 +294,7 @@ ipcMain.on("uploadFW_stm32", (e, args) => {
else else
{ {
//This is a hack, but basically watch the output from teensy loader for the term 'Writing | ', everything after that is the #s indicating 1% of burn. //This is a hack, but basically watch the output from teensy loader for the term 'Writing | ', everything after that is the #s indicating 1% of burn.
if(dfuutilErr.includes("Erase done.")) if(dfuUtilStatus.includes("Erase done."))
{ {
burnStarted = true; burnStarted = true;
} }
@ -314,6 +315,13 @@ ipcMain.on("uploadFW_stm32", (e, args) => {
if (code !== 0) if (code !== 0)
{ {
console.log(`dfu-util process exited with code ${code}`); console.log(`dfu-util process exited with code ${code}`);
dfuutilErr = dfuutilErr + `dfu-util process exited with code ${code} \n`;
if(code == 74)
{
dfuutilErr = dfuutilErr + "Uploading to STM32 devices requires libusb to be installed. Please see: https://github.com/libusb/libusb/wiki/Windows#How_to_use_libusb_on_Windows";
}
e.sender.send( "upload error", dfuutilErr ) e.sender.send( "upload error", dfuutilErr )
dfuutilErr = ""; dfuutilErr = "";
} }

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "speedyloader", "name": "speedyloader",
"version": "1.5.2", "version": "1.6.0-beta.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "speedyloader", "name": "speedyloader",
"version": "1.5.2", "version": "1.6.0-beta.2",
"hasInstallScript": true, "hasInstallScript": true,
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {