Skip to content

Commit 1305079

Browse files
authored
Merge pull request #40 from fact-project/add_tng
Add tng weather
2 parents e5aafa3 + be55c84 commit 1305079

3 files changed

Lines changed: 33 additions & 1 deletion

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
setup(
55
name='smart_fact_crawler',
6-
version='0.6.2',
6+
version='0.6.3',
77
description='acquire data published on the smartfact web page',
88
url='https://github.com/fact-project/smart_fact_crawler.git',
99
author='Dominik Neise, Sebastian Mueller, Maximilian Nöthe',

smart_fact_crawler/__init__.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def smartfact(timeout=None, fallback=False):
4242
sqm,
4343
sun,
4444
weather,
45+
tng_weather,
4546
sipm_currents,
4647
sipm_voltages,
4748
container_temperature,
@@ -164,6 +165,27 @@ def weather(url=None, timeout=None, fallback=False):
164165
})
165166

166167

168+
def tng_weather(url=None, timeout=None, fallback=False):
169+
if url is None:
170+
url = os.path.join(smartfacturl, 'tngdata.data')
171+
172+
table = smartfact2table(url, timeout=timeout)
173+
get = partial(get_entry, fallback=fallback)
174+
175+
return to_namedtuple('TNGWeather', {
176+
'timestamp': sft2dt(get(table, 0, 0)),
177+
'temperature': Quantity(s2f(get(table, 1, 1)), 'deg_C'),
178+
'delta_temperature_24h': Quantity(s2f(get(table, 2, 1)), 'deg_C'),
179+
'dew_point': Quantity(s2f(get(table, 3, 1)), 'deg_C'),
180+
'humidity': Quantity(s2f(get(table, 4, 1)), '%'),
181+
'pressure': Quantity(s2f(get(table, 5, 1)), 'hPa'),
182+
'wind_speed': Quantity(s2f(get(table, 6, 1)), 'km/h'),
183+
'wind_direction': Quantity(s2f(get(table, 7, 1)), 'deg'),
184+
'dust_total': Quantity(s2f(get(table, 8, 1)), 'ug/m3'),
185+
'solarimeter': Quantity(s2f(get(table, 9, 1)), 'W/m2'),
186+
})
187+
188+
167189
def sipm_currents(url=None, timeout=None, fallback=False):
168190
if url is None:
169191
url = os.path.join(smartfacturl, 'current.data')
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
1508384189000
2+
#ffffff 18.3
3+
#ffffff 1.04
4+
#ffffff -10.7
5+
#ffffff 13
6+
#ffffff 774
7+
#ffffff 6.44
8+
#ffffff 300
9+
#ffffff 7.34
10+
#ffffff 1.15e+03

0 commit comments

Comments
 (0)