nicer bundle folder structure and reducing unneeded content #833

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

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

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

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

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

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