diff --git a/BootLoaders/Boards/avr/tools/win/do_version.bat b/BootLoaders/Boards/avr/tools/win/do_version.bat index 4cda254..0166427 100644 --- a/BootLoaders/Boards/avr/tools/win/do_version.bat +++ b/BootLoaders/Boards/avr/tools/win/do_version.bat @@ -1,13 +1,22 @@ @ECHO OFF SETLOCAL EnableDelayedExpansion +REM SET DEBUG=1 + SET BUILD_PATH=%1 SET PROJECT_NAME=%2 SET SKETCH_PATH=%3 SET MULTI_BOARD=%4 SET EXPORT_FLAG=%5 -REM ECHO Multi board: %MULTI_BOARD% +REM Remove double-quotes from the paths +SET BUILD_PATH=%BUILD_PATH:"=% +SET SKETCH_PATH=%SKETCH_PATH:"=% + +IF DEFINED DEBUG ( + ECHO Sketch Path: %SKETCH_PATH% + ECHO Multi board: %MULTI_BOARD% +) SET MULTI_TYPE=avr @@ -22,33 +31,37 @@ IF EXIST "%1\sketch\Multiprotocol.h" ( SET MULTI_VER= ) -REM ECHO Multi-MODULE firmware version: %MULTI_VER% +IF DEFINED DEBUG ECHO Multi-MODULE firmware version: %MULTI_VER% REM Copy the compiled file to the sketch folder with the version number in the file name IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.hex" ( - REM ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y >NUL ) IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.bin" ( - REM ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y >NUL ) IF "%EXPORT_FLAG%"=="EXPORT" ( REM Copy the compiled file to the sketch folder with the version number in the file name IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.hex" ( + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y >NUL ) IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.bin" ( + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y >NUL ) IF EXIST "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" ( + IF DEFINED DEBUG ECHO DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" >NUL ) IF EXIST "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" ( + IF DEFINED DEBUG ECHO DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" >NUL ) ) diff --git a/BootLoaders/Boards/orangerx/tools/win/do_version.bat b/BootLoaders/Boards/orangerx/tools/win/do_version.bat index af69adf..3da9306 100644 --- a/BootLoaders/Boards/orangerx/tools/win/do_version.bat +++ b/BootLoaders/Boards/orangerx/tools/win/do_version.bat @@ -1,13 +1,22 @@ @ECHO OFF SETLOCAL EnableDelayedExpansion +REM SET DEBUG=1 + SET BUILD_PATH=%1 SET PROJECT_NAME=%2 SET SKETCH_PATH=%3 SET MULTI_BOARD=%4 SET EXPORT_FLAG=%5 -REM ECHO Multi board: %MULTI_BOARD% +REM Remove double-quotes from the paths +SET BUILD_PATH=%BUILD_PATH:"=% +SET SKETCH_PATH=%SKETCH_PATH:"=% + +IF DEFINED DEBUG ( + ECHO Sketch Path: %SKETCH_PATH% + ECHO Multi board: %MULTI_BOARD% +) SET MULTI_TYPE=orx @@ -22,33 +31,37 @@ IF EXIST "%1\sketch\Multiprotocol.h" ( SET MULTI_VER= ) -REM ECHO Multi-MODULE firmware version: %MULTI_VER% +IF DEFINED DEBUG ECHO Multi-MODULE firmware version: %MULTI_VER% REM Copy the compiled file to the sketch folder with the version number in the file name IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.hex" ( - REM ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y >NUL ) IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.bin" ( - REM ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y >NUL ) IF "%EXPORT_FLAG%"=="EXPORT" ( REM Copy the compiled file to the sketch folder with the version number in the file name IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.hex" ( + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y >NUL ) IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.bin" ( + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y >NUL ) IF EXIST "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" ( + IF DEFINED DEBUG ECHO DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" >NUL ) IF EXIST "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" ( + IF DEFINED DEBUG ECHO DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" >NUL ) ) diff --git a/BootLoaders/Boards/stm32/tools/win/do_version.bat b/BootLoaders/Boards/stm32/tools/win/do_version.bat index cf6b92f..958ba17 100644 --- a/BootLoaders/Boards/stm32/tools/win/do_version.bat +++ b/BootLoaders/Boards/stm32/tools/win/do_version.bat @@ -1,13 +1,22 @@ @ECHO OFF SETLOCAL EnableDelayedExpansion +REM SET DEBUG=1 + SET BUILD_PATH=%1 SET PROJECT_NAME=%2 SET SKETCH_PATH=%3 SET MULTI_BOARD=%4 SET EXPORT_FLAG=%5 -REM ECHO Multi board: %MULTI_BOARD% +REM Remove double-quotes from the paths +SET BUILD_PATH=%BUILD_PATH:"=% +SET SKETCH_PATH=%SKETCH_PATH:"=% + +IF DEFINED DEBUG ( + ECHO Sketch Path: %SKETCH_PATH% + ECHO Multi board: %MULTI_BOARD% +) SET MULTI_TYPE=stm @@ -22,33 +31,37 @@ IF EXIST "%1\sketch\Multiprotocol.h" ( SET MULTI_VER= ) -REM ECHO Multi-MODULE firmware version: %MULTI_VER% +IF DEFINED DEBUG ECHO Multi-MODULE firmware version: %MULTI_VER% REM Copy the compiled file to the sketch folder with the version number in the file name IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.hex" ( - REM ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y >NUL ) IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.bin" ( - REM ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%BUILD_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y >NUL ) IF "%EXPORT_FLAG%"=="EXPORT" ( REM Copy the compiled file to the sketch folder with the version number in the file name IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.hex" ( + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.hex" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.hex" /Y >NUL ) IF EXIST "%BUILD_PATH%\%PROJECT_NAME%.bin" ( + IF DEFINED DEBUG ECHO COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y COPY "%BUILD_PATH%\%PROJECT_NAME%.bin" "%SKETCH_PATH%\multi-%MULTI_TYPE%-%MULTI_VER%.bin" /Y >NUL ) IF EXIST "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" ( + IF DEFINED DEBUG ECHO DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.bin" >NUL ) IF EXIST "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" ( + IF DEFINED DEBUG ECHO DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" DEL "%SKETCH_PATH%\multi-%MULTI_TYPE%.hex" >NUL ) ) diff --git a/BootLoaders/package_multi_4in1_avr_board_v1.0.1.tar.gz b/BootLoaders/package_multi_4in1_avr_board_v1.0.1.tar.gz index 956b360..6f3cf3f 100644 Binary files a/BootLoaders/package_multi_4in1_avr_board_v1.0.1.tar.gz and b/BootLoaders/package_multi_4in1_avr_board_v1.0.1.tar.gz differ diff --git a/BootLoaders/package_multi_4in1_board_index.json b/BootLoaders/package_multi_4in1_board_index.json index 710f260..09ed681 100644 --- a/BootLoaders/package_multi_4in1_board_index.json +++ b/BootLoaders/package_multi_4in1_board_index.json @@ -34,8 +34,8 @@ }, "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_avr_board_v1.0.1.tar.gz", "archiveFileName": "package_multi_4in1_avr_board_v1.0.1.tar.gz", - "checksum": "SHA-256:504A5C1ABFB366917FC35A3744CC21FA30D572AAA70007D2BC69277BC1D0E2C4", - "size": "3102", + "checksum": "SHA-256:9bb29828476c141f5ef877e66b80ca969021d648acaf1ac5248676beb9ee3003", + "size": "3201", "boards": [{ "name": "Multi 4-in-1 (Atmega328p, 3.3V, 16MHz)" }], @@ -72,8 +72,8 @@ }, "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_stm32_board_v1.0.1.tar.gz", "archiveFileName": "package_multi_4in1_stm32_board_v1.0.1.tar.gz", - "checksum": "SHA-256:9CC271776146A6CEC8CFB5B8DAB4DB7270C6589B43BA5759D65984AB2D89EA96", - "size": "10336733", + "checksum": "SHA-256:b522b5d3474308768c197a6897cad037fb54d6fac26c75678415a0908793bae3", + "size": "10332106", "boards": [{ "name": "Multi 4-in-1 (STM32F103C)" }], @@ -93,8 +93,8 @@ }, "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_orangerx_board_v1.0.1.tar.gz", "archiveFileName": "package_multi_4in1_orangerx_board_v1.0.1.tar.gz", - "checksum": "SHA-256:03D095CB9F79C881375B35C8F9671306224C03CE2F02117806E55903C77FF2D5", - "size": "162457", + "checksum": "SHA-256:7287ce61028b754bb8ff947317dd15773fc7eeecd752826c707fa356b9b36dc6", + "size": "161615", "boards": [{ "name": "Multi 4-in-1 (OrangeRX)" }], diff --git a/BootLoaders/package_multi_4in1_orangerx_board_v1.0.1.tar.gz b/BootLoaders/package_multi_4in1_orangerx_board_v1.0.1.tar.gz index 44ed07f..fb21e6e 100644 Binary files a/BootLoaders/package_multi_4in1_orangerx_board_v1.0.1.tar.gz and b/BootLoaders/package_multi_4in1_orangerx_board_v1.0.1.tar.gz differ diff --git a/BootLoaders/package_multi_4in1_stm32_board_v1.0.1.tar.gz b/BootLoaders/package_multi_4in1_stm32_board_v1.0.1.tar.gz index 0b507df..177d770 100644 Binary files a/BootLoaders/package_multi_4in1_stm32_board_v1.0.1.tar.gz and b/BootLoaders/package_multi_4in1_stm32_board_v1.0.1.tar.gz differ