diff options
author | Walter Bender <walter@sugarlabs.org> | 2010-11-05 16:29:11 (GMT) |
---|---|---|
committer | Walter Bender <walter@sugarlabs.org> | 2010-11-05 16:29:11 (GMT) |
commit | d1995c224b0fa5279ee80ce78870476525e0670d (patch) | |
tree | 62ee3f2ee4b1efd1ccb2b534d2b5c95aa1aa13e4 | |
parent | e93e33ea9e0f63b1bb84f1fff8f9f857b55776b5 (diff) |
added calibration to resistance and voltage sensors (based upon measurements taken by Tony Forster)
-rw-r--r-- | TurtleArt/talogo.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py index b1c190c..f849760 100644 --- a/TurtleArt/talogo.py +++ b/TurtleArt/talogo.py @@ -488,6 +488,7 @@ class LogoCode: self.input_step = 1 from ringbuffer import RingBuffer1d self.ringbuffer = RingBuffer1d(self.max_samples, dtype='int16') + self.audio_mode = None def _def_prim(self, name, args, fcn, rprim=False): """ Define the primitives associated with the blocks """ @@ -1414,7 +1415,9 @@ class LogoCode: """ return resistance sensor value """ buf = self.ringbuffer.read(None, self.input_step) if len(buf) > 0: - return float(_avg(buf)) + # See <http://bugs.sugarlabs.org/ticket/552#comment:7> + # TODO: test this calibration on XO 1.5 + return 2.718 ** ((float(_avg(buf)) * 0.000045788) + 8.0531) else: return 0 @@ -1422,8 +1425,9 @@ class LogoCode: """ return voltage sensor value """ buf = self.ringbuffer.read(None, self.input_step) if len(buf) > 0: + # See <http://bugs.sugarlabs.org/ticket/552#comment:7> # TODO: test this calibration on XO 1.5 - return float(_avg(buf)) * 0.0000219 + 1.14 + return float(_avg(buf)) * 0.00002225 + 1.140 else: return 0 |