From 1586ccf04abb71e4bd143860749fcea6f17bf8a8 Mon Sep 17 00:00:00 2001 From: BG4RFF Date: Thu, 18 Aug 2022 01:46:08 +0000 Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=80=E9=94=AE=E6=9B=B4=E6=96=B0.b?= =?UTF-8?q?at.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BG4RFF --- ...0\351\224\256\346\233\264\346\226\260.bat" | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git "a/\344\270\200\351\224\256\346\233\264\346\226\260.bat" "b/\344\270\200\351\224\256\346\233\264\346\226\260.bat" index e0546c2d..c0dbef55 100644 --- "a/\344\270\200\351\224\256\346\233\264\346\226\260.bat" +++ "b/\344\270\200\351\224\256\346\233\264\346\226\260.bat" @@ -1,6 +1,6 @@ @echo off -set "a=%~dp0" +set a="%~dp0" rem echo %a% set a=%a:\=\\% rem echo %a% @@ -11,14 +11,14 @@ wmic process where 'executablepath=%b%' call Terminate > nul "%~dp0\Git\cmd\git" config --global --add safe.directory "%~dp0" "%~dp0\Git\cmd\git" config --system core.longpaths true -rem ɾ.git_win_stm32ļ +rem 删除.git_win_stm32文件夹 if exist "%~dp0\.git_win_stm32" ( attrib -h "%~dp0\.git_win_stm32" del /f /s /q "%~dp0\.git_win_stm32" > nul rd /q /s "%~dp0\.git_win_stm32" > nul ) -rem жϵǰĿ¼Ƿ.gitĿ¼Ƚ.gitĿ¼ֻȥ +rem 判断当前目录下是否有.git目录，如果有则首先将.git目录只读属性去除，并将其重命名 if exist "%~dp0"\.git ( attrib -h "%~dp0\.git" attrib -h "%~dp0\.git_mixly" @@ -47,7 +47,7 @@ if exist "%~dp0"\.git ( ) ) -rem ɾ.gitĿ¼index.lock +rem 删除.git目录下index.lock IF EXIST "%~dp0\.git_mixly\index.lock" ( del /f /s /q "%~dp0\.git_mixly\index.lock" > nul rd /q /s "%~dp0\.git_mixly\index.lock" > nul @@ -68,65 +68,65 @@ IF EXIST "%~dp0\.git_win_esp32\index.lock" ( rd /q /s "%~dp0\.git_win_esp32\index.lock" > nul ) -echo ǰ·Ϊ"%~dp0" +echo 当前路径为"%~dp0" @echo off -title Mixly2.0 װ^& +title Mixly2.0 安装^&升级助手 @echo off echo. -echo ***************************Mixly2.0 װ^&**************************** -echo лѡʹMixly2.0ǵһʹñϸĶ˵ +echo ***************************Mixly2.0 安装^&升级助手**************************** +echo 感谢您选择使用Mixly2.0软件，如果您是第一次使用本软件，请仔细阅读本说明。 echo. echo. -echo ĿǰMixly2.0ֶ֧ԶӲı̣Ϊ֧ӲҪռӲ̽ϴĿռ䣬ѡֻװҪõIJֹܼɡ +echo 目前Mixly2.0软件支持对多种硬件的编程，因为支持所有硬件编程需要占用您硬盘较大的空间，您可以选择只安装您需要用到的部分功能即可。 echo. -echo Mixly2.0ֵ֧Ӳ˵£ -echo MicroPython/CircuitPython ESP32ϵп(MicroPython[ESP32_MixGo]CircuitPython[ESP32S2_MixGoCE])ΪĬ֧֣ѡ -echo Python(Python,Ӳ֧ͼλʹ뻥ת)ΪĬ֧֣ѡ -echo Arduino AVRϵп壨Arduino UNO,Nano,Mega 2560,Pro Mini ȣ -echo Arduino ESP8266ϵп壨WeMos D1,NodeMCU ȣ -echo Arduino ESP32ϵп壨MixGo,ͨESP32ȣ +echo Mixly2.0软件支持的硬件，具体说明如下： +echo ·MicroPython/CircuitPython ESP32系列开发板(MicroPython[ESP32_MixGo]、CircuitPython[ESP32S2_MixGoCE]等)为默认支持，无需选择。 +echo ·Python(纯Python,无需硬件，支持图形化和代码互相转换)为默认支持，无需选择。 +echo ·Arduino AVR系列开发板（包括Arduino UNO,Nano,Mega 2560,Pro Mini 等） +echo ·Arduino ESP8266系列开发板（包括WeMos D1,NodeMCU 等） +echo ·Arduino ESP32系列开发板（包括MixGo,普通ESP32开发板等） echo. echo. -echo װ^&ʼѡװֹܣyʾװùܣnʾװùܡ +echo 安装^&升级即将开始，您可以选择安装部分功能，输入y表示安装该功能，输入n表示不安装该功能。 @echo off -rem ѯûǷװArduino ESP8266 +rem 询问用户是否安装Arduino ESP8266 echo. set esp8266_select= -set /p esp8266_select=װ Arduino ESP8266(y/n): +set /p esp8266_select=安装 Arduino ESP8266(y/n): IF "%esp8266_select%"=="n" ( echo No ) ELSE ( echo Yes ) -rem ѯûǷװArduino ESP32 +rem 询问用户是否安装Arduino ESP32 echo. set esp32_select= -set /p esp32_select=װ Arduino ESP32(y/n): +set /p esp32_select=安装 Arduino ESP32(y/n): IF "%esp32_select%"=="n" ( echo No ) ELSE ( echo Yes ) -rem ѯûºǷMixly +rem 询问用户更新后是否启动Mixly echo. set start_mixly= -set /p start_mixly=½ Mixly2.0(y/n): +set /p start_mixly=更新结束后启动 Mixly2.0(y/n): IF "%start_mixly%"=="y" ( echo Yes ) ELSE ( echo No ) -rem Mixly2.0 +rem 更新Mixly2.0 attrib -h "%~dp0\.git_mixly" ren "%~dp0\.git_mixly\" .git @echo on -echo Mixly2.0 Уȴ... +echo Mixly2.0 正在升级中，请等待... @echo off cd "%~dp0\Git\cmd\" git fetch --all @@ -141,7 +141,7 @@ git gc git prune git clean -f .git/index.lock @echo on -echo Mixly2.0 +echo Mixly2.0更新完成 @echo off ren "%~dp0\.git\" .git_mixly @@ -150,12 +150,12 @@ attrib +h "%~dp0\.git_mixly" echo. echo. -rem Arduino AVR +rem 更新Arduino AVR 包 attrib -h "%~dp0\.git_win_avr" ren "%~dp0\.git_win_avr\" .git @echo on -echo Arduino AVR Уȴ... +echo Arduino AVR 包正在升级中，请等待... @echo off cd "%~dp0\Git\cmd\" git fetch --all @@ -168,7 +168,7 @@ git gc git prune git clean -f .git/index.lock @echo on -echo Arduino AVR +echo Arduino AVR 包更新完成 @echo off ren "%~dp0\.git\" .git_win_avr @@ -179,7 +179,7 @@ echo. IF not exist "%~dp0\.git_arduino_libs" ( @echo on - echo ¡ Arduino Libs Уȴ... + echo 克隆 Arduino Libs 包中，请等待... @echo off IF EXIST "%~dp0\arduino-cli\libraries" ( del /f /s /q "%~dp0\arduino-cli\libraries" > nul @@ -202,19 +202,19 @@ IF not exist "%~dp0\.git_arduino_libs" ( rd /q /s "%~dp0\gitDir" > nul ) @echo on - echo Arduino Libs ¡ + echo Arduino Libs 克隆完成 @echo off echo. echo. ) IF EXIST "%~dp0\.git_arduino_libs" ( - rem Arduino-libs + rem 更新Arduino-libs attrib -h "%~dp0\.git_arduino_libs" ren "%~dp0\.git_arduino_libs\" .git @echo on - echo Arduino Libs Уȴ... + echo Arduino Libs 包正在升级中，请等待... @echo off cd "%~dp0\Git\cmd\" git fetch --all @@ -227,7 +227,7 @@ IF EXIST "%~dp0\.git_arduino_libs" ( git prune git clean -f .git/index.lock @echo on - echo Arduino Libs + echo Arduino Libs 包更新完成 @echo off ren "%~dp0\.git\" .git_arduino_libs @@ -238,23 +238,23 @@ IF EXIST "%~dp0\.git_arduino_libs" ( ) IF "%esp8266_select%"=="n" ( - rem ɾArduino ESP8266 + rem 删除Arduino ESP8266包 IF EXIST "%~dp0\arduino-cli\Arduino15\packages\esp8266" ( del /f /s /q "%~dp0\arduino-cli\Arduino15\packages\esp8266" > nul rd /q /s "%~dp0\arduino-cli\Arduino15\packages\esp8266" > nul ) - rem ɾArduino ESP8266忨ҳ + rem 删除Arduino ESP8266板卡页面 IF EXIST "%~dp0\resources\app\board\arduino_esp8266" ( del /f /s /q "%~dp0\resources\app\board\arduino_esp8266" > nul rd /q /s "%~dp0\resources\app\board\arduino_esp8266" > nul ) attrib -h "%~dp0\.git_win_esp8266" - rem ɾArduino ESP8266 .git\objects + rem 删除Arduino ESP8266 .git\objects IF EXIST "%~dp0\.git_win_esp8266\objects" ( del /f /s /q "%~dp0\.git_win_esp8266\objects" > nul rd /q /s "%~dp0\.git_win_esp8266\objects" > nul ) - rem ɾArduino ESP8266 .git\refs + rem 删除Arduino ESP8266 .git\refs IF EXIST "%~dp0\.git_win_esp8266\refs" ( del /f /s /q "%~dp0\.git_win_esp8266\refs" > nul rd /q /s "%~dp0\.git_win_esp8266\refs" > nul @@ -276,12 +276,12 @@ IF "%esp8266_select%"=="n" ( ) attrib +h "%~dp0\.git_win_esp8266" ) ELSE ( - rem Arduino ESP8266 + rem 更新Arduino ESP8266 包 attrib -h "%~dp0\.git_win_esp8266" ren "%~dp0\.git_win_esp8266\" .git @echo on - echo Arduino ESP8266 Уȴ... + echo Arduino ESP8266 包正在升级中，请等待... @echo off cd "%~dp0\Git\cmd\" git fetch --all @@ -294,7 +294,7 @@ IF "%esp8266_select%"=="n" ( git prune git clean -f .git/index.lock @echo on - echo Arduino ESP8266 + echo Arduino ESP8266 包更新完成 @echo off ren "%~dp0\.git\" .git_win_esp8266 @@ -305,38 +305,38 @@ IF "%esp8266_select%"=="n" ( ) IF "%esp32_select%"=="n" ( - rem ɾArduino ESP32 + rem 删除Arduino ESP32包 IF EXIST "%~dp0\arduino-cli\Arduino15\packages\esp32" ( del /f /s /q "%~dp0\arduino-cli\Arduino15\packages\esp32" > nul rd /q /s "%~dp0\arduino-cli\Arduino15\packages\esp32" > nul ) - rem ɾArduino ESP32忨ҳ + rem 删除Arduino ESP32板卡页面 IF EXIST "%~dp0\resources\app\board\arduino_esp32" ( del /f /s /q "%~dp0\resources\app\board\arduino_esp32" > nul rd /q /s "%~dp0\resources\app\board\arduino_esp32" > nul ) - rem ɾArduino ESP32C3忨ҳ + rem 删除Arduino ESP32C3板卡页面 IF EXIST "%~dp0\resources\app\board\arduino_esp32c3" ( del /f /s /q "%~dp0\resources\app\board\arduino_esp32c3" > nul rd /q /s "%~dp0\resources\app\board\arduino_esp32c3" > nul ) - rem ɾArduino ESP32S2忨ҳ + rem 删除Arduino ESP32S2板卡页面 IF EXIST "%~dp0\resources\app\board\arduino_esp32s2" ( del /f /s /q "%~dp0\resources\app\board\arduino_esp32s2" > nul rd /q /s "%~dp0\resources\app\board\arduino_esp32s2" > nul ) - rem ɾArduino ESP32S3忨ҳ + rem 删除Arduino ESP32S3板卡页面 IF EXIST "%~dp0\resources\app\board\arduino_esp32s3" ( del /f /s /q "%~dp0\resources\app\board\arduino_esp32s3" > nul rd /q /s "%~dp0\resources\app\board\arduino_esp32s3" > nul ) attrib -h "%~dp0\.git_win_esp32" - rem ɾArduino ESP32 .git\objects + rem 删除Arduino ESP32 .git\objects IF EXIST "%~dp0\.git_win_esp32\objects" ( del /f /s /q "%~dp0\.git_win_esp32\objects" > nul rd /q /s "%~dp0\.git_win_esp32\objects" > nul ) - rem ɾArduino ESP32 .git\refs + rem 删除Arduino ESP32 .git\refs IF EXIST "%~dp0\.git_win_esp32\refs" ( del /f /s /q "%~dp0\.git_win_esp32\refs" > nul rd /q /s "%~dp0\.git_win_esp32\refs" > nul @@ -358,12 +358,12 @@ IF "%esp32_select%"=="n" ( ) attrib +h "%~dp0\.git_win_esp32" ) ELSE ( - rem Arduino ESP32 + rem 更新Arduino ESP32 包 attrib -h "%~dp0\.git_win_esp32" ren "%~dp0\.git_win_esp32\" .git @echo on - echo Arduino ESP32 Уȴ... + echo Arduino ESP32 包正在升级中，请等待... @echo off cd "%~dp0\Git\cmd\" git fetch --all @@ -376,7 +376,7 @@ IF "%esp32_select%"=="n" ( git prune git clean -f .git/index.lock @echo on - echo Arduino ESP32 + echo Arduino ESP32 包更新完成 @echo off ren "%~dp0\.git\" .git_win_esp32 @@ -387,7 +387,7 @@ IF "%esp32_select%"=="n" ( ) @echo on -echo Mixly2.0 Arduino ɣEnjoy it! +echo Mixly2.0 和 Arduino 包更新完成，Enjoy it! @echo off pause -- Gitee