diff --git a/devices/__init__.py b/devices/__init__.py index 741636c..b7f15a4 100644 --- a/devices/__init__.py +++ b/devices/__init__.py @@ -39,7 +39,7 @@ try: except ImportError: ROOT_LOGGER_NAME = 'root' -BATTERY_WARN_LEVEL = 5 +BATTERY_WARN_LEVEL = 10 class warning(dict): @@ -253,7 +253,7 @@ class shelly(base): # WARNING CALL # def __warning__(self, client, key, data): - w = warning(self.topic, warning.TYPE_OVERTEMPERATURE, "Temperature to high (%.1f°C)", self.get(self.KEY_TEMPERATURE, math.nan)) + w = warning(self.topic, warning.TYPE_OVERTEMPERATURE, "Temperature to high (%.1f°C)", self.get(self.KEY_TEMPERATURE) or math.nan) self.logger.warning(w) self.set(self.KEY_WARNING, w) @@ -407,7 +407,7 @@ class silvercrest_motion_sensor(base): # WARNING CALL # def __warning__(self, client, key, data): - w = warning(self.topic, warning.TYPE_BATTERY_LOW, "Battery low (%.1f%%)", self.get(self.KEY_BATTERY, math.nan)) + w = warning(self.topic, warning.TYPE_BATTERY_LOW, "Battery low (%.1f%%)", self.get(self.KEY_BATTERY) or math.nan) self.logger.warning(w) self.set(self.KEY_WARNING, w) diff --git a/function/videv.py b/function/videv.py index aeecfd7..3807cb7 100644 --- a/function/videv.py +++ b/function/videv.py @@ -262,7 +262,7 @@ class videv_audio_player(base): class videv_warnings(base): MAX_WARNINGS = 10 - KEY_WARNING = 'text' + KEY_WARNING = 'html_short' def __init__(self, mqtt_client, topic, default_values=None): super().__init__(mqtt_client, topic, default_values) @@ -271,7 +271,8 @@ class videv_warnings(base): def warningcollector(self, client, key, data): self.__warnings__.append(data) self.__warnings__ = self.__warnings__[-self.MAX_WARNINGS:] - self.__tx__(self.KEY_WARNING, '\n'.join([str(w) for w in self.__warnings__])) + txt = "

".join([time.asctime(w[w.KEY_TM]) + "
" + w[w.KEY_TEXT] + "
" + w[w.KEY_ID] for w in self.__warnings__]) + self.__tx__(self.KEY_WARNING, txt) class all_off(base): diff --git a/smart_brain.py b/smart_brain.py index d7644df..c5b7ad5 100644 --- a/smart_brain.py +++ b/smart_brain.py @@ -43,7 +43,7 @@ if __name__ == "__main__": if config.DEBUG: report.appLoggingConfigure(None, None, ((config.APP_NAME, logging.DEBUG), ), fmt=report.SHORT_FMT, host='localhost', port=19996) else: - report.stdoutLoggingConfigure(((config.APP_NAME, logging.INFO), ), report.SHORT_FMT) + report.stdoutLoggingConfigure(((config.APP_NAME, logging.WARNING), ), report.SHORT_FMT) # mc = mqtt.mqtt_client(host=config.MQTT_SERVER, port=config.MQTT_PORT, username=config.MQTT_USER, password=config.MQTT_PASSWORD, name=config.APP_NAME)