From 68d1c63caa46c1ed8d0c9512f1f0ad1d929dd7fc Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 6 Nov 2023 14:37:50 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 8661bd80..13ee8f2e 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -673,10 +673,10 @@ CHECKPOWER_SERVICE(){
 			
 			if (( $(bc <<<"${INPUTACV} >= ${min_acvolt}") )); then
 				if [ ${voltstatus} -eq 3 ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - Back to Normal Voltage" >> ${PW_LOGPOWER}
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Back to Normal Voltage" >> ${PW_LOGPOWER}
+					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
 					SENDNOTICE "POWER NOMINAL AGAIN" "Normal voltage detected
 VOLTAGE: ${INPUTACV}'volts"
-					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
 					battstatus=0
 				else
 					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge 3600 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - Normal Voltage" >> ${PW_LOGPOWER}
@@ -692,9 +692,11 @@ BATT VOLTAGE: ${BATTVOLT}'volts"
 				voltstatus=1
 				rm -f ${PW_TMPFOLDER}/power.ac.*
 			else
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
-				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - POWER OFF/LOW POWER" >> ${PW_LOGFILE}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
+				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - POWER OFF/LOW POWER" >> ${PW_LOGFILE}
 				if [ ${voltstatus} -lt 3 ]; then
+					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Power off or low voltage detected" >> ${PW_LOGFILE}
+					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Power off or low voltage detected" >> ${PW_LOGPOWER}
 					SENDNOTICE "POWER ALERT - POWER OFF/LOW POWER!!" "Power off or low voltage detected
 VOLTAGE: ${INPUTACV}'volts
 BATT VOLTAGE: ${BATTVOLT}'volts" 1
@@ -702,7 +704,8 @@ BATT VOLTAGE: ${BATTVOLT}'volts" 1
 					voltstatus=3
 					touch ${PW_TMPFOLDER}/power.ac.low
 				fi
-				if [ ! -f ${PW_TMPFOLDER}/power.ac.conserve ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.low)) -ge 300 ]; then
+				if [ ! -f ${PW_TMPFOLDER}/power.ac.conserve ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.low)) -ge 180 ]; then
+					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Shutting down iSCSI VM's and Host to conserve power" >> ${PW_LOGFILE}
 					SENDNOTICE "POWER ALERT - Conserving Power" "Shutting down iSCSI VM's and Host to conserve power" 1
 					SHUTDOWN_SERVER 10.10.2.10 &
 					touch ${PW_TMPFOLDER}/power.ac.conserve