fredrik/sensorpajen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Flyttar publiceringen

Browse Source
This commit is contained in:
fredrik
2021-01-11 12:50:01 +00:00
parent c1c02691da
commit 7f923c3a9b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LYWSD03MMC.py
View File

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