Update power.inc.sh
This commit is contained in:
@@ -402,8 +402,8 @@ CHECKPOWER_SERVICE(){
|
|||||||
|
|
||||||
if [ "${INVSTATSINFO}" != "" ] || [ ${TESTMODE} -eq 1 ]; then
|
if [ "${INVSTATSINFO}" != "" ] || [ ${TESTMODE} -eq 1 ]; then
|
||||||
[ "${TEST_INPUTACV}" != "" ] && INPUTACV=${TEST_INPUTACV} || INPUTACV=$(echo ${INVSTATSINFO} | jq '.inputs .inV')
|
[ "${TEST_INPUTACV}" != "" ] && INPUTACV=${TEST_INPUTACV} || INPUTACV=$(echo ${INVSTATSINFO} | jq '.inputs .inV')
|
||||||
[ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(echo ${INVSTATSINFO} | jq '.inputs .battV')
|
[ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(echo ${INVSTATSINFO} | jq '.inputs .battV')
|
||||||
|
|
||||||
if [ ${TESTMODE} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then
|
if [ ${TESTMODE} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then
|
||||||
touch ${PW_TMPFOLDER}/power.testmode.enabled
|
touch ${PW_TMPFOLDER}/power.testmode.enabled
|
||||||
SENDNOTICE "TEST MODE" "***TEST MODE*** ENABLED!"
|
SENDNOTICE "TEST MODE" "***TEST MODE*** ENABLED!"
|
||||||
@@ -427,10 +427,25 @@ VOLTAGE: ${INPUTACV}'volts"
|
|||||||
else
|
else
|
||||||
[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | bc) ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - Normal Voltage" >> ${PW_LOGPOWER}
|
[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | bc) ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - Normal Voltage" >> ${PW_LOGPOWER}
|
||||||
if [ -f ${PW_TMPFOLDER}/power.ac.start ]; then
|
if [ -f ${PW_TMPFOLDER}/power.ac.start ]; then
|
||||||
|
BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
|
||||||
|
BATTLIFE=`echo "scale=2; (${BATTV}*100)/${BATT_FULL}" | bc`
|
||||||
|
if (( $(bc <<<"${BATTV} >= ${FLOAT_CHARGE}") )); then
|
||||||
|
if (( $(bc <<<"${BATTV} >= ${BULK_CHARGE}") )); then
|
||||||
|
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Bulk Charging"
|
||||||
|
else
|
||||||
|
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Float Charging"
|
||||||
|
fi
|
||||||
|
elif [ "${BATTA}" = "-0.1" ] || [ "${BATTA}" = "-0.2" ] || [ "${BATTA}" = "-0.3" ]; then
|
||||||
|
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Standby"
|
||||||
|
else
|
||||||
|
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Discharging"
|
||||||
|
fi
|
||||||
SENDNOTICE "POWER Startup - Nominal" "Service Startup
|
SENDNOTICE "POWER Startup - Nominal" "Service Startup
|
||||||
Normal voltage detected
|
Normal voltage detected
|
||||||
VOLTAGE: ${INPUTACV}'volts
|
VOLTAGE: ${INPUTACV}'volts
|
||||||
BATT VOLTAGE: ${BATTVOLT}'volts"
|
BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)
|
||||||
|
BATT AMPS: ${BATTA_disp}"
|
||||||
|
|
||||||
echo "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Power' Service Startup - Normal voltage detected - Input: ${INPUTACV}'volts" >> ${PW_LOGPOWER}
|
echo "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Power' Service Startup - Normal voltage detected - Input: ${INPUTACV}'volts" >> ${PW_LOGPOWER}
|
||||||
rm -f ${PW_TMPFOLDER}/power.ac.start
|
rm -f ${PW_TMPFOLDER}/power.ac.start
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user