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

bugfix - we've lost srec

This commit is contained in:
rusefillc 2024-01-31 13:55:55 -05:00
parent 802e1cb661
commit 00d3b5d5bc
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/config/boards/common_script.sh
View File

@ -52,12 +52,13 @@ if [ "$USE_OPENBLT" = "yes" ]; then
#cp build/rusefi.hex deliver/rusefi_update.hex #cp build/rusefi.hex deliver/rusefi_update.hex
# bootloader and composite image # bootloader and composite image
echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT" # echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
$HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -o bootloader/blbuild/openblt_$PROJECT_BOARD.dfu # $HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -o bootloader/blbuild/openblt_$PROJECT_BOARD.dfu
# todo: no need for complex `PROJECT = openblt_$(PROJECT_BOARD)` and complex binary name if we copy into static file name anyway!
# do we need all these formats? # do we need all these formats?
cp bootloader/blbuild/openblt_$PROJECT_BOARD.bin deliver/openblt.bin cp bootloader/blbuild/openblt_$PROJECT_BOARD.bin deliver/openblt.bin
cp bootloader/blbuild/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu # cp bootloader/blbuild/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu
#cp bootloader/blbuild/openblt_$PROJECT_BOARD.hex deliver/openblt.hex #cp bootloader/blbuild/openblt_$PROJECT_BOARD.hex deliver/openblt.hex
echo "$SCRIPT_NAME: invoking hex2dfu for composite rusEFI+OpenBLT image" echo "$SCRIPT_NAME: invoking hex2dfu for composite rusEFI+OpenBLT image"

10
misc/jenkins/build_working_folder.sh
View File

@ -71,7 +71,6 @@ mkdir -p artifacts
rm -rf artifacts/* rm -rf artifacts/*
mkdir $update_ts_cacerts_FOLDER mkdir $update_ts_cacerts_FOLDER
ls -l $FOLDER
if [ -z $RUSEFI_CONSOLE_SETTINGS ]; then if [ -z $RUSEFI_CONSOLE_SETTINGS ]; then
echo "$SCRIPT_NAME: No rusefi_console_settings" echo "$SCRIPT_NAME: No rusefi_console_settings"
@ -103,10 +102,15 @@ fi
# bootloader # bootloader
[ -e firmware/deliver/openblt.bin ] && { cp firmware/deliver/openblt.bin $FOLDER ; } [ -e firmware/deliver/openblt.bin ] && { cp firmware/deliver/openblt.bin $FOLDER ; }
if [ "$USE_OPENBLT" = "yes" ]; then # USE_OPENBLT is not available this script is invoked as a separate GHA step
if [ -f firmware/deliver/openblt.bin ]; then
echo "Taking .srec under different name"
# srec is the only format used by OpenBLT host tools # srec is the only format used by OpenBLT host tools
cp firmware/build/rusefi_update.srec $FOLDER cp firmware/build/rusefi.srec $FOLDER/rusefi_update.srec
else
echo "Do not need .srec"
fi fi
ls -l $FOLDER
[ -e firmware/deliver/rusefi.bin ] || { echo "$SCRIPT_NAME: rusefi.bin not found"; exit 1; } [ -e firmware/deliver/rusefi.bin ] || { echo "$SCRIPT_NAME: rusefi.bin not found"; exit 1; }