Browse Source

minor improvements

FloKra 4 years ago
parent
commit
9e2aeafc02

+ 4 - 0
README.md

@@ -0,0 +1,4 @@
+# JeeLink2MQTT Python script
+
+Empfängt via JeeLink-Transceiver Daten von LaCrosse-Sensoren und stellt diese via MQTT bereit.
+

+ 0 - 0
src/jeelinkserlines.txt → src/doc/jeelinkserlines.txt


+ 52 - 34
src/jeelink2mqtt.py

@@ -3,9 +3,6 @@
 #
 
 import serial
-#from serial import Serial
-
-#from serial import Serial
 import time
 from time import localtime, strftime   
 
@@ -17,15 +14,36 @@ import paho.mqtt.client as mqtt
 #import numpy as np
 #import httplib
 
+serialport = '/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AL01MYTF-if00-port0'
+serialbaud = 57600
+
 mqtt_server = "mqtt.lan"
 mqtt_port = 1883
-mqtt_user = "script"
-mqtt_password = "rlAzqusqfbAy"
+mqtt_user = ""
+mqtt_password = ""
 
-sensordata_maxage = 300
+mqtt_topic_prefix = "LaCrosse"
+mqtt_topic_atemp = "wetter/atemp"
+mqtt_topic_ahum = "wetter/ahum"
+mqtt_topic_atemphum_lastUpdate = "wetter/atemphum_lastUpdate"
+mqtt_topic_domoticz_in = "domoticz/in"
 
 verbosemode = False
 
+sensors_conf_file = "/home/pi/jeelink_sensors.csv"
+
+sensordata_maxage = 300
+
+minUpdateInterval = 60
+aTempHumPublishInterval = 60
+
+override_updateinterval_on_change = False
+atemp_sensor_idx = 94
+atemp_sensor_idx_2 = 113
+
+
+
+
 if len(sys.argv) > 1 and str(sys.argv[1]) == "-v":
     verbosemode = True
     
@@ -47,16 +65,12 @@ def on_disconnect(client, userdata, rc):
 #    #print(msg.topic + " " + str(msg.payload))
 #    global atemp
 #    atemp = msg.payload
-    
 
-minUpdateInterval = 60
-aTempHumPublishInterval = 60
-mqtt_topic_prefix = "LaCrosse"
-override_updateinterval_on_change = False
-atemp_sensor_idx = 94
-atemp_sensor_idx_2 = 113
 
-atemp = 61 #starting values only..
+# dont edit below
+
+#starting values only..
+atemp = 61 
 ahum = 101
 atemp1 = 61
 ahum1 = 101
@@ -79,11 +93,11 @@ if verbosemode:
     print("JeeLink2MQTT by Flo Kra")
     print("=======================================================================")
     print("loading sensors assignment: ")
-
-with open("/home/pi/jeelink_sensors.csv", "r") as sensorscsv:
+    
+with open(sensors_conf_file, "r") as sensorscsv:
     for line in sensorscsv:
         if line.find('ID,DomoticzIdx,Name') == -1:
-            # nur Zeilen die nicht der header sind sind interessant
+            # csv file header filtern
             line = line.strip('\r')
             line = line.strip('\n')
             
@@ -108,14 +122,15 @@ mqttc.on_connect = on_connect
 mqttc.on_disconnect = on_disconnect
 ##mqttc.on_message = on_message
 
-mqttc.username_pw_set(mqtt_user, mqtt_password)
+if mqtt_user != "" and mqtt_password != "":
+    mqttc.username_pw_set(mqtt_user, mqtt_password)
 mqttc.connect(mqtt_server, mqtt_port, 60)
 
 mqttc.loop_start()
 #mqttc.loop_forever()
 
