diff --git a/src/main/window/localSoftware/MainWindow.ts b/src/main/window/localSoftware/MainWindow.ts index 094db1a..ed5ca51 100644 --- a/src/main/window/localSoftware/MainWindow.ts +++ b/src/main/window/localSoftware/MainWindow.ts @@ -224,7 +224,7 @@ export class MainWindow extends LocalSoftwareWindow { } } - burnProgram(event: IpcMainEvent, binFileName: string) { + async burnProgram(event: IpcMainEvent, binFileName: string) { if (!existsSync(ESP_TOOL_PATH) || !existsSync(BOOT_APP0_BIN_PATH) || !existsSync(BOOT_LOADER_BIN_PATH) || @@ -246,12 +246,19 @@ export class MainWindow extends LocalSoftwareWindow { } // 参考1:https://docs.espressif.com/projects/esptool/en/latest/esp32/ // 参考2:https://blog.csdn.net/espressif/article/details/105028809 + + let resport: any + + await comon().then((res:any) => { + resport = res.comoptions.path + }) + execFile(ESP_TOOL_PATH, - ['--chip', 'esp32', '--port', mainWindow.selectedPort ? mainWindow.selectedPort.portName : '', '--baud', '921600', '--before', 'default_reset', '--after', 'hard_reset', 'write_flash', '-z', '--flash_mode', 'dio', '--flash_freq', '80m', '--flash_size', 'detect', + ['--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, stdout) => { + '0x8000' , PARTITIONS_BIN_PATH], (err:any, stdout:any) => { if (err) { event.sender.send('BURN_PROGRAM_FEEDBACK', { err } ) } else { diff --git a/src/render/views/index/QuickBurningModalView/index.vue b/src/render/views/index/QuickBurningModalView/index.vue index 21aa824..3bcda20 100644 --- a/src/render/views/index/QuickBurningModalView/index.vue +++ b/src/render/views/index/QuickBurningModalView/index.vue @@ -32,7 +32,7 @@ const onBurnProgramBtnClick = async (binFileName: string) => { if (!('serial' in navigator)) return try { - await navigator.serial.requestPort() + // await navigator.serial.requestPort() window.ipcRenderer.send('BURN_PROGRAM', binFileName) diff --git a/src/render/views/index/router-view/course/ProgramBurnButtonListView/index.vue b/src/render/views/index/router-view/course/ProgramBurnButtonListView/index.vue index dd2b628..994a648 100644 --- a/src/render/views/index/router-view/course/ProgramBurnButtonListView/index.vue +++ b/src/render/views/index/router-view/course/ProgramBurnButtonListView/index.vue @@ -26,7 +26,7 @@ const onBurnProgramBtnClick = async (binFileName: string) => { if (!('serial' in navigator)) return try { - await navigator.serial.requestPort() + // await navigator.serial.requestPort() window.ipcRenderer.send('BURN_PROGRAM', binFileName) @@ -71,12 +71,9 @@ const onBurnProgramFeedback = ({ err }) => { onMounted(() => { if (!hasIpcRenderer()) return - window.ipcRenderer.receive('BURN_PROGRAM_FEEDBACK', onBurnProgramFeedback) -}) -onUnmounted(() => { - if (!hasIpcRenderer()) return - window.ipcRenderer.unreceive('BURN_PROGRAM_FEEDBACK') + + window.ipcRenderer.receive('BURN_PROGRAM_FEEDBACK', onBurnProgramFeedback) })