From 7813cf47ab50c6e6f745746712e859796cad00f7 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 19 Jul 2025 10:11:58 -0500
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index bc341363..53ab7a34 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -19,16 +19,16 @@ AVERAGEPOWER(){
 		total_watt=0
 		echo "HERE: ${sensorid}-"
 		while IFS=$'\t' read date amp watt ;do
-			if [ "${amp}" != "" ] && [ "${amp}" != "0" ] && [ "${amp}" != "NULL" ] && [[ "${amp}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
+			if [ "${amp}" != "" ] && [ "${amp}" != "0" ] && [ "${amp}" != "0.00" ] && [ "${amp}" != "NULL" ] && [[ "${amp}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
 				total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}")
 				((logsfound_amp++))
+				echo "A:${amp}-${total_amp}=${average_amp}"
 			fi
-			if [ "${watt}" != "" ] && [ "${watt}" != "0" ] && [ "${watt}" != "NULL" ] && [[ "${watt}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
+			if [ "${watt}" != "" ] && [ "${watt}" != "0" ] && [ "${watt}" != "0.00" ] && [ "${watt}" != "NULL" ] && [[ "${watt}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
 				total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
 				((logsfound_watt++))
+				echo "W:${watt}-${total_watt}=${average_watt}"
 			fi
-			echo "A:${amp}-${total_amp}=${average_amp}"
-			echo "W:${watt}-${total_watt}=${average_watt}"
 		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;")
 		if [ "${logsfound_watt}" != "0" ]; then
 			average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}")