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

replace SHORT_BOARDNAME with SHORT_BOARD_NAME

This commit is contained in:
David Holdeman 2024-01-30 06:53:27 -06:00 committed by rusefillc
parent 9adc75caf1
commit b6ad92faba
9 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/boards/cypress/config/gen_cypress_config.sh
View File

@ -3,7 +3,7 @@
# the storage section of rusefi.ini is updated as well
BOARDNAME=cypress
SHORT_BOARDNAME=cypress
SHORT_BOARD_NAME=cypress
BOARD_DIR=config/boards/${BOARDNAME}
@ -20,12 +20,12 @@ BOARD_DIR=config/boards/${BOARDNAME}
INI="rusefi_${SHORT_BOARDNAME}.ini"
INI="rusefi_${SHORT_BOARD_NAME}.ini"
bash gen_signature.sh ${SHORT_BOARDNAME}
bash gen_signature.sh ${SHORT_BOARD_NAME}
source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"

6
firmware/config/boards/kinetis/config/gen_kinetis_config.sh
View File

@ -3,7 +3,7 @@
# the storage section of rusefi.ini is updated as well
BOARDNAME=kinetis
SHORT_BOARDNAME=kin
SHORT_BOARD_NAME=kin
BOARD_DIR=config/boards/${BOARDNAME}
@ -20,12 +20,12 @@ BOARD_DIR=config/boards/${BOARDNAME}
INI="rusefi_${SHORT_BOARDNAME}.ini"
INI="rusefi_${SHORT_BOARD_NAME}.ini"
bash gen_signature.sh ${SHORT_BOARDNAME}
bash gen_signature.sh ${SHORT_BOARD_NAME}
source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"

2
firmware/config/boards/readme.md
View File

@ -20,7 +20,7 @@ By definition, BOARD_NAME is a folder in firmware\config\boards
One BOARD_NAME could be producing a number of artifacts via compile_$BUNDLE_NAME.sh scripts
Work in progress: SHORT_BOARDNAME becomes BUNDLE_NAME
Work in progress: SHORT_BOARD_NAME becomes BUNDLE_NAME
New board procedure once you have new folder in this *boards* directory

6
firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh
View File

@ -3,7 +3,7 @@
# the storage section of rusefi.ini is updated as well
BOARDNAME=subaru_eg33
SHORT_BOARDNAME=${BOARDNAME}_f7
SHORT_BOARD_NAME=${BOARDNAME}_f7
BOARD_DIR=config/boards/${BOARDNAME}
@ -20,12 +20,12 @@ BOARD_DIR=config/boards/${BOARDNAME}
INI="rusefi_${SHORT_BOARDNAME}.ini"
INI="rusefi_${SHORT_BOARD_NAME}.ini"
bash gen_signature.sh ${SHORT_BOARDNAME}
bash gen_signature.sh ${SHORT_BOARD_NAME}
source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"

22
firmware/gen_config_board.sh
View File

@ -20,29 +20,29 @@ echo "This script reads rusefi_config.txt and produces firmware persistent confi
echo "the storage section of rusefiXXX.ini is updated as well"
BOARD_DIR=$1
SHORT_BOARDNAME=$2
SHORT_BOARD_NAME=$2
if [ -z "$BOARD_DIR" ]; then
echo "Board name parameter expected"
exit 1
fi
if [ -z "$SHORT_BOARDNAME" ]; then
if [ -z "$SHORT_BOARD_NAME" ]; then
echo "ShortBoard name parameter expected"
exit 1
fi
INI="rusefi_${SHORT_BOARDNAME}.ini"
INI="rusefi_${SHORT_BOARD_NAME}.ini"
echo "BOARD_DIR=${BOARD_DIR} SHORT_BOARDNAME=${SHORT_BOARDNAME}"
echo "BOARD_DIR=${BOARD_DIR} SHORT_BOARD_NAME=${SHORT_BOARD_NAME}"
bash gen_signature.sh ${SHORT_BOARDNAME}
bash gen_signature.sh ${SHORT_BOARD_NAME}
PREPEND_FILE=${BOARD_DIR}/prepend.txt
BOARD_SPECIFIC_URL=$(cat $PREPEND_FILE | grep MAIN_HELP_URL | cut -d " " -f 3 | sed -e 's/^"//' -e 's/"$//')
echo "BOARD_SPECIFIC_URL=[$BOARD_SPECIFIC_URL] for [$SHORT_BOARDNAME] from [$BOARD_DIR]"
echo "BOARD_SPECIFIC_URL=[$BOARD_SPECIFIC_URL] for [$SHORT_BOARD_NAME] from [$BOARD_DIR]"
if [ "" = "$BOARD_SPECIFIC_URL" ]; then
BOARD_SPECIFIC_URL=https://rusefi.com/s/wiki
fi
@ -58,8 +58,8 @@ java \
$COMMON_GEN_CONFIG \
-enumInputFile controllers/algo/rusefi_hw_stm32_enums.h \
-enumInputFile controllers/algo/rusefi_hw_adc_enums.h \
-c_defines controllers/generated/rusefi_generated_${SHORT_BOARDNAME}.h \
-c_destination controllers/generated/engine_configuration_generated_structures_${SHORT_BOARDNAME}.h
-c_defines controllers/generated/rusefi_generated_${SHORT_BOARD_NAME}.h \
-c_destination controllers/generated/engine_configuration_generated_structures_${SHORT_BOARD_NAME}.h
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARD_DIR}"; exit 1; }
@ -73,8 +73,8 @@ fi
# 1) using unique file name for each configuration?
# 2) leverage consistent caching mechanism so that image is generated only in case of fresh .ini. Laziest approach would be to return exit code from java process above
#
hw_layer/mass_storage/create_ini_image.sh ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image.h 128 ${SHORT_BOARDNAME} ${BOARD_SPECIFIC_URL}
hw_layer/mass_storage/create_ini_image_compressed.sh ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h 1088 ${SHORT_BOARDNAME} ${BOARD_SPECIFIC_URL}
hw_layer/mass_storage/create_ini_image.sh ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image.h 128 ${SHORT_BOARD_NAME} ${BOARD_SPECIFIC_URL}
hw_layer/mass_storage/create_ini_image_compressed.sh ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h 1088 ${SHORT_BOARD_NAME} ${BOARD_SPECIFIC_URL}
echo "Happy ${SHORT_BOARDNAME}!"
echo "Happy ${SHORT_BOARD_NAME}!"
exit 0

