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

RUSEFI MSD to contain bundle-specific URL #2848

This commit is contained in:
Andrey 2021-07-30 21:17:10 -04:00
parent 460be7df85
commit 7888574bf0
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/gen_config_board.sh
View File

@ -34,7 +34,7 @@ bash gen_signature.sh ${SHORT_BOARDNAME}
PREPEND_FILE=config/boards/${BOARDNAME}/prepend.txt
BOARD_SPECIFIC_URL=$(cat $PREPEND_FILE | grep MAIN_HELP_URL | cut -d " " -f 3)
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 [$BOARDNAME] as [$SHORT_BOARDNAME]"
if [ "" = "$BOARD_SPECIFIC_URL" ]; then
@ -77,7 +77,7 @@ java -DSystemOut.name=gen_config_board \
# 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 ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image.h 112 ${SHORT_BOARDNAME}
hw_layer/mass_storage/create_ini_image_compressed.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h 1024 ${SHORT_BOARDNAME}
hw_layer/mass_storage/create_ini_image.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image.h 112 ${SHORT_BOARDNAME} ${BOARD_SPECIFIC_URL}
hw_layer/mass_storage/create_ini_image_compressed.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h 1024 ${SHORT_BOARDNAME} ${BOARD_SPECIFIC_URL}
exit 0

2
firmware/hw_layer/mass_storage/.gitignore vendored
View File

@ -1 +1,3 @@
ramdisk_image.h
*.temp

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

@ -7,8 +7,9 @@ FULL_INI=$1
H_OUTPUT=$2
FS_SIZE=$3
SHORT_BOARDNAME=$4
BOARD_SPECIFIC_URL=$5
echo "create_ini_image: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME"
echo "create_ini_image: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME [$BOARD_SPECIFIC_URL]"
rm -f rusefi.zip ramdisk_image.h
@ -23,12 +24,15 @@ fatlabel ramdisk.image RUSEFI
# -j option dumps all files in the root of the zip (instead of inside directories)
zip -j rusefi.ini.zip $FULL_INI
cp hw_layer/rusEFI_Wiki_template.url wiki.temp
echo "URL=${BOARD_SPECIFIC_URL}" >> wiki.temp
# Put the zip inside the filesystem
mcopy -i ramdisk.image rusefi.ini.zip ::
# Put a readme text file in there too
mcopy -i ramdisk.image hw_layer/mass_storage/filesystem_contents/README.txt ::
mcopy -i ramdisk.image hw_layer/mass_storage/filesystem_contents/rusEFI\ Forum.url ::
mcopy -i ramdisk.image hw_layer/mass_storage/filesystem_contents/rusEFI\ Wiki.url ::rusEFI\ ${SHORT_BOARDNAME}\ Wiki.url
mcopy -i ramdisk.image wiki.temp ::rusEFI\ ${SHORT_BOARDNAME}\ Wiki.url

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

@ -7,8 +7,9 @@ FULL_INI=$1
H_OUTPUT=$2
FS_SIZE=$3
SHORT_BOARDNAME=$4
BOARD_SPECIFIC_URL=$5
echo "create_ini_image_compressed: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME"
echo "create_ini_image: ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME [$BOARD_SPECIFIC_URL]"
rm -f rusefi.zip ramdisk_image.h
@ -23,12 +24,15 @@ fatlabel ramdisk.image RUSEFI
cp hw_layer/rusEFI_Wiki_template.url wiki.temp
echo "URL=${BOARD_SPECIFIC_URL}" >> wiki.temp
# Put the zip inside the filesystem
mcopy -i ramdisk.image $FULL_INI ::
# Put a readme text file in there too
mcopy -i ramdisk.image hw_layer/mass_storage/filesystem_contents/README.nozip.txt ::README.txt
mcopy -i ramdisk.image hw_layer/mass_storage/filesystem_contents/rusEFI\ Forum.url ::
mcopy -i ramdisk.image hw_layer/mass_storage/filesystem_contents/rusEFI\ Wiki.url ::rusEFI\ ${SHORT_BOARDNAME}\ Wiki.url
mcopy -i ramdisk.image wiki.temp ::rusEFI\ ${SHORT_BOARDNAME}\ Wiki.url
# Compress the image as DEFLATE with gzip
gzip ramdisk.image

1
firmware/hw_layer/mass_storage/filesystem_contents/rusEFI Wiki.url → firmware/hw_layer/mass_storage/filesystem_contents/rusEFI_Wiki_template.url
View File

@ -2,4 +2,3 @@
Prop3=19,11
[InternetShortcut]
IDList=
URL=https://rusefi.com/s/wiki