diff options
author | Walter Bender <walter.bender@gmail.com> | 2012-01-21 16:32:41 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2012-01-21 16:32:41 (GMT) |
commit | 536e8bc53fc83fcc051ae79859bd6912e2260af0 (patch) | |
tree | ff7e793bf6d217218045fb162f1f9f5752ab21fa | |
parent | 1778cd5368d65fbd745210c18e1c91341546b0b8 (diff) |
only enable 1 channel for XO1 audio sensors
-rw-r--r-- | plugins/audio_sensors/audio_sensors.py | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/plugins/audio_sensors/audio_sensors.py b/plugins/audio_sensors/audio_sensors.py index 88e59d4..b168e05 100644 --- a/plugins/audio_sensors/audio_sensors.py +++ b/plugins/audio_sensors/audio_sensors.py @@ -154,18 +154,6 @@ class Audio_sensors(Plugin): help_string=_('microphone input voltage'), value_block=True, prim_name='voltage') - palette.add_block('resistance2', - style='box-style', - label=_('resistance') + '2', - help_string=_('microphone input resistance'), - value_block=True, - prim_name='resistance2') - palette.add_block('voltage2', - style='box-style', - label=_('voltage') + '2', - help_string=_('microphone input voltage'), - value_block=True, - prim_name='voltage2') else: palette.add_block('resistance', hidden=True, @@ -179,13 +167,28 @@ class Audio_sensors(Plugin): label=_('voltage'), help_string=_('microphone input voltage'), prim_name='voltage') - palette.add_block('resistance', + + if self.hw in [XO15, XO175, XO30] and self._status: + palette.add_block('resistance2', + style='box-style', + label=_('resistance') + '2', + help_string=_('microphone input resistance'), + value_block=True, + prim_name='resistance2') + palette.add_block('voltage2', + style='box-style', + label=_('voltage') + '2', + help_string=_('microphone input voltage'), + value_block=True, + prim_name='voltage2') + else: + palette.add_block('resistance2', hidden=True, style='box-style', label=_('resistance') + '2', help_string=_('microphone input resistance'), prim_name='resistance2') - palette.add_block('voltage', + palette.add_block('voltage2', hidden=True, style='box-style', label=_('voltage') + '2', @@ -333,6 +336,8 @@ class Audio_sensors(Plugin): ''' return resistance sensor value ''' if not self.hw in [XO1, XO15, XO175, XO30] or not self._status: return 0 + if self.hw == XO1 and channel != 0: + return 0 buf = self.ringbuffer[channel].read(None, self.input_step) if len(buf) > 0: # See <http://bugs.sugarlabs.org/ticket/552#comment:7> @@ -360,6 +365,8 @@ class Audio_sensors(Plugin): ''' return voltage sensor value ''' if not self.hw in [XO1, XO15, XO175, XO30] or not self._status: return 0 + if self.hw == XO1 and channel != 0: + return 0 buf = self.ringbuffer[channel].read(None, self.input_step) if len(buf) > 0: # See <http://bugs.sugarlabs.org/ticket/552#comment:7> |