Merge pull request #23 from cobaltgit/graviton

Graviton

Author: cobaltgit

Apps/BootLogo/bootlogo.sh

@@ -0,0 +1,37 @@
+. /mnt/SDCARD/System/scripts/helpers.sh
+
+BOOTLOGO_MAX_BYTES=524288 # 512KiB
+BOOTLOGO="$1"
+LOG_FILE="/mnt/SDCARD/System/log/bootlogo.log"
+
+cd "$(dirname "$BOOTLOGO")"
+
+BOOTLOGO_RESOLUTION="$(magick identify -format "%wx%h" "$BOOTLOGO")"
+BOOTLOGO_DEPTH="$(magick identify -format "%[bit-depth]-%[type]" "$BOOTLOGO")"
+
+if [ $(wc -c <$BOOTLOGO) -gt $BOOTLOGO_MAX_BYTES ]; then
+    log_message "BootLogo: must be 512KiB or smaller" "$LOG_FILE"
+    display -d 2000 -t "Boot logo must be 512KiB or smaller. Exiting..."
+    exit 1
+elif [ "$BOOTLOGO_RESOLUTION" != "240x320" ]; then
+    log_message "BootLogo: expected 240x320 resolution, got $BOOTLOGO_RESOLUTION" "$LOG_FILE"
+    display -d 2000 -t "Boot logo must be 240x320 resolution. Exiting..."
+    exit 1 
+elif [ "$BOOTLOGO_DEPTH" != "16-TrueColor" ] && [ "$BOOTLOGO_DEPTH" != "16-Palette" ]; then
+    log_message "BootLogo: must be 16-bit RGB565 (16-TrueColor or 16-Palette), got $BOOTLOGO_DEPTH" "$LOG_FILE"
+    display -d 2000 -t "Boot logo must be a 16-bit (RGB565) image. Exiting..."
+    exit 1 
+fi
+
+log_message "BootLogo: Updating boot logo..." "$LOG_FILE"
+display -t "Updating bootlogo..."
+if dd if=$BOOTLOGO of=/dev/by-name/bootlogo bs=65536 >> "$LOG_FILE" 2>&1; then
+    log_message "BootLogo: update success" "$LOG_FILE"
+    display -d 2000 -t "Boot logo update success! Rebooting..."
+    cat /dev/zero > /dev/fb0
+    sync
+    reboot
+else
+    log_message "BootLogo: update failed" "$LOG_FILE"
+    display -d 2000 -t "Boot logo update failed. Check the log for more details."
+fi

Apps/BootLogo/launch.sh

@@ -1,37 +1,5 @@
 #!/bin/sh
 
-. /mnt/SDCARD/System/scripts/helpers.sh
-
 cd "$(dirname "$0")"
 
-BOOTLOGO_MAX_BYTES=524288 # 512KiB
-BOOTLOGO="bootlogo.bmp"
-LOG_FILE="/mnt/SDCARD/System/log/bootlogo.log"
-
-BOOTLOGO_RESOLUTION="$(magick identify -format "%wx%h" "$BOOTLOGO")"
-BOOTLOGO_DEPTH="$(magick identify -format "%[bit-depth]-%[type]" "$BOOTLOGO")"
-
-if [ $(wc -c <$BOOTLOGO) -gt $BOOTLOGO_MAX_BYTES ]; then
-    log_message "BootLogo: must be 512KiB or smaller" "$LOG_FILE"
-    display -d 2000 -t "Boot logo must be 512KiB or smaller. Exiting..."
-    exit 1
-elif [ "$BOOTLOGO_RESOLUTION" != "240x320" ]; then
-    log_message "BootLogo: expected 240x320 resolution, got $BOOTLOGO_RESOLUTION" "$LOG_FILE"
-    display -d 2000 -t "Boot logo must be 240x320 resolution. Exiting..."
-    exit 1 
-elif [ "$BOOTLOGO_DEPTH" != "16-TrueColor" ]; then
-    log_message "BootLogo: must be 16-bit RGB565 (16-TrueColor), got $BOOTLOGO_DEPTH" "$LOG_FILE"
-    display -d 2000 -t "Boot logo must be a 16-bit (RGB565) image. Exiting..."
-    exit 1 
-fi
-
-log_message "BootLogo: Updating boot logo..." "$LOG_FILE"
-display -t "Updating bootlogo..."
-dd if=$BOOTLOGO of=/dev/by-name/bootlogo bs=65536 >> "$LOG_FILE" 2>&1
-if [ $? -eq 0 ]; then
-    log_message "BootLogo: update success" "$LOG_FILE"
-    display -d 2000 -t "Boot logo update success."
-else
-    log_message "BootLogo: update failed" "$LOG_FILE"
-    display -d 2000 -t "Boot logo update failed. Check the log for more details."
-fi
+exec sh bootlogo.sh "bootlogo.bmp"

Apps/BootLogo/readme.txt

@@ -1,2 +1,2 @@
 Bootlogo must be 16bpp R5 G6 B5 bitmap, resolution 320x240 and less than 512KiB, rotated 90 degrees anticlockwise
-A sample bootlogo is included.
+A sample bootlogo is included.