From ccdda7e2e5baf4cadeb2fdc4af143faafa5062b3 Mon Sep 17 00:00:00 2001 From: Matthew Wall Date: Mon, 9 Jun 2014 16:46:07 +0000 Subject: [PATCH] return 0 or 1 for battery status rather than 0,1,2,4,8 --- bin/weewx/drivers/ws28xx.py | 5 +++-- docs/changes.txt | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/weewx/drivers/ws28xx.py b/bin/weewx/drivers/ws28xx.py index 09002fd6..8ad46f31 100644 --- a/bin/weewx/drivers/ws28xx.py +++ b/bin/weewx/drivers/ws28xx.py @@ -867,7 +867,7 @@ import weewx.abstractstation import weewx.units import weewx.wxformulas -DRIVER_VERSION = '0.26' +DRIVER_VERSION = '0.27' # flags for enabling/disabling debug verbosity DEBUG_WRITES = 0 @@ -1420,9 +1420,10 @@ def getFrequencyStandard(frequency): batterybits = { 'wind':0, 'rain':1, 'th':2, 'console':3 } def getBatteryStatus(status, flag): + '''Return 1 if bit is set, 0 otherwise''' bit = batterybits.get(flag) if bit is not None: - return BitHandling.testBit(status, bit) + return 1 if BitHandling.testBit(status, bit) else 0 return None class CWeatherTraits(object): diff --git a/docs/changes.txt b/docs/changes.txt index b25dea4e..baee28b7 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -25,6 +25,8 @@ Fix imagegenerator aggregation to permit data tables with no 'interval' column. Prompt for metric/US units for debian installations. +For WS28xx stations, return 0 for battery ok and 1 for battery failure. + 2.6.3 04/10/14