voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2025-07-19 23:17:18 -05:00
parent e6502a0b0c
commit 336f620905
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PW_VERS='2.12.6-07192025' PW_VERS='2.12.8-07192025'
noheader=' update service dailytemp confsync -r -report test ' noheader=' update service dailytemp confsync -r -report test '

6
inc/power.inc.sh
View File

@@ -482,7 +482,7 @@ CHECKPOWER(){
OFFSITE_BATT_VOLT=$(echo "${upsinfo}" | grep 'battery.voltage:' | sed 's/.*: //' | tr -d $'\r') 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') 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_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_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)) 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_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') 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_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_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` 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_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_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)) OFFSITE_STRIP_VOLTS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.voltage_mv')/1000" | tr -d $'\r' | bc -l))