From 4f9b3cc4d0a4a60227161841cd1b31bbe874a96c Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Fri, 30 Jul 2021 16:07:22 -0400
Subject: [PATCH] RUSEFI MSD to contain bundle-specific URL #2848

refactoring and progress
---
 firmware/gen_config_board.sh                  |  4 ++--
 .../hw_layer/mass_storage/create_ini_image.sh | 19 +++++++++++++++----
 .../create_ini_image_compressed.sh            | 16 ++++++++++++----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index 768724af45..c9114545c1 100755
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -51,7 +51,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
-hw_layer/mass_storage/create_ini_image_compressed.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h
+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}
 
 exit 0
diff --git a/firmware/hw_layer/mass_storage/create_ini_image.sh b/firmware/hw_layer/mass_storage/create_ini_image.sh
index 9f78c70826..f26ba537a4 100755
--- a/firmware/hw_layer/mass_storage/create_ini_image.sh
+++ b/firmware/hw_layer/mass_storage/create_ini_image.sh
@@ -3,17 +3,25 @@
 # fail on error
 set -e
 
+FULL_INI=$1
+H_OUTPUT=$2
+FS_SIZE=$3
+SHORT_BOARDNAME=$4
+
+echo "ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME"
+
+
 rm -f rusefi.zip ramdisk_image.h
 
 # copy *count*KB of zeroes
-dd if=/dev/zero of=ramdisk.image bs=1024 count=112
+dd if=/dev/zero of=ramdisk.image bs=1024 count=$FS_SIZE
 
 # create a FAT filesystem inside, name it RUSEFI
 mkfs.fat ramdisk.image
-fatlabel ramdisk.image RUSEFI
+fatlabel ramdisk.image "RUSEFI $SHORT_BOARDNAME"
 
 # -j option dumps all files in the root of the zip (instead of inside directories)
-zip -j rusefi.ini.zip $1
+zip -j rusefi.ini.zip $FULL_INI
 
 # Put the zip inside the filesystem
 mcopy -i ramdisk.image rusefi.ini.zip ::
@@ -22,9 +30,12 @@ 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 ::
 
+
+
+
 # write out as a C array, with "static const" tacked on the front
 xxd -i ramdisk.image \
     | cat <(echo -n "static const ") - \
-    > $2
+    > $H_OUTPUT
 
 rm ramdisk.image rusefi.ini.zip
diff --git a/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh b/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
index fabafb84ea..e37bbea1ef 100755
--- a/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
+++ b/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
@@ -2,18 +2,26 @@
 
 # fail on error
 set -e
+RUSEFI MSD to contain bundle-specific URL #2848
+FULL_INI=$1
+H_OUTPUT=$2
+FS_SIZE=$3
+SHORT_BOARDNAME=$4
 
 rm -f rusefi.zip ramdisk_image.h
 
-# copy 1MB of zeroes
-dd if=/dev/zero of=ramdisk.image bs=1024 count=1024
+# copy *count*KB of zeroes
+dd if=/dev/zero of=ramdisk.image bs=1024 count=$FS_SIZE
 
 # create a FAT filesystem inside, name it RUSEFI
 mkfs.fat ramdisk.image
 fatlabel ramdisk.image RUSEFI
 
+
+
+
 # Put the zip inside the filesystem
-mcopy -i ramdisk.image $1 ::
+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 ::
@@ -25,6 +33,6 @@ gzip ramdisk.image
 # write out as a C array, with "static const" tacked on the front
 xxd -i ramdisk.image.gz \
     | cat <(echo -n "static const ") - \
-    > $2
+    > $H_OUTPUT
 
 rm ramdisk.image.gz