diff --git a/firmware/clean_compile_two_versions.sh b/firmware/clean_compile_two_versions.sh index 5ec9b4dcf8..85df87f930 100644 --- a/firmware/clean_compile_two_versions.sh +++ b/firmware/clean_compile_two_versions.sh @@ -6,21 +6,21 @@ arm-none-eabi-gcc -v rm -rf deliver mkdir deliver -sh clean.sh -echo "TIMESTAMP $(date "+%D %T.%2N")" +#sh clean.sh +#echo "TIMESTAMP $(date "+%D %T.%2N")" -EXTRA_PARAMS="-DDUMMY -DFIRMWARE_ID=\\\"default_no_assert\\\" -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" -make -j4 DEBUG_LEVEL_OPT='-O2' -EXTRA_PARAMS="" +#EXTRA_PARAMS="-DDUMMY -DFIRMWARE_ID=\\\"default_no_assert\\\" -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" +#make -j4 DEBUG_LEVEL_OPT='-O2' +#EXTRA_PARAMS="" # mv build/rusefi.elf deliver/rusefi_no_asserts.elf -mv build/rusefi.bin deliver/rusefi_no_asserts.bin +#mv build/rusefi.bin deliver/rusefi_no_asserts.bin # this file is needed for DFU generation -mv build/rusefi.hex deliver/rusefi_no_asserts.hex -echo "Release compilation results 1/2" -echo "TIMESTAMP $(date "+%D %T.%2N")" -ls -l build -[ -e deliver/rusefi_no_asserts.hex ] || { echo "FAILED to compile NO ASSERTS version"; exit 1; } +#mv build/rusefi.hex deliver/rusefi_no_asserts.hex +#echo "Release compilation results 1/2" +#echo "TIMESTAMP $(date "+%D %T.%2N")" +#ls -l build +#[ -e deliver/rusefi_no_asserts.hex ] || { echo "FAILED to compile NO ASSERTS version"; exit 1; } sh clean.sh echo "TIMESTAMP $(date "+%D %T.%2N")" diff --git a/firmware/controllers/date_stamp.h b/firmware/controllers/date_stamp.h index 1c857bba6c..ef19937086 100644 --- a/firmware/controllers/date_stamp.h +++ b/firmware/controllers/date_stamp.h @@ -1,2 +1,2 @@ #pragma once -#define VCS_DATE 20200706 +#define VCS_DATE 20200707 diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh index 3d054e295e..1da8ea73f8 100644 --- a/misc/jenkins/build_working_folder.sh +++ b/misc/jenkins/build_working_folder.sh @@ -64,10 +64,10 @@ RUSEFI_CONSOLE_SETTINGS="" cp -r misc/install/openocd $CONSOLE_FOLDER cp -r misc/install/DfuSe $CONSOLE_FOLDER # 407 has additional version of firmware -cp firmware/deliver/rusefi_no_asserts.bin $FOLDER -cp firmware/deliver/rusefi_no_asserts.dfu $FOLDER +#cp firmware/deliver/rusefi_no_asserts.bin $FOLDER +#cp firmware/deliver/rusefi_no_asserts.dfu $FOLDER # just for now - DFU work in progress -cp firmware/deliver/rusefi_no_asserts.hex $FOLDER +#cp firmware/deliver/rusefi_no_asserts.hex $FOLDER cp firmware/deliver/rusefi.bin $FOLDER # probably not needed cp firmware/build/rusefi.elf $FOLDER @@ -75,7 +75,7 @@ cp firmware/deliver/rusefi.dfu $FOLDER # just for now - DFU work in progress cp firmware/deliver/rusefi.hex $FOLDER -if [ -n $BUNDLE_NAME ]; then +if [ -n "$BUNDLE_NAME" ]; then mv $FOLDER/rusefi.dfu $FOLDER/rusefi_$BUNDLE_NAME.dfu fi diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh index 8bcc1ec68b..78d70923c5 100644 --- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh +++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh @@ -10,6 +10,8 @@ echo "$SCRIPT_NAME Entering ROOT_FOLDER=$ROOT_FOLDER" echo "$SCRIPT_NAME.sh: Hello rusEfi build full bundle" date "+%a %D %T.%2S" +export BUNDLE_NAME="default" + cd firmware/bootloader sh clean_bootloader.sh sh compile_bootloader_discovery407.sh @@ -32,18 +34,18 @@ sh clean.sh sh update_version.sh sh clean_compile_two_versions.sh -[ -e deliver/rusefi_no_asserts.hex ] || { echo "Just to confirm - FAILED to compile no_asserts"; exit 1; } +#[ -e deliver/rusefi_no_asserts.hex ] || { echo "Just to confirm - FAILED to compile no_asserts"; exit 1; } [ -e deliver/rusefi.hex ] || { echo "Just to confirm - FAILED to compile default DEBUG"; exit 1; } echo "$SCRIPT_NAME: Building DFU" if uname | grep "NT"; then chmod u+x ../misc/encedo_hex2dfu/hex2dfu.exe - ../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_no_asserts.hex -o deliver/rusefi_no_asserts.dfu ../misc/encedo_hex2dfu/hex2dfu.exe -i deliver/rusefi.hex -o deliver/rusefi.dfu else chmod u+x ../misc/encedo_hex2dfu/hex2dfu.bin - ../misc/encedo_hex2dfu/hex2dfu.bin -i deliver/rusefi_no_asserts.hex -o deliver/rusefi_no_asserts.dfu +# ../misc/encedo_hex2dfu/hex2dfu.bin -i deliver/rusefi_no_asserts.hex -o deliver/rusefi_no_asserts.dfu ../misc/encedo_hex2dfu/hex2dfu.bin -i deliver/rusefi.hex -o deliver/rusefi.dfu fi