Brought back RSSI and LQUI measurements, no RAW db used

This commit is contained in:
Milan Toman
2021-03-09 08:40:37 +01:00
parent d359f0756f
commit 81eec97760
2 changed files with 8 additions and 4 deletions

View File

@@ -5,7 +5,7 @@ try:
except:
_DEBUG = True
def send_to_influx(host, port, db, user, password, davis_unit_id, wind, measurement, name, value, tags):
def send_to_influx(host, port, db, user, password, davis_unit_id, wind, measurement, name, value, tags, rssi, lqi):
post = "http://{}:{}/write?db={}".format(host, port, db)
if _DEBUG:
print(b"SENDING TO: {}".format(post))
@@ -21,13 +21,15 @@ def send_to_influx(host, port, db, user, password, davis_unit_id, wind, measurem
else:
for tag in tags.keys():
measurement = "{},{}={}".format(measurement, tag, tags[tag])
data = "{_measure},davis_id={_davis_id} {_name}={_value}\n wind,type=speed,davis_id={_davis_id} value={_speed}\n wind,type=direction,davis_id={_davis_id} value={_direction}".format(
data = "{_measure},davis_id={_davis_id} {_name}={_value}\n wind,type=speed,davis_id={_davis_id} value={_speed}\n wind,type=direction,davis_id={_davis_id} value={_direction}\n signal,type=rssi,davis_id={_davis_id} value={_rssi}\n signal,type=lqi,davis_id={_davis_id} value={_lqi}".format(
_measure=measurement,
_name=name,
_value=value,
_davis_id = davis_unit_id,
_speed=wind['speed'],
_direction=wind['direction'])
_direction=wind['direction'],
_rssi=rssi,
_lqi=lqi)
if _DEBUG:
print(b"POST_DATA: {}".format(data))
try:

View File

@@ -79,7 +79,9 @@ while True:
decoder.measurement,
decoder.name,
decoder.value,
decoder.tags)
decoder.tags,
davis.rssi,
davis.lqi)
except Exception as e:
#raise e
if _DEBUG: