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-05-31 13:55:30 -05:00
parent 14ca62a154
commit 0e8c7040e1
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
defaults.inc
View File

@@ -35,8 +35,14 @@ M_SRVCOPT=(start stop restart reload enable disable)
source ${PW_FOLDER}/conf/settings.conf source ${PW_FOLDER}/conf/settings.conf
[[ "${IP}" == "10.6.1"* ]] && mysql_command="/usr/bin/mysql -s" || mysql_command="/usr/bin/mariadb -P 3308" if [ "${PW_MYSQL_HOST}" != "" ]; then
[ "${PW_MYSQL_HOST}" != "" ] && mysql_conn="${mysql_command} -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}" if [[ "${IP}" == "10.6.1"* ]]; then
export MYSQL_PWD=${PW_MYSQL_PASS};
mysql_conn="/usr/bin/mysql -s -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER}"
else
mysql_conn="/usr/bin/mariadb -P 3308 -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}"
fi
fi
[ "${PW_MQTT_HOST}" != "" ] && mqtt_conn="/usr/bin/mosquitto_sub -h ${PW_MQTT_HOST} -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}" [ "${PW_MQTT_HOST}" != "" ] && mqtt_conn="/usr/bin/mosquitto_sub -h ${PW_MQTT_HOST} -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
EMAIL_NOTICE=${PW_EMAIL_NOTICE} EMAIL_NOTICE=${PW_EMAIL_NOTICE}

3
inc/power.inc.sh
View File

@@ -1142,7 +1142,6 @@ POWERLOGGER_SERVICE(){
LogDataTime=`date +'%Y-%m-%d %H:%M:%S'` LogDataTime=`date +'%Y-%m-%d %H:%M:%S'`
source ${PW_FOLDER}/defaults.inc source ${PW_FOLDER}/defaults.inc
echo "HERE1: ${LogDataTime}"
if [[ "${IP}" != "10.6.1"* ]]; then if [[ "${IP}" != "10.6.1"* ]]; then
@@ -1347,7 +1346,6 @@ POWERLOGGER_SERVICE(){
done done
############################################################# #############################################################
else ################# KYLE ######################### else ################# KYLE #########################
echo "HERE2: ${LogDataTime}"
if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then
UPS_VOLTIN=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.2.1.33.1.3.3.1.3.1 | sed 's/.*: //') UPS_VOLTIN=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.2.1.33.1.3.3.1.3.1 | sed 's/.*: //')
UPS_VOLTOUT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //') UPS_VOLTOUT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //')
@@ -1364,7 +1362,6 @@ POWERLOGGER_SERVICE(){
QRY="INSERT INTO power_data (sensorid, date, volt, amp) VALUES ('${PW_POWERSENSOR_ID['ups-input']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${UPS_VOLTIN}','${UPS_AMPSIN}')" QRY="INSERT INTO power_data (sensorid, date, volt, amp) VALUES ('${PW_POWERSENSOR_ID['ups-input']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${UPS_VOLTIN}','${UPS_AMPSIN}')"
${mysql_conn} -e "USE servermonitor; ${QRY}" ${mysql_conn} -e "USE servermonitor; ${QRY}"
echo $QRY
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['ups-output']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${UPS_VOLTOUT}','${UPS_AMPSOUT}','${UPS_WATTS}')" QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['ups-output']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${UPS_VOLTOUT}','${UPS_AMPSOUT}','${UPS_WATTS}')"
${mysql_conn} -e "USE servermonitor; ${QRY}" ${mysql_conn} -e "USE servermonitor; ${QRY}"
QRY="INSERT INTO power_data (sensorid, date, volt) VALUES ('${PW_POWERSENSOR_ID['ups-battery']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${UPS_BATT_VOLT}')" QRY="INSERT INTO power_data (sensorid, date, volt) VALUES ('${PW_POWERSENSOR_ID['ups-battery']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${UPS_BATT_VOLT}')"