From 216e781102c95ccc51c149c019168de215194667 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 9 Jan 2024 16:13:42 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 4 ++-- inc/temp.inc.sh | 6 +++--- powerwall.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defaults.inc b/defaults.inc index 4d5790ca..02520015 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.120-01092024' +VERS='2.5.121-01092024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 0b3ead19..35086c49 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -328,7 +328,7 @@ CHECKPOWER(){ [ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts" fi if [ ${REPORT} -eq 0 ]; then - end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}" + end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}s" fi [ "${PW_ACTION}" != "" ] && [ ${REPORT} -eq 0 ] && echo -e "${idsCL[Default]}" } @@ -565,7 +565,7 @@ Shutting down main servers" 1 # # fi end=`date +%s`; runtime=$((end-start)) - # echo -e "Runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy" done # & } diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 29786707..e90a48b1 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -136,7 +136,7 @@ CHECKTEMP(){ fi done rm -f ${PW_TMPFOLDER}/.fanspeed.* - end=`date +%s`; runtime=$((end-start)); echo -e "runtime: ${runtime}" + end=`date +%s`; runtime=$((end-start)); echo -e "runtime: ${runtime}s" [ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}" } @@ -349,7 +349,7 @@ CHECKTEMP_SERVICE(){ fi done end=`date +%s`; runtime=$((end-start)) - echo -e "Runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s done # & } @@ -950,7 +950,7 @@ SERVERROOM_TEMP_DIFFERENCE(){ fi fi end=`date +%s`; runtime=$((end-start)) - echo -e "\nRuntime: ${runtime}\n" + echo -e "\nruntime: ${runtime}s\n" } diff --git a/powerwall.sh b/powerwall.sh index 93ac88e2..fd08e424 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -718,7 +718,7 @@ TEST(){ end=`date +%s` runtime=$((end-start)) - echo "runtime: ${runtime}" + echo "runtime: ${runtime}s" echo } @@ -746,7 +746,7 @@ fi DAILYTEMP # SENDNOTICE "Daily Temp Readings" "$(DAILYTEMP)" end=`date +%s`; runtime=$((end-start)) - echo -e "\nruntime: ${runtime}\n" + echo -e "\nruntime: ${runtime}s\n" ;; checktemp) CHECKTEMP ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; checkpower) CHECKPOWER ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};;