From 5dcee9cff1fee5afbed906c2e527cea2cdbd83e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Sat, 22 Mar 2025 15:36:37 +0800 Subject: [PATCH] =?UTF-8?q?Update(boards):=20=E6=9B=B4=E6=96=B0micropython?= =?UTF-8?q?=20esp=E6=9D=BF=E5=8D=A1config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards/default_src/micropython_educore/origin/config.json | 2 +- boards/default_src/micropython_esp32/origin/config.json | 2 +- boards/default_src/micropython_esp32c2/origin/config.json | 2 +- boards/default_src/micropython_esp32c3/origin/config.json | 2 +- boards/default_src/micropython_esp32s2/origin/config.json | 2 +- boards/default_src/micropython_esp32s3/origin/config.json | 2 +- boards/default_src/micropython_robot/origin/config.json | 2 +- common/modules/mixly-modules/electron/burn-upload.js | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/boards/default_src/micropython_educore/origin/config.json b/boards/default_src/micropython_educore/origin/config.json index 1e586b4c..896b07e3 100644 --- a/boards/default_src/micropython_educore/origin/config.json +++ b/boards/default_src/micropython_educore/origin/config.json @@ -27,7 +27,7 @@ "{indexPath}/../micropython/build/lib", "{indexPath}/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [] diff --git a/boards/default_src/micropython_esp32/origin/config.json b/boards/default_src/micropython_esp32/origin/config.json index 44f313d4..ae9e81ef 100644 --- a/boards/default_src/micropython_esp32/origin/config.json +++ b/boards/default_src/micropython_esp32/origin/config.json @@ -29,7 +29,7 @@ "{indexPath}/build/lib", "{indexPath}/../micropython/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [] diff --git a/boards/default_src/micropython_esp32c2/origin/config.json b/boards/default_src/micropython_esp32c2/origin/config.json index 2b906beb..c7ba95a0 100644 --- a/boards/default_src/micropython_esp32c2/origin/config.json +++ b/boards/default_src/micropython_esp32c2/origin/config.json @@ -31,7 +31,7 @@ "{indexPath}/../micropython/build/lib", "{indexPath}/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [] diff --git a/boards/default_src/micropython_esp32c3/origin/config.json b/boards/default_src/micropython_esp32c3/origin/config.json index 41b35d03..31c7cc1c 100644 --- a/boards/default_src/micropython_esp32c3/origin/config.json +++ b/boards/default_src/micropython_esp32c3/origin/config.json @@ -29,7 +29,7 @@ "{indexPath}/build/lib", "{indexPath}/../micropython/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [] diff --git a/boards/default_src/micropython_esp32s2/origin/config.json b/boards/default_src/micropython_esp32s2/origin/config.json index f6eedc08..c13485e7 100644 --- a/boards/default_src/micropython_esp32s2/origin/config.json +++ b/boards/default_src/micropython_esp32s2/origin/config.json @@ -41,7 +41,7 @@ "{indexPath}/build/lib", "{indexPath}/../micropython/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [] diff --git a/boards/default_src/micropython_esp32s3/origin/config.json b/boards/default_src/micropython_esp32s3/origin/config.json index 1748408c..fc8a0307 100644 --- a/boards/default_src/micropython_esp32s3/origin/config.json +++ b/boards/default_src/micropython_esp32s3/origin/config.json @@ -24,7 +24,7 @@ "{indexPath}/build/lib", "{indexPath}/../micropython/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [] diff --git a/boards/default_src/micropython_robot/origin/config.json b/boards/default_src/micropython_robot/origin/config.json index 4770eb33..e86ff85b 100644 --- a/boards/default_src/micropython_robot/origin/config.json +++ b/boards/default_src/micropython_robot/origin/config.json @@ -25,7 +25,7 @@ "{indexPath}/build/lib", "{indexPath}/../micropython/build/lib" ], - "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload/main.py\"", + "command": "\"{ampy}\" -p {com} -d 1 -r \"{reset}\" put \"{indexPath}/build/upload\"", "filePath": "{indexPath}/build/upload/main.py", "copyLib": false, "reset": [], diff --git a/common/modules/mixly-modules/electron/burn-upload.js b/common/modules/mixly-modules/electron/burn-upload.js index c30719be..f8b7539f 100644 --- a/common/modules/mixly-modules/electron/burn-upload.js +++ b/common/modules/mixly-modules/electron/burn-upload.js @@ -523,6 +523,8 @@ BU.uploadByCmd = async function (layerNum, port, command) { const code = editor.getCode(); if (upload.copyLib) { BU.copyLib(upload.filePath, code); + } else { + BU.copyLib(upload.filePath, ''); } fs_extra.outputFile(upload.filePath, code) .then(() => {