From 30be91115513f6ff4ccae512f67ca21b09b06768 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 8 Jun 2019 22:05:52 -0400 Subject: [PATCH] nicer bundle folder structure and reducing unneeded content #833 --- firmware/config/boards/STM32F407VET6_Black.bat | 6 ++---- firmware/config/boards/STM32F407VET6_Mini.bat | 6 ++---- firmware/config/boards/common_make.bat | 1 + firmware/config/boards/me7_pnp/!compile-me7_pnp.bat | 5 +---- firmware/flash_dfu.bat | 1 - .../build_current_bundle.bat | 5 +++-- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/firmware/config/boards/STM32F407VET6_Black.bat b/firmware/config/boards/STM32F407VET6_Black.bat index cade5c995f..0ec2b7855b 100644 --- a/firmware/config/boards/STM32F407VET6_Black.bat +++ b/firmware/config/boards/STM32F407VET6_Black.bat @@ -5,7 +5,5 @@ rem TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why? rem https://github.com/rusefi/rusefi/issues/684 set EXTRA_PARAMS="-DDUMMY -DEFI_COMMUNICATION_PIN=GPIOA_7 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS" make -j8 clean -make -j8 -rm -f build/rusefi.dfu -dir build -..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu + +call config/boards/common_make.bat \ No newline at end of file diff --git a/firmware/config/boards/STM32F407VET6_Mini.bat b/firmware/config/boards/STM32F407VET6_Mini.bat index b94ebaa637..53f20a7993 100644 --- a/firmware/config/boards/STM32F407VET6_Mini.bat +++ b/firmware/config/boards/STM32F407VET6_Mini.bat @@ -12,7 +12,5 @@ set EXTRA_PARAMS=-DDUMMY -DEFI_COMMUNICATION_PIN=GPIOB_9 -DSTM32_HSECLK=25000000 -DFLASH_ADDR=0x08075000 make -j8 clean -make -j8 -rem rm -f build/rusefi.dfu -rem dir build -rem ..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu + +call config/boards/common_make.bat diff --git a/firmware/config/boards/common_make.bat b/firmware/config/boards/common_make.bat index f1c837c6b2..fe7194213e 100644 --- a/firmware/config/boards/common_make.bat +++ b/firmware/config/boards/common_make.bat @@ -7,5 +7,6 @@ make -j4 -r if not exist build/rusefi.hex echo FAILED to compile by %script_name% if not exist build/rusefi.hex exit -1 +rm -f build/rusefi.dfu echo %script_name%: invoking hex2dfu.exe ..\misc\encedo_hex2dfu\hex2dfu.exe -i build/rusefi.hex -o build/rusefi.dfu \ No newline at end of file diff --git a/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat b/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat index 03eb677c58..c58b5302b1 100644 --- a/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat +++ b/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat @@ -10,10 +10,7 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ -DEFI_USE_OSC=TRUE ^ -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE set DEBUG_LEVEL_OPT="-O2" -make -j4 -if not exist build/rusefi.hex echo FAILED to compile ME7_PNP -if not exist build/rusefi.hex exit -1 -..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu +call config/boards/common_make.bat call config/boards/clean_env_variables.bat \ No newline at end of file diff --git a/firmware/flash_dfu.bat b/firmware/flash_dfu.bat index b0a3505747..fa12fe22db 100644 --- a/firmware/flash_dfu.bat +++ b/firmware/flash_dfu.bat @@ -2,7 +2,6 @@ rem on linux that would be rem dfu-util -a 0 -D rusefi_no_asserts.dfu -R -rem ..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu DfuSeCommand.exe -c -d --fn build/rusefi.dfu rem to read from comtroller use diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat index 393aaa37c8..5b502bdb76 100644 --- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat +++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat @@ -50,8 +50,9 @@ if not exist deliver/rusefi_no_asserts.hex exit -1 if not exist deliver/rusefi.hex echo Just to confirm - FAILED to compile default DEBUG if not exist deliver/rusefi.hex exit -1 -..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi_no_asserts.hex -out deliver/rusefi_no_asserts.dfu -..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi.hex -out deliver/rusefi.dfu + +..\misc\encedo_hex2dfu\hex2dfu.exe -i deliver/rusefi_no_asserts.hex -o deliver/rusefi_no_asserts.dfu +..\misc\encedo_hex2dfu\hex2dfu.exe -i deliver/rusefi.hex -o deliver/rusefi.dfu cd .. call misc\jenkins\build_java_console.bat