-ser = serial.Serial(port='/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AL01MYTF-if00-port0',
-    baudrate = 57600,
+ser = serial.Serial(port=serialport,
+    baudrate = serialbaud,
     parity=serial.PARITY_NONE,
     stopbits=serial.STOPBITS_ONE,
     bytesize=serial.EIGHTBITS,
@@ -237,9 +252,9 @@ try:
                     temp = (int(serLineParts[4])*256 + int(serLineParts[5]) - 1000)/10.0
                     if verbosemode:
                         print("unknown sensor ID " + str(addr))
-                    mqttc.publish(mqtt_topic_prefix+"/UnknownSensor/"+str(addr)+"/temperature", str(temp), qos=2, retain=False)
-                    mqttc.publish(mqtt_topic_prefix+"/UnknownSensor/"+str(addr)+"/humidity", str(hum), qos=2, retain=False)
-                    mqttc.publish(mqtt_topic_prefix+"/UnknownSensor/"+str(addr)+"/battNew", str(batt_new), qos=2, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/UnknownSensor/"+str(addr)+"/temperature", str(temp), qos=0, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/UnknownSensor/"+str(addr)+"/humidity", str(hum), qos=0, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/UnknownSensor/"+str(addr)+"/battNew", str(batt_new), qos=0, retain=False)
 
                 
                 if verbosemode:
@@ -273,23 +288,26 @@ try:
                                 atemphum_lastUpdate = time.time()
                                 atemp_last = atemp
                                 ahum_last = ahum
-                                mqttc.publish("wetter/atemp", str(atemp), qos=2, retain=True)
-                                mqttc.publish("wetter/ahum", str(ahum), qos=2, retain=True)
-                                mqttc.publish("wetter/atemphum_lastUpdate", strftime("%Y-%m-%d %H:%M:%S", localtime()), qos=2, retain=False)
+                                mqttc.publish(mqtt_topic_atemp, str(atemp), qos=0, retain=True)
+                                mqttc.publish(mqtt_topic_ahum, str(ahum), qos=0, retain=True)
+                                mqttc.publish(mqtt_topic_atemphum_lastUpdate, strftime("%Y-%m-%d %H:%M:%S", localtime()), qos=0, retain=False)
                     
                     domoticz_json = "{\"idx\":" + str(currentsensor_idx) + ",\"nvalue\":0,\"svalue\":\"" + str(temp) + ";" + str(hum) + ";1\"}"
                     #if verbosemode:
                     #    print(domoticz_json)
-                    mqttc.publish("domoticz/in", domoticz_json, qos=2, retain=False)
+                    mqttc.publish(mqtt_topic_domoticz_in, domoticz_json, qos=0, retain=False)
                     
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/temperature", str(temp), qos=2, retain=False)
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/humidity", str(hum), qos=2, retain=False)
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/battery", str(batterystate), qos=2, retain=False)
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/lastUpdate", strftime("%Y-%m-%d %H:%M:%S", localtime()), qos=2, retain=False)
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/availability", "available", qos=2, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/temperature", str(temp), qos=0, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/humidity", str(hum), qos=0, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/battery", str(batterystate), qos=0, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/lastUpdate", strftime("%Y-%m-%d %H:%M:%S", localtime()), qos=0, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/availability", "available", qos=0, retain=False)
                     
                     lacrosse_json = "{\"temperature\":" + str(temp) + ", \"humidity\":" + str(hum) + ", \"battery\":\"" + str(batterystate) + "\"}"
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/json", lacrosse_json, qos=2, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/json", lacrosse_json, qos=0, retain=False)
+                    
+                    tmptext = str(temp) + "° " + str(hum) + "%"
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(currentsensor_name)+"/TempHumText", tmptext, qos=0, retain=False)
                     
                     if verbosemode:
                         print("MQTT published")
@@ -321,7 +339,7 @@ try:
                     if verbosemode:
                         print(sensors[key], ' outd ->')
                     sensors_unavailable[key] = 1
-                    mqttc.publish(mqtt_topic_prefix+"/"+str(sensors[key])+"/availability", "unavailable", qos=2, retain=False)
+                    mqttc.publish(mqtt_topic_prefix+"/"+str(sensors[key])+"/availability", "unavailable", qos=0, retain=False)
 
 except KeyboardInterrupt:
     print('\n')

