This commit is contained in:
Tom Keffer
2012-11-04 17:05:51 +00:00
parent 6b901df14c
commit 7e7889bb1e
5 changed files with 24 additions and 17 deletions

View File

@@ -1052,14 +1052,17 @@ def _archive_datetime(packet) :
datestamp = packet['date_stamp']
timestamp = packet['time_stamp']
# Decode the Davis time, constructing a time-tuple from it:
# Construct a time tuple from Davis time. Unfortunately, as timestamps come
# off the Vantage logger, there is no way of telling whether or not DST is
# in effect. So, have the operating system guess by using a '-1' in the last
# position of the time tuple. It's the best we can do...
time_tuple = ((0xfe00 & datestamp) >> 9, # year
(0x01e0 & datestamp) >> 5, # month
(0x001f & datestamp), # day
timestamp // 100, # hour
timestamp % 100, # minute
0, # second
0, 0, -1)
0, 0, -1) # have OS guess DST
# Convert to epoch time:
try:
ts = int(time.mktime(time_tuple))

View File

@@ -12,7 +12,7 @@
"""
import time
__version__="2.0.0rc2"
__version__="2.0.0"
# Holds the program launch time in unix epoch seconds:
# Useful for calculating 'uptime.'

View File

@@ -23,21 +23,25 @@
<p>What follows are directions for upgrading from specific versions.</p>
<h2>V1.14 or earlier</h2>
<p>Version 2.0 introduces many new features, including a revamped internal
engine. Fortunately, all skins are completely backwards compatible, so you
should not have to change your templates or skin configuration file,
<span class="code">skin.conf</span>. </p>
<p>If you have written a custom report generator it should also be backwards
compatible.</p>
<p>However, the main configuration file, <span class="code">weewx.conf</span>,
has changed in a way that is not backwards compatible. The setup utility will
install a new, fresh version which you will have to edit by hand. </p>
<p>If you have written a custom service, it will have to be updated to use the
new engine. The overall architecture is very similar, the only change is that
engine. There are two changes that are not backwards compatible:</p>
<ul>
<li>The configuration file, <span class="code">weewx.conf</span>. When
upgrading from V1.X, the setup utility will
install a new, fresh copy of <span class="code">weewx.conf</span>, which you will
then have to edit by hand. Thereafter, V2.X upgrades should be automatic.</li>
<li>Custom services. If you have written a custom service, it will have to be updated to use the
new engine. The overall architecture is very similar, except that
functions must be <em>bound</em> to events, rather than get called implicitly.
See the sections <a href="customizing.htm#Customizing_a_Service">Customizing a
Service</a> and <a href="customizing.htm#Adding_a_Service">Adding a Service</a>
in the <a href="customizing.htm">Customizing Guide</a> for details on how to do
this.</p>
this.</li>
</ul>
<p>All skins should be completely backwards compatible, so you
should not have to change your templates or skin configuration file,
<span class="code">skin.conf</span>. </p>
<p>If you have written a custom report generator it should also be backwards
compatible.</p>
<h2>V1.13 or earlier</h2>
<p>Version 1.14 introduces some new webpages that have been expressly formatted for
the smartphone by using <a href="http://jquery.com/">jQuery</a>.</p>

View File

@@ -186,7 +186,7 @@
radiation = Radiation
rain = Rain
rainRate = Rain Rate
rxCheckPercent = Signal Quality
rxCheckPercent = ISS Signal Quality
windDir = Wind Direction
windGust = Gust Speed
windGustDir = Gust Direction

View File

@@ -23,7 +23,7 @@
#
# Set to 1 for extra debug info, otherwise comment it out or set to zero.
debug = 1
debug = 0
# Root directory of the weewx data file hierarchy for this station.
WEEWX_ROOT = /home/weewx
@@ -32,7 +32,7 @@ WEEWX_ROOT = /home/weewx
socket_timeout = 20
# Current version
version = 2.0.0rc2
version = 2.0.0
############################################################################################