diff --git a/src/main/load-serialport.js b/src/main/load-serialport.js index da28dfe..096ab2e 100644 --- a/src/main/load-serialport.js +++ b/src/main/load-serialport.js @@ -62,8 +62,7 @@ await SerialPort.list().then((ports, err) => { if (ports.length == 0) { console.error('not connect') comreturn = false - return - }else{ + }else { const { path, baudRate, dataBits, stopBits, parity } = getSerialPortConstructorArguments(ports) console.log(path, baudRate, dataBits, stopBits, parity) comports = ports diff --git a/src/main/window/localSoftware/MainWindow.ts b/src/main/window/localSoftware/MainWindow.ts index ed5ca51..5c0bb7c 100644 --- a/src/main/window/localSoftware/MainWindow.ts +++ b/src/main/window/localSoftware/MainWindow.ts @@ -250,21 +250,24 @@ export class MainWindow extends LocalSoftwareWindow { let resport: any await comon().then((res:any) => { - resport = res.comoptions.path + if(!res.comoptions) { + event.sender.send('BURN_PROGRAM_FEEDBACK', { err: new Error('请先连接核心处理模块') } ) + }else { + resport = res.comoptions.path + execFile(ESP_TOOL_PATH, + ['--chip', 'esp32', '--port', resport, '--baud', '921600', '--before', 'default_reset', '--after', 'hard_reset', 'write_flash', '-z', '--flash_mode', 'dio', '--flash_freq', '80m', '--flash_size', 'detect', + '0xe000' , BOOT_APP0_BIN_PATH, + '0x1000' , BOOT_LOADER_BIN_PATH, + '0x10000', bin_file_path, + '0x8000' , PARTITIONS_BIN_PATH], (err:any, stdout:any) => { + if (err) { + event.sender.send('BURN_PROGRAM_FEEDBACK', { err } ) + } else { + event.sender.send('BURN_PROGRAM_FEEDBACK', { stdout }) + } + }); + } }) - - execFile(ESP_TOOL_PATH, - ['--chip', 'esp32', '--port', resport, '--baud', '921600', '--before', 'default_reset', '--after', 'hard_reset', 'write_flash', '-z', '--flash_mode', 'dio', '--flash_freq', '80m', '--flash_size', 'detect', - '0xe000' , BOOT_APP0_BIN_PATH, - '0x1000' , BOOT_LOADER_BIN_PATH, - '0x10000', bin_file_path, - '0x8000' , PARTITIONS_BIN_PATH], (err:any, stdout:any) => { - if (err) { - event.sender.send('BURN_PROGRAM_FEEDBACK', { err } ) - } else { - event.sender.send('BURN_PROGRAM_FEEDBACK', { stdout }) - } - }); } launchOnlineSoftware(_: IpcMainEvent, param: any) { diff --git a/src/render/app/BDDataAnalysisPlatform/index.vue b/src/render/app/BDDataAnalysisPlatform/index.vue index 458d0e4..46dddc6 100644 --- a/src/render/app/BDDataAnalysisPlatform/index.vue +++ b/src/render/app/BDDataAnalysisPlatform/index.vue @@ -17,7 +17,7 @@ - + @@ -27,7 +27,7 @@