Skip to content

Commit

Permalink
Merge branch 'develop' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-slx committed Oct 3, 2020
2 parents 70d8f80 + 9649574 commit 1ac6221
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/user/weatherlink_live/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from weewx.engine import InitializationError

DRIVER_NAME = "WeatherLinkLive"
DRIVER_VERSION = "1.0.1"
DRIVER_VERSION = "1.0.2"

log = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion bin/user/weatherlink_live/mappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def _do_mapping(self, packet: DavisConditionsPacket, record: dict):
self._set_record_entry(record, target_amount, self._multiply(current_daily_rain_count, rain_bucket_factor))

else:
count_diff = self.last_daily_rain_count - current_daily_rain_count
count_diff = current_daily_rain_count - self.last_daily_rain_count
self._set_record_entry(record, target_count, count_diff)
self._set_record_entry(record, target_amount, self._multiply(count_diff, rain_bucket_factor))

Expand Down
8 changes: 7 additions & 1 deletion changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,10 @@ The driver only uses it for the rate of the rain collector spoon tripping.
- Improve closing of UDP broadcast receiver
- Make rain mapping and wind service `None`-safe
- Convert all caught errors in driver to `InitializationError ` and `WeeWxIOError `. This improves integration with WeeWX's automatic retries.
- Minor refactoring
- Minor refactoring

## Version 1.0.2

- **Fix incorrect rain diff calculation**
Previous amount needs to be subtracted from the current amount, not
vice-versa.
2 changes: 1 addition & 1 deletion install.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class WeatherLinkLiveInstaller(ExtensionInstaller):
def __init__(self):
super(WeatherLinkLiveInstaller, self).__init__(
name='weatherlink-live',
version="1.0.1",
version="1.0.2",
description='WeeWX driver for Davis WeatherLink Live.',
author="Michael Schantl",
author_email="[email protected]",
Expand Down

0 comments on commit 1ac6221

Please sign in to comment.