+ 4 - 3
src/jeelink2mqtt.service

@@ -1,12 +1,13 @@
 [Unit]
 Description=JeeLink2MQTT
-After=multi-user.target
+StartLimitInterval=0
 
 [Service]
 Type=simple
-User=pi
-ExecStart=/home/pi/jeelink2mqtt.py
 Restart=always
+RestartSec=1
+ExecStart=/home/pi/jeelink2mqtt.py
+User=pi
 
 [Install]
 WantedBy=multi-user.target

+ 3 - 0
src/jeelink2mqtt_disable_service.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+sudo systemctl stop jeelink2mqtt.service
+sudo systemctl disable jeelink2mqtt.service

+ 3 - 0
src/jeelink2mqtt_enable_service.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+sudo systemctl enable jeelink2mqtt.service
+sudo systemctl start jeelink2mqtt.service

+ 5 - 0
src/jeelink2mqtt_install_service.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+sudo cp jeelink2mqtt.service /lib/systemd/system
+sudo systemctl daemon-reload
+sudo systemctl enable jeelink2mqtt.service
+sudo systemctl start jeelink2mqtt.service

+ 2 - 0
src/jeelink2mqtt_start_service.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo systemctl start jeelink2mqtt.service

+ 2 - 0
src/jeelink2mqtt_stop_service.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo systemctl stop jeelink2mqtt.service

+ 0 - 285
src/jeelink2mqtt_wdog.log

