rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-07-07 13:26:05 -04:00
parent 9a2567bef6 c2cf3dad3c
commit 62c384d3a4
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/clean_compile_two_versions.sh
View File

@ -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")"

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once
#define VCS_DATE 20200706
#define VCS_DATE 20200707

8
misc/jenkins/build_working_folder.sh
View File

@ -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

8
misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh
View File

@ -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