This commit is contained in:
2024-02-07 09:48:59 -06:00
parent 21134c1bc6
commit 526cc1c1a7
2 changed files with 2 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='2.5.285-02072024' VERS='2.5.286-02072024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '
@@ -78,7 +78,6 @@ SENDNOTICE(){
if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
SN_TIT="$(echo -e "${1}" | sed "s/\%/\%25 /g")" SN_TIT="$(echo -e "${1}" | sed "s/\%/\%25 /g")"
SN_MSG="$(echo -e "${2}" | sed "s/\%/\%25 /g")" SN_MSG="$(echo -e "${2}" | sed "s/\%/\%25 /g")"
echo -e "SENT:\n${SN_MSG}\n"
if [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ]; then if [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ]; then
PUSH_TO_MOBILE "***TEST MODE*** PUSH_TO_MOBILE "***TEST MODE***

View File

@@ -630,14 +630,13 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
# if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren; elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi # if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren; elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi
# curl -m 3 -sd "token=${PW_PUSHOVER_APP_TOKEN}&user=${PW_PUSHOVER_USER_TOKEN}&message=$(echo "${MESSAGE}" | sed -e "s/%/%25/g")&title=${1}&priority=${PRIORITY}&sound=cosmic" https://api.pushover.net/1/messages.json >/dev/null 2>&1 # curl -m 3 -sd "token=${PW_PUSHOVER_APP_TOKEN}&user=${PW_PUSHOVER_USER_TOKEN}&message=$(echo "${MESSAGE}" | sed -e "s/%/%25/g")&title=${1}&priority=${PRIORITY}&sound=cosmic" https://api.pushover.net/1/messages.json >/dev/null 2>&1
[ "${3}" != "" ] && PRIORITY=${3} || PRIORITY=0 [ "${3}" != "" ] && PRIORITY=${3} || PRIORITY=0
echo -e "SENDING:\n${MESSAGE}\n"
SENDNOTICE "${1}" "${MESSAGE}" ${PRIORITY} cosmic SENDNOTICE "${1}" "${MESSAGE}" ${PRIORITY} cosmic
} }
if [ "${startup}" = "true" ]; then if [ "${startup}" = "true" ]; then
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_WATTS}'watts - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - Service startup" >> ${PW_LOGPOWER} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_WATTS}'watts - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - Service startup" >> ${PW_LOGPOWER}
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Service startup" >> ${PW_LOGFILE} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Service startup" >> ${PW_LOGFILE}
SENDNOTICE2 "OFFSITE POWER SERVICE STARTUP" "Service starting" SENDNOTICE2 "OFFSITE POWER SERVICE STARTUP" "Service starting"
# OFFSITE_SENDPOWER "OFFSITE POWER Service Startup" & OFFSITE_SENDPOWER "OFFSITE POWER Service Startup" &
startup=false startup=false
fi fi