From 336f62090550eadf2e48510594e4b7fe9be6779b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 19 Jul 2025 23:17:18 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index b9a7d081..8e75031d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.12.6-07192025' +PW_VERS='2.12.8-07192025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index f2af61e9..5f6cf3da 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -482,7 +482,7 @@ CHECKPOWER(){ OFFSITE_BATT_VOLT=$(echo "${upsinfo}" | grep 'battery.voltage:' | sed 's/.*: //' | tr -d $'\r') OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //' | tr -d $'\r') - POWER_STRIP_DATA=$(kasa --type strip --json --host 10.2.1.234 energy) + POWER_STRIP_DATA=$(kasa --type strip --json --host ${PW_OFFSITE_POWER_STRIP} energy) OFFSITE_WATTS=$(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.power_mw')/1000" | tr -d $'\r' | bc -l) OFFSITE_AMPS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.current_ma')/1000" | tr -d $'\r' | bc -l)) OFFSITE_VOLTS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.voltage_mv')/1000" | tr -d $'\r' | bc -l)) @@ -1049,7 +1049,7 @@ OFFSITE_CHECKPOWER_SERVICE(){ OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | tr -d $'\r' | bc` OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //' | tr -d $'\r') - POWER_STRIP_DATA=$(kasa --type strip --json --host 10.2.1.234 energy) + POWER_STRIP_DATA=$(kasa --type strip --json --host ${PW_OFFSITE_POWER_STRIP} energy) OFFSITE_WATTS=$(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.power_mw')/1000" | tr -d $'\r' | bc -l) @@ -1343,7 +1343,7 @@ POWERLOGGER_SERVICE(){ OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*$(echo "${upsinfo}" | grep 'ups.realpower.nominal:' | sed 's/.*: //')" | tr -d $'\r' | bc` OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | tr -d $'\r' | bc` - POWER_STRIP_DATA=$(kasa --type strip --json --host 10.2.1.234 energy) + POWER_STRIP_DATA=$(kasa --type strip --json --host ${PW_OFFSITE_POWER_STRIP} energy) OFFSITE_STRIP_WATTS=$(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.power_mw')/1000" | tr -d $'\r' | bc -l) OFFSITE_STRIP_AMPS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.current_ma')/1000" | tr -d $'\r' | bc -l)) OFFSITE_STRIP_VOLTS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.voltage_mv')/1000" | tr -d $'\r' | bc -l))