ademant
/
rasolar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working on mqtt

master
ademant 2019-07-02 16:28:15 +02:00
parent 8c12ee4063
commit 2ceedefea7
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log_cpu.py
View File

@ -43,7 +43,7 @@ if "mqtt" in log_conf:
if 'port' in lcmq:
mport=lcmq['port']
if bmqtt:
cpu_meas.set_mqtt(host=mbroker,port=mport)
cpu_meas.set_mqtt(broker=mbroker,port=mport)
a = 2

32
meas_data.py
View File

@ -75,25 +75,31 @@ class meas_data:
self.sqlhost=th
self.sqlport=int(port)
self.bsql=True
def set_mqtt(self,broker="banana",port=1883,topic="")
def set_mqtt(self,broker="banana",port=1883,topic=""):
mt=topic
if len(mt)==0:
mt=self.device+"/"+self.sensor+"/"+self.var_name
else:
mt=mt.translate(None,":;\\{}(){]%&")
mb=broker.translate(None,"/:;\\{}(){]%&")
mt=mt.translate(":;\\{}(){]%&")
mb=broker.translate("/:;\\{}(){]%&")
mport=int(port)
if mport < 1024:
print(mb)
print(mport)
if mport < 1024:
mport=1883
print(mport)
try:
mqtt.connect(host=mb,port=mport)
except:
print("no connection to broker")
else:
self.mqtt_broker=mb
self.mqtt_port=mport
self.mqtt_topic=mt
self.mqtt_bool=True
#else:
self.mqtt_broker=mb
print(mb)
print(mport)
print(mt)
self.mqtt_port=mport
self.mqtt_topic=mt
self.mqtt_bool=True
def set_file_log(self,store_file="/home/pi/data"):
if len(store_file)>1:
self.store_file=store_file+"_{:d}.txt"
@ -108,10 +114,10 @@ class meas_data:
print(self.var_name)
print(self.value)
def set_device(self,device):
td=device.translate(None,"/:;\\{}(){]%&")
td=device.translate("/:;\\{}(){]%&")
self.device=device
def set_sensor(self,sensor):
ts=sensor.translate(None,"/:;\\{}(){]%&")
ts=sensor
self.sensor=ts
def set_multiplicator(self,multiplicator):
tmult=float(multiplicator)
@ -187,7 +193,9 @@ class meas_data:
self.sense_last_time=self.act_time
def send_mqtt(self,trigger=0):
if (len(self.mqtt_topic)>0) and self.mqtt_bool:
publish.single(self.mqtt_topic,self.value,hostname=self.mqtt_broker,port=self.mqtt_port)
print(self.mqtt_topic)
print(self.mqtt_broker)
publish.single(self.mqtt_topic,self.value,hostname=self.mqtt_broker,port=self.mqtt_port)
#test=meas_data("temp",5)