mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-20 17:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added WMR200 to the configuration file and to the User's Guide.

Browse Source
This commit is contained in:
Tom Keffer
2013-03-25 15:27:07 +00:00
parent cf48174813
commit 96dcfa7b34
3 changed files with 96 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/weewx/wmr200.py
View File

@@ -104,7 +104,7 @@ class UsbDevice(object):
if not self.dev:
return False
# Open the device and get a handle.
# Open the device and get a handle.
try:
self.handle = self.dev.open()
except usb.USBError, e:
@@ -288,11 +288,11 @@ class Packet(object):
if self._SizeActual() < 2:
print 'Packet too small to compute 16 bit checksum'
return
sum = 0
checksum = 0
# Checksum is last two bytes in packet.
for byte in self.pkt_data[:-2]:
sum += byte
return sum
checksum += byte
return checksum
def _checkSumField(self):
"""Returns the checksum field of the current packet
@@ -623,9 +623,9 @@ class PacketTemperature(Packet):
# _record['windchill']
# = weewx.wxformulas.windchillC(T,
# self.last_wind_record['windSpeed'])
# except AttributeError:
# pass
# _record['outTempBatteryStatus'] = (packet[0] & 0x40) >> 6
# except AttributeError:
# pass
# _record['outTempBatteryStatus'] = (packet[0] & 0x40) >> 6
elif sensor_id >= 2:
# If additional temperature sensors exist (channel>=2), then
# use observation types 'extraTemp1', 'extraTemp2', etc.
@@ -823,7 +823,7 @@ class WMR200(weewx.abstractstation.AbstractStation):
# Buffer of bytes read from console device.
self.buf = []
# Access the console via the usb accessor.
# Access the console via the usb accPacketHistoryReadessor.
self.usb_device = UsbDevice(vendor_id, product_id)
self.usb_device.timeout = float(stn_dict.get('timeout', 15.0))
@@ -964,7 +964,7 @@ class WMR200(weewx.abstractstation.AbstractStation):
while self.buf:
yield self.buf.pop(0)
except (IndexError, usb.USBError), e:
except (IndexError, usb.USBError), e: # @UnusedVariable
yield None
def _PollForData(self):

112
docs/usersguide.htm
View File

@@ -26,7 +26,7 @@ function showtab(tab,id) {
document.getElementById(tab+'-tab-'+id).className = 'tab selected';
}
</script>
</head>
</head>
<body>
@@ -108,21 +108,21 @@ Version: 2.2.1
<td>WS1090</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WS2080</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td>Tested</td>
</tr>
<tr>
<td>WS2090</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
@@ -152,14 +152,14 @@ Version: 2.2.1
<td>6975</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>6976</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
@@ -167,77 +167,77 @@ Version: 2.2.1
<td>WH1080</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td>Tested</td>
</tr>
<tr>
<td>WH1081</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WH1091</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WH1090</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td>Tested</td>
</tr>
<tr>
<td>WS1080</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WA2080</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WA2081</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WH2080</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WH2081</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WH3080</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WH3081</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td>Tested</td>
</tr>
<tr>
@@ -245,29 +245,36 @@ Version: 2.2.1
<td>265</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td class="text_highlight" rowspan="3">Oregon Scientific</td>
<td class="text_highlight" rowspan="4">Oregon Scientific</td>
<td>WMR100N</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>WMR-USB<sup><a href='#wmrusb'>2</a></sup></td>
<td>WMR100<sup><a href='#wmr100'>2</a></sup></td>
<td>Tested</td>
</tr>
<tr>
<td>WMR200</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>WMR200<sup><a href="#wmr200">3</a></sup></td>
<td>Experimental</td>
</tr>
<tr>
<td>WMR918</td>
<td>Serial</td>
<td class="code">pyserial</td>
<td>WMR-918<sup><a href='#wmr9xx'>3</a></sup></td>
<td>WMR9x8<sup><a href='#wmr9x8'>4</a></sup></td>
<td></td>
</tr>
<tr>
<td>WMR968</td>
<td>Serial</td>
<td class="code">pyserial</td>
<td>WMR-918<sup><a href='#wmr9xx'>3</a></sup></td>
<td>WMR9x8<sup><a href='#wmr9x8'>4</a></sup></td>
<td>Tested</td>
</tr>
<tr>
@@ -275,7 +282,7 @@ Version: 2.2.1
<td>TP1080WC</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
@@ -283,35 +290,38 @@ Version: 2.2.1
<td>W-8681</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
<tr>
<td>WX-2008</td>
<td>USB</td>
<td class="code">pyusb</td>
<td>FineOffsetUSB<sup><a href='#fousb'>4</a></sup></td>
<td>FineOffsetUSB<sup><a href='#fousb'>5</a></sup></td>
<td></td>
</tr>
</table>
<ol>
<li><a name='vantage'>Davis &quot;Vantage&quot;</a> series of weather stations, including the
<a href="http://www.davisnet.com/weather/products/vantage-pro-professional-weather-stations.asp">
VantagePro2</a>&trade; and <a href="http://www.vantagevue.com/">VantageVue</a>&trade;,
using serial, USB, or
<a href="http://www.davisnet.com/weather/products/weather_product.asp?pnum=06555">
WeatherLinkIP</a>&trade; connections. Both the &quot;Rev A&quot; (firmware
dated before 22 April 2002) and &quot;Rev B&quot; versions are supported.
<li id="vantage">Davis &quot;Vantage&quot; series of weather stations, including the
<a href="http://www.davisnet.com/weather/products/vantage-pro-professional-weather-stations.asp">
VantagePro2</a>&trade; and <a href="http://www.vantagevue.com/">VantageVue</a>&trade;,
using serial, USB, or <a href="http://www.davisnet.com/weather/products/weather_product.asp?pnum=06555">
WeatherLinkIP</a>&trade; connections. Both the &quot;Rev A&quot; (firmware
dated before 22 April 2002) and &quot;Rev B&quot; versions are supported.
</li>
<li><a name='wmrusb'>Oregon Scientific WMR-USB</a> series. Tested on the
<a href="http://us.oregonscientific.com/cat-Weather-sub-Professional-Weather-Stations-prod-Pro-Wireless-Weather-Station.html">WMR100N</a>, other stations may work as well.</li>
<li><a name='wmr9xx'>Oregon Scientific WMR-918/968</a> series. Tested on the
<a href="http://www.oregonscientificstore.com/oregon_scientific/product.asp?itmky=659831">Oregon Scientific WMR-968</a>, other stations may work as well.</li>
<li><a name='fousb'>Fine Offset</a> series of weather stations. These are branded by
<li id="wmr100">Oregon Scientific WMR100 series. Tested on the
<a href="http://us.oregonscientific.com/cat-Weather-sub-Professional-Weather-Stations-prod-Pro-Wireless-Weather-Station.html">WMR100N</a>, other stations may work as well.</li>
<li id="wmr200">Oregon Scientific WMR200 series. This is an experimental version. Please report any problems!
</li>
<li id="wmr9x8">Oregon Scientific WMR-918/968 series. Tested on the
<a href="http://www.oregonscientificstore.com/oregon_scientific/product.asp?itmky=659831">Oregon Scientific WMR-968</a>, other stations may work as well.
</li>
<li id="fousb">Fine Offset series of weather stations. These are branded by
many vendors, including Ambient Weather, National Geographic, Watson,
Elecsa, Tycon, Maplin, Froggit, and others. Tested on the
<a href="http://www.ambientweather.com/amws2080.html">Ambient Weather WS2080</a>, other stations may work as well.</li>
<a href="http://www.ambientweather.com/amws2080.html">Ambient Weather WS2080</a>, other stations may work as well.
</li>
</ol>
<h1 id="Prerequisites">System Requirements</h1>
@@ -618,11 +628,15 @@ Version: 2.2.1
<td>Davis Vantage weather stations</td>
</tr>
<tr>
<td class="code">WMR-USB</td>
<td>Oregon Scientific WMR-USB series stations</td>
<td class="code">WMR100</td>
<td>Oregon Scientific WMR100 series stations</td>
</tr>
<tr>
<td class="code">WMR-918</td>
<td class="code">WMR200</td>
<td>Oregon Scientific WMR200 series stations (experimental)</td>
</tr>
<tr>
<td class="code">WMR9x8</td>
<td>Oregon Scientific WMR-918/968 series station</td>
</tr>
<tr>
@@ -673,15 +687,23 @@ Version: 2.2.1
<p class="config_option">max_tries </p>
<p>How many times to try again before giving up. Default is 4. </p>
<h3 class="config_section">[WMR-USB]</h3>
<p>This section is for options relating to the Oregon Scientific WMR series
<h3 class="config_section">[WMR100]</h3>
<p>This section is for options relating to the Oregon Scientific WMR100 series
of weather stations with USB connectors.</p>
<p class="config_option">stale_wind</p>
<p>How long a wind record can be used to calculate wind chill (in seconds).
Default is 30.</p>
<h3 class="config_section">[WMR-918]</h3>
<p>This section is for options relating to the Oregon Scientific WMR-918
<h3 class="config_section">[WMR200]</h3>
<p>This section is for options relating to the Oregon Scientific WMR200 series
of weather stations with USB connectors. This support is experimental. Please
report any problems!</p>
<p class="config_option">stale_wind</p>
<p>How long a wind record can be used to calculate wind chill (in seconds).
Default is 30.</p>
<h3 class="config_section">[WMR9x8]</h3>
<p>This section is for options relating to the Oregon Scientific WMR-918/968
series of weather stations with serial connectors.</p>
<p class="config_important">type</p>
<p>For the moment, only <span class="code">serial</span> is supported.</p>

20
weewx.conf
View File

@@ -62,6 +62,7 @@ version = 2.2.1
# Set to type of station hardware. Supported stations include:
# Vantage
# WMR100
# WMR200
# WMR9x8
# FineOffsetUSB
# Simulator
@@ -143,6 +144,25 @@ version = 2.2.1
############################################################################################
[WMR200]
#
# This section is for the Oregon Scientific WMR200
#
######################################################
# The rest of this section rarely needs any attention.
# You can safely leave it "as is."
######################################################
# How long a wind record can be used to calculate wind chill (in seconds)
stale_wind = 30
# The driver to use
driver = weewx.wmr200
############################################################################################
[WMR9x8]
#