small bugfixes

README.md

@@ -1,4 +1,6 @@
 # JeeLinkLogMQTT
 
 Backend for JeeLabs JeeLink receiver. 
-Receives sensor data from LaCrosse temperature/humidity sensors, logs data to InfluxDB and publishes via MQTT. 
+
+Receives sensor data from LaCrosse 868MHz temperature/humidity sensors, logs data to InfluxDB and publishes via MQTT.
+

jeelinklog/jeelinklog.py

@@ -28,11 +28,6 @@ config.read('jeelinklog.ini')
 serialport = config['jeelink'].get('serialport')
 serialbaud = int(config['jeelink'].get('baudrate'))
 
-mqtt_server = config['mqtt'].get('server')
-mqtt_port = int(config['mqtt'].get('port'))
-mqtt_user = config['mqtt'].get('user')
-mqtt_password = config['mqtt'].get('password')
-
 mqtt_topic_prefix = config['mqtt'].get('topic_prefix')
 topic_prefix_outside_temphum = config['mqtt'].get('topic_prefix_outside_temphum')
 mqtt_topic_atemp = config['mqtt'].get('topic_outside_temp')
@@ -221,9 +216,9 @@ mqttc.on_connect = on_connect
 mqttc.on_disconnect = on_disconnect
 ##mqttc.on_message = on_message
 
-if mqtt_user != "" and mqtt_password != "":
-    mqttc.username_pw_set(mqtt_user, mqtt_password)
-mqttc.connect(mqtt_server, mqtt_port, 60)
+if config['mqtt'].get('user') != "" and config['mqtt'].get('password') != "":
+    mqttc.username_pw_set(config['mqtt'].get('user'), config['mqtt'].get('password'))
+mqttc.connect(config['mqtt'].get('server'), config['mqtt'].getint('port'), 60)
 
 mqttc.loop_start()
 #mqttc.loop_forever()
@@ -732,16 +727,16 @@ try:
                 lacrosse_json = "{\"temperature\":" + str(out_temp_avg) + ", \"humidity\":" + str(out_hum_avg) + ", \"usedSensors\":" + str(count_used_out_sensors)
                 
                 if sum_out_sensors_temp_min < 100:
-                    mqttc.publish(topic_prefix_outside_temphum + '/min', str(sum_out_sensors_temp_min), qos=0, retain=False)
+                    mqttc.publish(topic_prefix_outside_temphum + '/temp_min', str(sum_out_sensors_temp_min), qos=0, retain=False)
                     lacrosse_json = lacrosse_json + ", \"temp_min\":" + str(sum_out_sensors_temp_min)
                 if sum_out_sensors_temp_max > -50:
-                    mqttc.publish(topic_prefix_outside_temphum + '/max', str(sum_out_sensors_temp_max), qos=0, retain=False)
+                    mqttc.publish(topic_prefix_outside_temphum + '/temp_max', str(sum_out_sensors_temp_max), qos=0, retain=False)
                     lacrosse_json = lacrosse_json + ", \"temp_max\":" + str(sum_out_sensors_temp_max)
                 if sum_out_sensors_hum_min < 100:
-                    mqttc.publish(topic_prefix_outside_temphum + '/min', str(sum_out_sensors_hum_min), qos=0, retain=False)
+                    mqttc.publish(topic_prefix_outside_temphum + '/hum_min', str(sum_out_sensors_hum_min), qos=0, retain=False)
                     lacrosse_json = lacrosse_json + ", \"hum_min\":" + str(sum_out_sensors_hum_min)
                 if sum_out_sensors_hum_max > -50:
-                    mqttc.publish(topic_prefix_outside_temphum + '/max', str(sum_out_sensors_hum_max), qos=0, retain=False)
+                    mqttc.publish(topic_prefix_outside_temphum + '/hum_max', str(sum_out_sensors_hum_max), qos=0, retain=False)
                     lacrosse_json = lacrosse_json + ", \"hum_max\":" + str(sum_out_sensors_hum_max)
                 
                 lacrosse_json = lacrosse_json + "}"