Retropex/raspiblitz
1
0
Fork 0
mirror of https://github.com/Retropex/raspiblitz.git synced 2025-05-12 19:20:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

#4653 Remove Tempinfo for VMs (#4763)

Browse Source 
* #4653 remove temo from syncscreen
* #4653 remove temp from info dialog screen
* #4653 remove temp from infoscreen
This commit is contained in:
/rootzoll 2024-10-02 11:39:44 +02:00 committed by GitHub
parent 3b821a3c7c
commit d620d4b895
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
home.admin/00infoBlitz.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
source /home/admin/raspiblitz.info
source <(/home/admin/_cache.sh get \ source <(/home/admin/_cache.sh get \
state \ state \
setupPhase \ setupPhase \
@ -315,6 +317,12 @@ fi
datetime=$(date +"%d %b %T %z") datetime=$(date +"%d %b %T %z")
datetime="${datetime} up ${system_up_text}" datetime="${datetime} up ${system_up_text}"
if [ "${vm}" == "1" ]; then
temp_info="VM detected"
else
temp_info="temp ${system_temp_celsius}°C ${system_temp_fahrenheit}°F"
fi
stty sane stty sane
sleep 1 sleep 1
clear clear
@ -327,7 +335,7 @@ ${color_yellow} ${color_amber}%s ${color_green} ${ln_alias} ${upsI
${color_yellow} ${color_gray}${network^} Fullnode${LNinfo} ${torInfo} ${color_yellow} ${color_gray}${network^} Fullnode${LNinfo} ${torInfo}
${color_yellow} ,/ ${color_yellow}%s ${color_yellow} ,/ ${color_yellow}%s
${color_yellow} ,'/ ${color_gray}%s ${color_yellow} ,'/ ${color_gray}%s
${color_yellow} ,' / ${color_gray}%s, temp %s°C %s°F ${color_yellow} ,' / ${color_gray}%s ${temp_info}
${color_yellow} ,' /_____ ${color_gray}Free Mem ${color_ram}${ram} ${color_gray} HDD ${color_hdd}%s${color_gray} ${color_yellow} ,' /_____ ${color_gray}Free Mem ${color_ram}${ram} ${color_gray} HDD ${color_hdd}%s${color_gray}
${color_yellow},'_____ ,' ${color_gray}SSH admin@${internet_localip}${color_gray} d${internet_rx} u${internet_tx} ${color_yellow},'_____ ,' ${color_gray}SSH admin@${internet_localip}${color_gray} d${internet_rx} u${internet_tx}
${color_yellow} / ,' ${color_gray}${webuiinfo} ${color_yellow} / ,' ${color_gray}${webuiinfo}
@ -342,7 +350,7 @@ $lastLine
"RaspiBlitz v${codeVersion}" \ "RaspiBlitz v${codeVersion}" \
"-------------------------------------------" \ "-------------------------------------------" \
"Refreshed: ${datetime}" \ "Refreshed: ${datetime}" \
"CPU load${system_cpu_load##up*, }" "${system_temp_celsius}" "${system_temp_fahrenheit}" \ "CPU load${system_cpu_load##up*, }" \
"${hdd_used_info}" "${sync_percentage}" "${hdd_used_info}" "${sync_percentage}"
if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then

7
home.admin/setup.scripts/eventBlockchainSync.sh
View File

@ -104,4 +104,9 @@ fi
# display info to user # display info to user
time=$(date '+%H:%M:%S') time=$(date '+%H:%M:%S')
dialog --title " Node is Syncing (${time}) " --backtitle "${codeVersion} / ${internet_localip} ${system_temp_celsius}°C ${system_temp_fahrenheit}°F / ${hdd_used_info}" --infobox "${infoStr}\n ${adminStr}" ${height} ${width} if [ "${vm}" == "0" ]; then
temp_info="${system_temp_celsius}°C ${system_temp_fahrenheit}°F"
else
temp_info="VM"
fi
dialog --title " Node is Syncing (${time}) " --backtitle "${codeVersion} / ${internet_localip} ${temp_info} / ${hdd_used_info}" --infobox "${infoStr}\n ${adminStr}" ${height} ${width}

8
home.admin/setup.scripts/eventInfoWait.sh
View File

@ -33,8 +33,14 @@ if [ "${mode}" != "lcd" ] && [ "${mode}" != "ssh" ]; then
exit 1 exit 1
fi fi
if [ "${vm}" == "1" ]; then
temp_info="VM"
else
temp_info="${system_temp_celsius}°C"
fi
# default backtitle for dialog # default backtitle for dialog
backtitle="${codeVersion} ${eventID} / ${internet_localip} ${system_temp_celsius}°C ${hdd_used_info}" backtitle="${codeVersion} ${eventID} / ${internet_localip} ${temp_info} ${hdd_used_info}"
################################################ ################################################
# 1) WELL DEFINED EVENTS # 1) WELL DEFINED EVENTS