From 19d639866d729fd9361989da3f9fa14083ecfb92 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 3 Sep 2022 16:33:15 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index eb65b06d..c567298b 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -45,6 +45,10 @@ CHECKTEMP_SERVICE(){
 			echo $mqtt_message | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
 			echo $mqtt_message | cut -d'T' -f 2 | cut -d"\"" -f 3 | read temp_d
 			echo $mqtt_message | cut -d'T' -f 3 | cut -d"\"" -f 1 | read temp_t
+			datetime="${temp_d} ${temp_t}"
+			datetime=$(TZ=America/Chicago date -d "datetime" +%s)
+			datetime=`date -d @datetime +'%Y-%m-%d %H:%M:%S'`
+			
 			if [ "$temp_c" != "null" ] && [ "$temp_c" != "" ]; then
 				temp_f=`echo "scale=2; $temp_c*1.8 + 32" | bc`
 				
@@ -58,28 +62,28 @@ CHECKTEMP_SERVICE(){
 						
 				if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then
 					if [ $temp_diff -gt 1 ] || [ "$last_temp" == "0" ]; then
-						echo "($temp_d @ $temp_t) WARNING TEMP: $temp_f°F - (Difference of $temp_diff°)" | mail -s "${1} TEMP WARNING" $email_alert
+						echo "($datetime) WARNING TEMP: $temp_f°F - (Difference of $temp_diff°)" | mail -s "${1} TEMP WARNING" $email_alert
 						last_temp=$temp_f
 					fi
-					echo "($temp_d @ $temp_t) WARNING: $temp_f°F - (Difference of $temp_diff°)"
+					echo "($datetime) WARNING: $temp_f°F - (Difference of $temp_diff°)"
 					
 				elif [ $(bc -l <<< "$temp_f >= $temp_crit") -eq 1 ]; then
 					if [ $temp_diff -gt 1 ] || [ "$last_temp" == "0" ]; then
-						echo "($temp_d @ $temp_t) CRITICAL TEMP: $temp_f°F - (Difference of $temp_diff°)" | mail -s "${1} TEMP CRITICAL" $email_alert
+						echo "($datetime) CRITICAL TEMP: $temp_f°F - (Difference of $temp_diff°)" | mail -s "${1} TEMP CRITICAL" $email_alert
 						last_temp=$temp_f
 					fi
-					echo "($temp_d @ $temp_t) CRITICAL: $temp_f°F - (Difference of $temp_diff°)"
+					echo "($datetime) CRITICAL: $temp_f°F - (Difference of $temp_diff°)"
 					
 				else
 					if [ "$last_temp" != "1" ]; then
-						echo "NORMAL TEMP: $temp_f°F" | mail -s "${1} BACK TO NORMAL" $email_alert
+						echo "($datetime) NORMAL TEMP: $temp_f°F" | mail -s "${1} BACK TO NORMAL" $email_alert
 						last_temp=1
 					fi
 					# echo "NORMAL TEMP: $temp_f°F" | mail -s "${1} TEMP NORMAL" $email_alert
-					echo "($temp_d @ $temp_t) normal: $temp_f°F"
+					echo "($datetime) normal: $temp_f°F"
 				fi
 				
-				QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${SENSOR_ID[$1]}','${temp_d} ${temp_t}','${temp_f}','${temp_h}')"
+				QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${SENSOR_ID[$1]}','${datetime}','${temp_f}','${temp_h}')"
 				${mysql_conn} -e "${QRY}"
 			fi
 	    done