From e80574d58632b30afe9a9910e6960c4476248b44 Mon Sep 17 00:00:00 2001 From: Christian Rotzoll Date: Wed, 3 Jul 2019 00:55:27 +0200 Subject: [PATCH] #646 fixing info screen --- home.admin/00infoBlitz.sh | 2 +- home.admin/00infoLCD.sh | 6 ++++++ home.admin/config.scripts/blitz.touchscreen.sh | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index 6d75922..0bf0d66 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -291,7 +291,7 @@ ${color_yellow} ${color_gray}${network} Fullnode + Lightning Netwo ${color_yellow} ,/ ${color_yellow}%s ${color_yellow} ,'/ ${color_gray}%s, temp %s°C %s°F ${color_yellow} ,' / ${color_gray}Free Mem ${color_ram}${ram} ${color_gray} HDDuse ${color_hdd}%s${color_gray} -${color_yellow} ,' /_____, ${color_gray}ssh admin@${color_green}${local_ip}${color_gray} ▼${network_rx} ▲${network_tx} +${color_yellow} ,' /_____, ${color_gray}ssh admin@${color_green}${local_ip}${color_gray} ↓${network_rx} ↑${network_tx} ${color_yellow} .'____ ,' ${color_gray}${webinterfaceInfo} ${color_yellow} / ,' ${color_gray}${network} ${color_green}${networkVersion} ${chain}net ${color_gray}Sync ${sync_color}${sync} %s ${color_yellow} / ,' ${color_gray}${public_addr_pre}${public_color}${public_addr} ${public}${networkConnectionsInfo} diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index 660e8ef..02615fa 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -210,7 +210,13 @@ while : fi # no special case - show status display + clear /home/admin/00infoBlitz.sh + if [ "${touchscreen}" != "1" ]; then + echo "" + echo "" + echo "" + fi sleep 5 done diff --git a/home.admin/config.scripts/blitz.touchscreen.sh b/home.admin/config.scripts/blitz.touchscreen.sh index 24a9143..0fd7ffc 100644 --- a/home.admin/config.scripts/blitz.touchscreen.sh +++ b/home.admin/config.scripts/blitz.touchscreen.sh @@ -4,6 +4,9 @@ # see issue: https://github.com/rootzoll/raspiblitz/issues/646 # to work it needs to be based on Raspbian Desktop base image +source /home/admin/raspiblitz.info +source /mnt/hdd/raspiblitz.conf + # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo "STILL EXPERIMENTAL - NOT FINISHED"