Flyttar publiceringen

LYWSD03MMC.py

@@ -95,11 +95,6 @@ def thread_SendingData():
 				params += " " + str(mea.rssi)
 			params += " " + str(mea.timestamp)
 			fmt +=",timestamp"
-			print ("MQTT publishing")
-			mqttclient.publish(("MiTemperature2/%s/temperature" % mea.sensorname), mea.temperature)
-			mqttclient.publish(("MiTemperature2/%s/humidity" % mea.sensorname), mea.humidity)
-			mqttclient.publish(("MiTemperature2/%s/battery" % mea.sensorname), mea.battery)
-			print ("MQTT done")
 
 #""" 		cmd = path + "/" + args.callback + " " + fmt + " " + params
 #			print(cmd)
@@ -301,9 +296,6 @@ if not args.name:
 	args.name = args.device
 
 if args.callback:
-	mqttserver = "192.168.0.114"
-	mqttclient = mqtt.Client("koksfonstret")
-	mqttclient.connect(mqttserver)
 	dataThread = threading.Thread(target=thread_SendingData)
 	dataThread.start()
 
@@ -414,6 +406,8 @@ elif args.atc:
 	from bluetooth_utils import (toggle_device,
 								enable_le_scan, parse_le_advertising_events,
 								disable_le_scan, raw_packet_to_str)
+	mqttserver = "192.168.0.114"
+	mqttclient = mqtt.Client("MiTemperature2")
 
 	advCounter=dict() 
 	sensors = dict()
@@ -504,6 +498,15 @@ elif args.atc:
 							print ("Humidity calibrated (offset calibration): ", measurement.humidity)
 					else:
 						measurement.sensorname = mac
+
+					print ("MQTT publishing")
+					mqttclient.connect(mqttserver)
+					mqttclient.publish(("MiTemperature2/%s/temp" % measurement.sensorname), measurement.temperature)
+					mqttclient.publish(("MiTemperature2/%s/humidity" % measurement.sensorname), measurement.humidity)
+					mqttclient.publish(("MiTemperature2/%s/batterylevel" % measurement.sensorname), measurement.battery)
+					print ("MQTT done")
+
+	
 					if(args.callback):
 						measurements.append(measurement)
 					#print("Length:", len(measurements))