Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2012-06-03 13:33:56 (GMT)
committer Walter Bender <walter.bender@gmail.com>2012-06-03 13:33:56 (GMT)
commit88e29e62e4ca69e9b08410d9bbeb23cfb6b27c5f (patch)
treec3bb9b5467a5e66666b2016f2d8b31c4624c7a62 /plugins
parentd791e764e51353e18efa2464cd623d4d0a91153f (diff)
more robust bounds checking for resistance sensors
Diffstat (limited to 'plugins')
-rw-r--r--plugins/audio_sensors/audio_sensors.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/audio_sensors/audio_sensors.py b/plugins/audio_sensors/audio_sensors.py
index 978a17d..0662acb 100644
--- a/plugins/audio_sensors/audio_sensors.py
+++ b/plugins/audio_sensors/audio_sensors.py
@@ -354,13 +354,21 @@ class Audio_sensors(Plugin):
else:
resistance = 420000000
elif self.hw == XO175:
- return (180000000 / (30700 - avg_buf)) - 3150
+ if avg_buf < 30700:
+ return (180000000 / (30700 - avg_buf)) - 3150
+ else:
+ resistance = 999999999
else: # XO 3.0
- return (46000000 / (30514 - avg_buf)) - 1150
+ if avg_buf < 30514:
+ return (46000000 / (30514 - avg_buf)) - 1150
+ else:
+ resistance = 999999999
if channel == 0:
self._parent.lc.update_label_value('resistance', resistance)
else:
self._parent.lc.update_label_value('resistance2', resistance)
+ if resistance < 0:
+ resistance = 0
return resistance
else:
return 0