@@ -1,285 +0,0 @@
-2017-09-04 01:04:58 starting wdog...
-2017-09-04 01:06:58 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-04 01:17:56 starting wdog...
-2017-09-04 01:22:56 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-04 01:35:31 starting wdog...
-2017-09-04 01:35:31 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-09-04 01:39:32 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-04 02:13:47 starting wdog...
-2017-09-04 02:13:47 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-04 11:43:52 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-04 11:54:41 starting wdog...
-2017-09-04 13:43:42 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-04 23:13:47 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-09-08 12:07:49 starting wdog...
-2017-10-13 01:02:19 starting wdog...
-2017-10-13 01:02:19 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-13 01:03:20 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-13 01:04:20 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-13 01:07:20 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-13 01:12:20 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-17 20:59:15 starting wdog...
-2017-10-17 20:59:15 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-17 21:00:16 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-17 21:03:16 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-17 21:07:16 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-18 23:19:52 starting wdog...
-2017-10-18 23:19:52 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-18 23:23:53 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-19 12:03:21 starting wdog...
-2017-10-19 12:03:22 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-19 12:06:22 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-27 21:24:41 starting wdog...
-2017-10-27 21:24:41 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-10-27 21:34:42 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-27 21:37:42 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-10-27 21:40:42 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-12-03 21:11:35 starting wdog...
-2017-12-13 16:27:01 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2017-12-13 17:16:47 starting wdog...
-2017-12-13 17:16:48 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2017-12-13 17:20:48 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-16 21:38:50 starting wdog...
-2018-01-16 21:38:50 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-01-26 14:02:27 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 14:25:34 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 14:42:36 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 14:46:36 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 14:51:43 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 14:58:14 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 15:26:12 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 15:31:17 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 15:33:11 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 15:44:14 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 15:56:09 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 15:57:10 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 16:26:30 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 16:31:31 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 16:35:35 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 16:57:39 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 17:09:28 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-01-26 17:48:54 starting wdog...
-2018-01-26 17:48:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 15:00:42 starting wdog...
-2018-02-01 15:00:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:12:01 starting wdog...
-2018-02-01 17:12:01 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:13:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:14:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:15:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:16:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:17:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:18:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:19:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:20:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:21:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:22:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:23:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:24:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:25:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:26:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:27:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:28:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:29:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:30:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:31:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:32:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:33:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:34:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:35:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:36:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:37:02 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:38:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:39:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:40:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:41:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:42:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:43:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:44:03 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:45:39 starting wdog...
-2018-02-01 17:45:39 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-01 17:59:11 starting wdog...
-2018-02-01 17:59:11 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-1970-01-01 01:00:32 starting wdog...
-1970-01-01 01:00:33 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:02:12 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:03:12 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:04:12 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:05:12 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:06:12 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:07:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:08:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:09:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:10:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:11:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-1970-01-01 01:00:23 starting wdog...
-1970-01-01 01:00:23 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:41:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 18:53:32 starting wdog...
-2018-02-02 18:53:32 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-02 21:05:37 starting wdog...
-2018-02-02 21:05:37 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-04 21:16:38 starting wdog...
-2018-02-04 21:16:38 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-07 20:06:25 starting wdog...
-2018-02-07 20:06:25 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-07 20:17:48 starting wdog...
-2018-02-07 20:17:48 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-02-07 20:32:48 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-03-19 10:14:26 starting wdog...
-2018-03-19 10:14:26 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-03-19 10:15:27 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-03-21 11:16:26 starting wdog...
-2018-03-21 11:16:26 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-03-21 11:17:27 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-03-21 16:56:24 starting wdog...
-2018-03-21 16:56:24 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-03-21 16:57:25 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-18 11:22:37 starting wdog...
-2018-05-18 11:22:37 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-19 06:47:04 starting wdog...
-2018-05-19 06:47:04 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-19 06:48:04 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-19 06:49:04 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-19 06:50:04 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-19 06:51:04 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-24 06:34:44 starting wdog...
-2018-05-24 06:34:44 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-24 06:35:45 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-24 06:36:45 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-24 06:37:45 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-05-24 06:38:44 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-06 12:20:20 starting wdog...
-2018-06-06 12:20:20 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-09 22:31:42 starting wdog...
-2018-06-09 22:31:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-09 22:32:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-09 22:33:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-09 22:34:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-09 22:35:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-12 14:27:18 starting wdog...
-2018-06-12 14:27:18 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-12 14:28:19 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-15 09:17:40 starting wdog...
-2018-06-15 09:17:40 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-15 09:18:40 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-15 09:19:40 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-15 09:20:40 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-15 09:21:40 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-17 21:27:51 starting wdog...
-2018-06-17 21:27:51 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-17 21:28:51 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-17 21:29:51 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-17 21:30:51 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 01:32:00 starting wdog...
-2018-06-20 01:32:00 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 01:33:00 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 01:34:00 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 01:35:00 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 02:13:21 starting wdog...
-2018-06-20 02:13:21 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 02:14:21 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 02:15:21 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-20 02:16:21 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-25 20:01:58 starting wdog...
-2018-06-25 20:01:58 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-25 20:02:58 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-25 20:03:58 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-25 20:04:58 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-25 20:05:59 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:49:06 starting wdog...
-2018-06-27 12:49:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:50:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:51:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:52:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:53:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:55:06 starting wdog...
-2018-06-27 12:55:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:56:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:57:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:58:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 12:59:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:00:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:01:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:02:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:03:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:04:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:05:06 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:06:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:07:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:08:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:09:07 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:17:01 starting wdog...
-2018-06-27 13:17:01 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:19:54 starting wdog...
-2018-06-27 13:19:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:20:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:21:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:22:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:23:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:24:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:25:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:26:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:27:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:28:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:29:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:30:54 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 13:32:19 starting wdog...
-2018-06-27 13:32:19 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 15:59:13 starting wdog...
-2018-06-27 15:59:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-06-27 18:13:15 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-06-27 18:14:15 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-06-27 18:15:15 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-06-27 18:16:15 statusfile too old - jeelink2mqtt..py seems to hang - restarting
-2018-07-03 17:06:36 starting wdog...
-2018-07-03 17:06:36 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-07-18 13:18:19 starting wdog...
-2018-07-18 13:18:20 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-07-18 13:19:20 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-07-18 13:25:10 starting wdog...
-2018-07-18 13:25:10 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-07-18 13:26:10 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-03 23:19:48 starting wdog...
-2018-09-03 23:19:48 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-03 23:20:48 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-05 17:25:28 starting wdog...
-2018-09-05 17:25:28 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-05 17:26:29 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-06 21:45:42 starting wdog...
-2018-09-06 21:45:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-06 21:46:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-06 21:50:04 starting wdog...
-2018-09-06 21:50:04 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-06 21:51:05 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 09:59:45 starting wdog...
-2018-09-07 09:59:45 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 10:00:47 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 10:16:09 starting wdog...
-2018-09-07 10:16:09 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 10:17:09 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 10:38:33 starting wdog...
-2018-09-07 10:38:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 10:39:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-07 11:48:42 starting wdog...
-2018-09-07 11:48:42 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:29:13 starting wdog...
-2018-09-14 11:29:13 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:30:14 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:31:14 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:32:14 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:33:14 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:34:15 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:35:15 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:36:33 starting wdog...
-2018-09-14 11:36:33 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:37:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:38:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:39:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:40:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:41:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:46:20 starting wdog...
-2018-09-14 11:46:20 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:53:34 starting wdog...
-2018-09-14 11:53:34 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting
-2018-09-14 11:54:35 statusfile does not exist - jeelink2mqtt.py seems not to be running - restarting

