diff --git a/bin/weewx/VantagePro.py b/bin/weewx/VantagePro.py index 70b5a656..d38ce067 100644 --- a/bin/weewx/VantagePro.py +++ b/bin/weewx/VantagePro.py @@ -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)) diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py index 5a9e477c..aedd3cf3 100644 --- a/bin/weewx/__init__.py +++ b/bin/weewx/__init__.py @@ -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.' diff --git a/docs/upgrading.htm b/docs/upgrading.htm index c53b51be..f0df1d01 100644 --- a/docs/upgrading.htm +++ b/docs/upgrading.htm @@ -23,21 +23,25 @@
What follows are directions for upgrading from specific versions.
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, -skin.conf.
-If you have written a custom report generator it should also be backwards -compatible.
-However, the main configuration file, weewx.conf, -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.
-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:
+All skins should be completely backwards compatible, so you +should not have to change your templates or skin configuration file, +skin.conf.
+If you have written a custom report generator it should also be backwards +compatible.
Version 1.14 introduces some new webpages that have been expressly formatted for the smartphone by using jQuery.
diff --git a/skins/Standard/skin.conf b/skins/Standard/skin.conf index 4198e762..6bb69243 100644 --- a/skins/Standard/skin.conf +++ b/skins/Standard/skin.conf @@ -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 diff --git a/weewx.conf b/weewx.conf index 95b4c1de..fbd14b32 100644 --- a/weewx.conf +++ b/weewx.conf @@ -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 ############################################################################################