disable network & factory test when USB is mounted

make menu wrap up
add sapce berfore each entry
center restarting notif

Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>
This commit is contained in:
Michel-FK 2020-11-01 16:34:21 +01:00
parent 079ca21426
commit ed8902c09a

View File

@ -2,6 +2,12 @@
source /usr/local/lib/utils
# Get a key
getkey() {
local key=$(dd if=/dev/input/event0 bs=32 count=1 status=none | xxd -p -c 32 | cut -b 21-26)
echo ${key}
}
# Display meny item
menu_display () {
local entry=${1}
@ -133,7 +139,10 @@ menu_run () {
# USB format
mount | grep -q /dev/mmcblk0p3
if [ $? -eq 0 ]; then
notif "${message}..."
notif "${message}...^Press A to confirm"
while true; do
case $(getkey) in
1e0001|1e0002)
umount /mnt &&
mkfs.vfat /dev/mmcblk0p3 &&
mount /mnt
@ -142,6 +151,18 @@ menu_run () {
else
notif "${message} done"
fi
break
;;
1e0000)
;;
*)
notif "${message}...^Aborted!"
break
;;
esac
done
else
notif "${message}...^Cannot format USB when mounted!"
fi
@ -150,6 +171,8 @@ menu_run () {
3)
# Network enable/disable
mount | grep -q /dev/mmcblk0p3
if [ $? -eq 0 ]; then
if [ -e /mnt/usbnet ]; then
rm -f /mnt/usbnet
message=" Network enable"
@ -158,6 +181,9 @@ menu_run () {
message=" Network disable"
fi
notif "${message}"
else
notif "${message}...^Cannot change net if mounted!"
fi
;;
4)
@ -170,6 +196,8 @@ menu_run () {
5)
# Factory tests enable/disable
mount | grep -q /dev/mmcblk0p3
if [ $? -eq 0 ]; then
if [ -e /mnt/.assembly_tests ]; then
rm -f /mnt/.assembly_tests
message=" Factory tests enable"
@ -178,6 +206,9 @@ menu_run () {
message=" Factory tests disable"
fi
notif "${message}"
else
notif "${message}...^Cannot test if mounted!"
fi
;;
6)
@ -195,13 +226,15 @@ menu_display ${entry}
while true; do
# Get key events
key=$(dd if=/dev/input/event0 bs=32 count=1 status=none | xxd -p -c 32 | cut -b 21-26)
case ${key} in
case $(getkey) in
160001|160002)
# Key UP pressed or repeat
let entry=${entry}-1
let entry=${entry}%7
if [ ${entry} -eq -1 ]; then
entry=6
fi
menu_display ${entry}
;;