+ 1 - 1
src/jeelink_sensors.csv

@@ -5,4 +5,4 @@ ID,DomoticzIdx,Name
 19,4,T5-Bad
 22,88,T5-Balkon
 55,6,T5-Kueche
-40,264,Stiegenhaus
+40,264,Stiegenhaus

+ 0 - 0
src/jeetest.py → src/jeetest/jeetest.py


+ 0 - 0
src/jeelink2mqtt_wdog.service → src/wdog/jeelink2mqtt_wdog.service


+ 0 - 0
src/jeelink2mqtt_wdog.sh → src/wdog/jeelink2mqtt_wdog.sh


+ 0 - 2
src/jeelink2mqtt_disable_services.sh → src/wdog/jeelink2mqtt_wdog_disable_service.sh

@@ -1,5 +1,3 @@
 #!/bin/sh
-sudo systemctl stop jeelink2mqtt.service
 sudo systemctl stop jeelink2mqtt_wdog.service
-sudo systemctl disable jeelink2mqtt.service
 sudo systemctl disable jeelink2mqtt_wdog.service

+ 0 - 2
src/jeelink2mqtt_enable_services.sh → src/wdog/jeelink2mqtt_wdog_enable_service.sh

@@ -1,5 +1,3 @@
 #!/bin/sh
 sudo systemctl enable jeelink2mqtt_wdog.service
-sudo systemctl enable jeelink2mqtt.service
-sudo systemctl start jeelink2mqtt.service
 sudo systemctl start jeelink2mqtt_wdog.service

+ 0 - 3
src/jeelink2mqtt_install_services.sh → src/wdog/jeelink2mqtt_wdog_install_service.sh

@@ -1,8 +1,5 @@
 #!/bin/sh
-sudo cp jeelink2mqtt.service /lib/systemd/system
 sudo cp jeelink2mqtt_wdog.service /lib/systemd/system
 sudo systemctl daemon-reload
-sudo systemctl enable jeelink2mqtt.service
 sudo systemctl enable jeelink2mqtt_wdog.service
-sudo systemctl start jeelink2mqtt.service
 sudo systemctl start jeelink2mqtt_wdog.service

+ 0 - 1
src/jeelink2mqtt_start_services.sh → src/wdog/jeelink2mqtt_wdog_start_service.sh

@@ -1,3 +1,2 @@
 #!/bin/sh
-sudo systemctl start jeelink2mqtt.service
 sudo systemctl start jeelink2mqtt_wdog.service

+ 0 - 1
src/jeelink2mqtt_stop_services.sh → src/wdog/jeelink2mqtt_wdog_stop_service.sh

@@ -1,3 +1,2 @@
 #!/bin/sh
-sudo systemctl stop jeelink2mqtt.service
 sudo systemctl stop jeelink2mqtt_wdog.service