mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-29 13:52:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Started process of catching up with main trunk. Did drivers, wee_config_ws23xx, units.py

Browse Source
This commit is contained in:
Tom Keffer
2014-01-08 01:47:15 +00:00
parent dc1f02dace
commit 4fcdfa68de
4 changed files with 444 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
bin/wee_config_ws23xx Normal file → Executable file
View File

4
bin/weewx/drivers/simulator.py
View File

@@ -95,6 +95,7 @@ class Simulator(weewx.abstractstation.AbstractStation):
self.observations = {'outTemp' : Observation(magnitude=20.0, average= 50.0, period=24.0, phase_lag=14.0, start=start_ts),
'inTemp' : Observation(magnitude=5.0, average= 68.0, period=24.0, phase_lag=12.0, start=start_ts),
'barometer' : Observation(magnitude=1.0, average= 30.1, period=48.0, phase_lag= 0.0, start=start_ts),
'pressure' : Observation(magnitude=1.0, average= 30.1, period=48.0, phase_lag= 0.0, start=start_ts),
'windSpeed' : Observation(magnitude=10.0, average= 5.0, period=48.0, phase_lag=24.0, start=start_ts),
'windDir' : Observation(magnitude=360.0, average=180.0, period=48.0, phase_lag= 0.0, start=start_ts),
'windGust' : Observation(magnitude=12.0, average= 6.0, period=48.0, phase_lag=24.0, start=start_ts),
@@ -135,6 +136,7 @@ class Simulator(weewx.abstractstation.AbstractStation):
_packet[obs_type] = self.observations[obs_type].value_at(avg_time)
_packet['windchill'] = weewx.wxformulas.windchillF(_packet['outTemp'], _packet['windSpeed'])
_packet['dewpoint'] = weewx.wxformulas.dewpointF(_packet['outTemp'], _packet['outHumidity'])
_packet['heatindex'] = weewx.wxformulas.heatindexF(_packet['outTemp'], _packet['outHumidity'])
yield _packet
@@ -205,4 +207,4 @@ if __name__ == "__main__":
for packet in station.genLoopPackets():
print weeutil.weeutil.timestamp_to_string(packet['dateTime']), packet

684
bin/weewx/drivers/wmr200.py
View File

File diff suppressed because it is too large Load Diff

4
bin/weewx/units.py
View File

@@ -52,13 +52,15 @@ obs_group_dict = {"altitude" : "group_altitude",
"monthRain" : "group_rain",
"rain" : "group_rain",
"rain24" : "group_rain",
"totalRain" : "group_rain",
"totalRain" : "group_rain",
"stormRain" : "group_rain",
"yearRain" : "group_rain",
"hailRate" : "group_rainrate",
"rainRate" : "group_rainrate",
"wind" : "group_speed",
"windGust" : "group_speed",
"windSpeed" : "group_speed",
"windSpeed10" : "group_speed",
"windgustvec" : "group_speed",
"windvec" : "group_speed",
"rms" : "group_speed2",