diff --git a/firmware/clean_compile_two_versions.bat b/firmware/clean_compile_two_versions.bat index a052879e39..c039878047 100644 --- a/firmware/clean_compile_two_versions.bat +++ b/firmware/clean_compile_two_versions.bat @@ -2,19 +2,6 @@ rd /s /q deliver mkdir deliver -call clean.bat -echo "TIMESTAMP %date% %time%" -make -j4 -cp build\rusefi.elf deliver\rusefi_debug.elf -cp build\rusefi.bin deliver\rusefi_debug.bin -cp build\rusefi.hex deliver\rusefi_debug.hex -echo Debug compilation results 1/2 -echo "TIMESTAMP %date% %time%" -ls -l build -if not exist deliver/rusefi_debug.hex echo FAILED to compile DEBUG -if not exist deliver/rusefi_debug.hex exit -1 - - call clean.bat echo "TIMESTAMP %date% %time%" make -j4 DEBUG_LEVEL_OPT='-O2' EXTRA_PARAMS='-DEFI_ENABLE_ASSERTS=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' @@ -22,8 +9,20 @@ make -j4 DEBUG_LEVEL_OPT='-O2' EXTRA_PARAMS='-DEFI_ENABLE_ASSERTS=FALSE -DCH_DB cp build\rusefi.elf deliver\rusefi_release.elf cp build\rusefi.bin deliver\rusefi_release.bin cp build\rusefi.hex deliver\rusefi_release.hex -echo Release compilation results 2/2 +echo Release compilation results 1/2 echo "TIMESTAMP %date% %time%" ls -l build if not exist deliver/rusefi_release.hex echo FAILED to compile RELEASE if not exist deliver/rusefi_release.hex exit -1 + +call clean.bat +echo "TIMESTAMP %date% %time%" +make -j4 +cp build\rusefi.elf deliver\rusefi_debug.elf +cp build\rusefi.bin deliver\rusefi_debug.bin +cp build\rusefi.hex deliver\rusefi_debug.hex +echo Debug compilation results 2/2 +echo "TIMESTAMP %date% %time%" +ls -l build +if not exist deliver/rusefi_debug.hex echo FAILED to compile DEBUG +if not exist deliver/rusefi_debug.hex exit -1 diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index 9c95f7d983..c3eaf5670a 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -132,7 +132,7 @@ #endif #ifndef BOARD_TLE8888_COUNT -#define BOARD_TLE8888_COUNT 0 +#define BOARD_TLE8888_COUNT 1 #endif // todo: move this outside of efifeatures.h diff --git a/misc/jenkins/functional_test_and_build_bundle/run.bat b/misc/jenkins/functional_test_and_build_bundle/run.bat index 3bf7ef3f16..f732acc622 100644 --- a/misc/jenkins/functional_test_and_build_bundle/run.bat +++ b/misc/jenkins/functional_test_and_build_bundle/run.bat @@ -9,6 +9,8 @@ rem IF NOT ERRORLEVEL 0 echo simulator test ERROR DETECTED rem IF NOT ERRORLEVEL 0 EXIT /B 1 +rem Here we use last version of firmware produced by 'clean_compile_two_versions.bat' + call misc/jenkins/functional_test_and_build_bundle/hw_test.bat IF NOT ERRORLEVEL 0 echo real hardware test ERROR DETECTED IF NOT ERRORLEVEL 0 EXIT /B 1