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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-29 22:00:37 -06:00
parent f3551d5786
commit 54f7115918
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
VERS='2.3.235-11292023'
VERS='2.3.237-11292023'
noheader=' update service dailytemp '

18
powerwall.sh
View File

@@ -572,7 +572,7 @@ CHECKPOWER(){
echo
echo -e "${idsCL[White]}Inverter Output Volts ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}'volts / ${OUTPUTV2}'volts"
echo -e "${idsCL[White]}Inverter Output Amps ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTA}'amps / ${OUTPUTA2}'amps"
echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${OUTPUTW}`'watts"
echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${OUTPUTW}`'watts"
echo
echo -e "${idsCL[White]}Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'volts ~ ${BATTLIFE}%${idsCL[Default]}"
echo -e "${idsCL[White]}Battery Amps Chg/DChg ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
@@ -597,11 +597,11 @@ CHECKPOWER(){
echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'amps${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays})
average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts"
average_disp="${idsCL[LightYellow]} `printf "%'.2f\n" ${average}`'watts"
else
average_disp=""
fi
echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${APCPDU_WATT}`'watts ~ estimate ${idsCL[LightCyan]}(`printf "%'.1f\n" ${APCPDU_WATT2}` watts)${average_disp}${idsCL[Default]}"
echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${APCPDU_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.2f\n" ${APCPDU_WATT2}` watts)${idsCL[Default]}"
echo
if [ "${SVRRM_VOLT}" != "" ]; then
@@ -616,11 +616,11 @@ CHECKPOWER(){
echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'amps ~ estimate${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays})
average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts"
average_disp="${idsCL[LightYellow]} `printf "%'.2f\n" ${average}`'watts"
else
average_disp=""
fi
echo -e "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${NETRK_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.1f\n" ${NETRK_WATT2}` watts)${idsCL[Default]}"
echo -e "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${NETRK_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.2f\n" ${NETRK_WATT2}` watts)${idsCL[Default]}"
echo
echo -e "${idsCL[White]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'volts${idsCL[Default]}"
@@ -628,11 +628,11 @@ CHECKPOWER(){
echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays})
average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts"
average_disp="${idsCL[LightYellow]} `printf "%'.2f\n" ${average}`'watts"
else
average_disp=""
fi
echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${SVRRM_WATT}`'watts${average_disp}${idsCL[Default]}"
echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${SVRRM_WATT}`'watts${average_disp}${idsCL[Default]}"
echo
fi
@@ -943,7 +943,7 @@ POWERLOGGER_SERVICE(){
APCPDU_AMP=$(snmpwalk -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc`
if [ "${SVRRM_VOLT}" != "" ]; then
APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['server-rack']}','${LogDataTime}','${SVRRM_VOLT}','${APCPDU_AMP}','${APCPDU_WATT}')"
else
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`) VALUES ('12','${LogDataTime}','${APCPDU_AMP}')"
@@ -952,7 +952,7 @@ POWERLOGGER_SERVICE(){
fi
if [ "${SVRRM_VOLT}" != "" ] && [ "${APCPDU_AMP}" != "" ]; then
NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['network-rack']}','${LogDataTime}','${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"