ventil/freedavis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expunge external data collection

Browse Source
This commit is contained in:
Milan Toman
2019-05-26 16:58:49 +02:00
parent 7d3b91340e
commit 866e5f9db9
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
python/davis_etl.py
View File

@@ -332,18 +332,13 @@ if '__main__':
raw_winddir = davis_data['b1'] raw_winddir = davis_data['b1']
wind = davis_decoder.decode_wind({"windspeed": raw_windspeed, wind = davis_decoder.decode_wind({"windspeed": raw_windspeed,
"winddir": raw_winddir}) "winddir": raw_winddir})
# Get data external to the ISS, from local PCB / internal
# sensors and create base values for influx writing
'''
This shit ain't working without external sensors
davis_decoder.load_external_data()
influx_weather_write = davis_writer.base_construct( influx_weather_write = davis_writer.base_construct(
{ "speed": float(wind['speed']), { "speed": float(wind['speed']),
"direction": float(wind['direction']), "direction": float(wind['direction']),
"temperature": float(davis_decoder.inside_temp), "temperature": float(davis_decoder.inside_temp),
"humidity": float(davis_decoder.inside_hum)} "humidity": float(davis_decoder.inside_hum)}
)''' )
# Wind gusts calculation # Wind gusts calculation
if davis_packet_id == '0x9': if davis_packet_id == '0x9':
@@ -361,19 +356,6 @@ if '__main__':
raw_temp = (davis_data['b2'] << 8) + davis_data['b3'] raw_temp = (davis_data['b2'] << 8) + davis_data['b3']
temp_dict = davis_decoder.decode_temp(raw_temp) temp_dict = davis_decoder.decode_temp(raw_temp)
temp = float(temp_dict['celsius']) temp = float(temp_dict['celsius'])
pressure_adjusted = davis_decoder.adjust_pressure(temp)
influx_weather_write = davis_writer.construct(
influx_weather_write,
"temphumi",
{"pressure": float(pressure_adjusted)},
{"type" : "adjusted"}
)
influx_weather_write = davis_writer.construct(
influx_weather_write,
"temphumi",
{"pressure": float(davis_decoder.pressure)},
{"type" : "raw"}
)
influx_weather_write = davis_writer.construct( influx_weather_write = davis_writer.construct(
influx_weather_write, influx_weather_write,
@@ -461,11 +443,15 @@ if '__main__':
temp, temp,
wind, wind,
humidity) humidity)
'''
External sensors again
out2 = "Padj: {}, Praw {}, Tins: {}, Humins: {}".format( out2 = "Padj: {}, Praw {}, Tins: {}, Humins: {}".format(
pressure_adjusted, pressure_adjusted,
davis_decoder.pressure, davis_decoder.pressure,
davis_decoder.inside_temp, davis_decoder.inside_temp,
davis_decoder.inside_hum) davis_decoder.inside_hum)
'''
out3 = "RainState: {}, Rrate {}, Rain Total: {}, Cap:{}, Volt: {}".format( out3 = "RainState: {}, Rrate {}, Rain Total: {}, Cap:{}, Volt: {}".format(
rainstate, rainstate,
rainrate, rainrate,
@@ -473,7 +459,7 @@ if '__main__':
supercap, supercap,
solarvolt) solarvolt)
print("\n{} \n{} \n{} \n{}\n".format(out_id, out1, out2, out3)) print("\n{} \n{} \n{}\n".format(out_id, out1, out3))
# Write the whole blob into Influx DB # Write the whole blob into Influx DB
influx_weather_client.write_points(influx_weather_write) influx_weather_client.write_points(influx_weather_write)