6
firmware/gen_config_common.sh
View File

@ -1,5 +1,5 @@
COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \
COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARD_NAME} \
-jar ../java_tools/configuration_definition/build/libs/config_definition.jar"
COMMON_GEN_CONFIG="
@ -14,8 +14,8 @@ COMMON_GEN_CONFIG="
-field_lookup_file controllers/lua/generated/value_lookup_generated.cpp controllers/lua/generated/value_lookup_generated.md \
-java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \
-initialize_to_zero false \
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-signature tunerstudio/generated/signature_${SHORT_BOARD_NAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARD_NAME}.h \
-ts_output_name generated/${INI} \
-prepend integration/rusefi_config_trigger.txt \
-prepend ${BOARD_DIR}/prepend.txt \

8
firmware/gen_signature.sh
View File

@ -2,11 +2,11 @@
# file gen_signature.sh
SHORT_BOARDNAME=$1
SHORT_BOARD_NAME=$1
SIGNATURE_FILE_NAME=tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt
echo "Generating signature for ${SHORT_BOARDNAME}"
SIGNATURE_FILE_NAME=tunerstudio/generated/signature_${SHORT_BOARD_NAME}.txt
echo "Generating signature for ${SHORT_BOARD_NAME}"
# generate a unique signature
date=`TZ=Europe/London date +"%Y.%m.%d"`
@ -24,6 +24,6 @@ else
echo "! Current branch is: $branchname" >> ${SIGNATURE_FILE_NAME}
fi
echo "#define TS_SIGNATURE \"rusEFI $branchname.$date.${SHORT_BOARDNAME}.@@SIGNATURE_HASH@@\"" >> ${SIGNATURE_FILE_NAME}
echo "#define TS_SIGNATURE \"rusEFI $branchname.$date.${SHORT_BOARD_NAME}.@@SIGNATURE_HASH@@\"" >> ${SIGNATURE_FILE_NAME}
exit 0

6
firmware/hw_layer/mass_storage/create_ini_image.sh
View File

@ -14,7 +14,7 @@ fi
FULL_INI=$1
H_OUTPUT=$2
FS_SIZE=$3
SHORT_BOARDNAME=$4
SHORT_BOARD_NAME=$4
BOARD_SPECIFIC_URL=$5
IMAGE=ramdisk.image
@ -23,7 +23,7 @@ ZIP=rusefi.ini.zip
# mkfs.fat and fatlabel are privileged on some systems
PATH="$PATH:/usr/sbin"
echo "create_ini_image: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME [$BOARD_SPECIFIC_URL]"
echo "create_ini_image: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARD_NAME [$BOARD_SPECIFIC_URL]"
rm -f $ZIP $IMAGE
@ -59,7 +59,7 @@ mcopy -i $IMAGE $ZIP ::
mcopy -i $IMAGE hw_layer/mass_storage/readme.temp ::README-${current_date}.txt
mcopy -i $IMAGE hw_layer/mass_storage/filesystem_contents/rusEFI\ Forum.url ::
mcopy -i $IMAGE hw_layer/mass_storage/filesystem_contents/rusEFI\ Quick\ Start.url ::
mcopy -i $IMAGE hw_layer/mass_storage/wiki.temp ::rusEFI\ ${SHORT_BOARDNAME}\ Wiki.url
mcopy -i $IMAGE hw_layer/mass_storage/wiki.temp ::rusEFI\ ${SHORT_BOARD_NAME}\ Wiki.url

6
firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
View File

@ -14,7 +14,7 @@ fi
FULL_INI=$1
H_OUTPUT=$2
FS_SIZE=$3
SHORT_BOARDNAME=$4
SHORT_BOARD_NAME=$4
BOARD_SPECIFIC_URL=$5
IMAGE=ramdisk.image
@ -22,7 +22,7 @@ IMAGE=ramdisk.image
# mkfs.fat and fatlabel are privileged on some systems
PATH="$PATH:/usr/sbin"
echo "create_ini_image_compressed: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME [$BOARD_SPECIFIC_URL]"
echo "create_ini_image_compressed: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARD_NAME [$BOARD_SPECIFIC_URL]"
rm -f $IMAGE $IMAGE.gz
@ -58,7 +58,7 @@ mcopy -i $IMAGE $FULL_INI ::
mcopy -i $IMAGE hw_layer/mass_storage/readme.temp ::README-${current_date}.txt
mcopy -i $IMAGE hw_layer/mass_storage/filesystem_contents/rusEFI\ Forum.url ::
mcopy -i $IMAGE hw_layer/mass_storage/filesystem_contents/rusEFI\ Quick\ Start.url ::
mcopy -i $IMAGE hw_layer/mass_storage/wiki.temp ::rusEFI\ ${SHORT_BOARDNAME}\ Wiki.url
mcopy -i $IMAGE hw_layer/mass_storage/wiki.temp ::rusEFI\ ${SHORT_BOARD_NAME}\ Wiki.url
# Compress the image as DEFLATE with gzip
gzip $IMAGE