clean up by Alan

2 files changed, 51 insertions, 105 deletions

diff --git a/plugins/audio_sensors/audio_sensors.py b/plugins/audio_sensors/audio_sensors.py
index 22c8d6d..437f313 100644
--- a/plugins/audio_sensors/audio_sensors.py
+++ b/plugins/audio_sensors/audio_sensors.py
@@ -206,13 +206,7 @@ class Audio_sensors(Plugin):
                       kwarg_descs={'channel': ConstantArg(1)},
                       call_afterwards=self.after_voltage))
 
-        if self.hw in [XO175, XO30, XO4]:
-            self.PARAMETERS = {
-                SENSOR_AC_BIAS: (False, True, 80, True),
-                SENSOR_DC_NO_BIAS: (True, False, 80, False),
-                SENSOR_DC_BIAS: (True, True, 90, False)
-                }
-        elif self.hw == XO15:
+        if self.hw in [XO15, XO175, XO30, XO4]:
             self.PARAMETERS = {
                 SENSOR_AC_BIAS: (False, True, 80, True),
                 SENSOR_DC_NO_BIAS: (True, False, 80, False),
diff --git a/plugins/camera_sensor/camera_sensor.py b/plugins/camera_sensor/camera_sensor.py
index 7006ce2..fd19345 100644
--- a/plugins/camera_sensor/camera_sensor.py
+++ b/plugins/camera_sensor/camera_sensor.py
@@ -77,105 +77,58 @@ class Camera_sensor(Plugin):
 
         SKIN_PATHS.append('plugins/camera_sensor/images')
 
+        hidden = True
+        second_cam = False
         if self._status:
-            sensors_palette.add_block('luminance',
-                                      style='box-style',
-                                      label=_('brightness'),
-                                      help_string=_(
-                    'light level detected by camera'),
-                                      value_block=True,
-                                      prim_name='luminance')
-            self._parent.lc.def_prim(
-                'luminance', 0,
-                Primitive(self.prim_read_camera,
-                          return_type=TYPE_NUMBER,
-                          kwarg_descs={'luminance_only': ConstantArg(True)},
-                          call_afterwards=self.after_luminance))
-
-            # Depreciated block
-            sensors_palette.add_block('read_camera',
-                                      hidden=True,
-                                      style='box-style',
-                                      label=_('brightness'),
-                                      help_string=_(
-                    'Average RGB color from camera \
-is pushed to the stack'),
-                                      value_block=True,
-                                      prim_name='read_camera')
-            self._parent.lc.def_prim(
-                'read_camera', 0,
-                Primitive(self.prim_read_camera,
-                          kwarg_descs={'luminance_only': ConstantArg(False)}))
-
-            media_palette.add_block('camera',
-                                    style='box-style-media',
-                                    label=' ',
-                                    default='CAMERA',
-                                    help_string=_('camera output'),
-                                    content_block=True)
+            hidden = False
             if len(self.devices) > 1:
-                media_palette.add_block('camera1',
-                                        style='box-style-media',
-                                        label=' ',
-                                        default='CAMERA',
-                                        help_string=_('camera output'),
-                                        content_block=True)
-            else:
-                media_palette.add_block('camera1',
-                                        hidden=True,
-                                        style='box-style-media',
-                                        label=' ',
-                                        default='CAMERA',
-                                        help_string=_('camera output'),
-                                        content_block=True)
-
-        else:  # No camera, so blocks should do nothing
-            sensors_palette.add_block('luminance',
-                                      hidden=True,
-                                      style='box-style',
-                                      label=_('brightness'),
-                                      help_string=\
-                                          _('light level detected by camera'),
-                                      value_block=True,
-                                      prim_name='read_camera')
-            self._parent.lc.def_prim(
-                'luminance', 0,
-                Primitive(self.prim_read_camera,
-                          return_type=TYPE_NUMBER,
-                          kwarg_descs={'luminance_only': ConstantArg(True)},
-                          call_afterwards=self.after_luminance))
-
-            # Depreciated block
-            sensors_palette.add_block('read_camera',
-                                      hidden=True,
-                                      style='box-style',
-                                      label=_('brightness'),
-                                      help_string=_(
-                    'Average RGB color from camera \
-is pushed to the stack'),
-                                      value_block=True,
-                                      prim_name='read_camera')
-            self._parent.lc.def_prim(
-                'read_camera', 0,
-                Primitive(self.prim_read_camera,
-                          return_type=TYPE_NUMBER,
-                          kwarg_descs={'luminance_only': ConstantArg(False)}))
-
-            media_palette.add_block('camera',
-                                    hidden=True,
-                                    style='box-style-media',
-                                    label=' ',
-                                    default='CAMERA',
-                                    help_string=_('camera output'),
-                                    content_block=True)
-
-            media_palette.add_block('camera1',
-                                    hidden=True,
-                                    style='box-style-media',
-                                    label=' ',
-                                    default='CAMERA',
-                                    help_string=_('camera output'),
-                                    content_block=True)
+                second_cam = True
+
+        sensors_palette.add_block('luminance',
+                                  hidden=hidden,
+                                  style='box-style',
+                                  label=_('brightness'),
+                                  help_string=
+                                      _('light level detected by camera'),
+                                  value_block=True,
+                                  prim_name='luminance')
+        self._parent.lc.def_prim(
+            'luminance', 0,
+            Primitive(self.prim_read_camera,
+                      return_type=TYPE_NUMBER,
+                      kwarg_descs={'luminance_only': ConstantArg(True)},
+                      call_afterwards=self.after_luminance))
+
+        media_palette.add_block('camera',
+                                hidden=hidden,
+                                style='box-style-media',
+                                label=' ',
+                                default='CAMERA',
+                                help_string=_('camera output'),
+                                content_block=True)
+
+        media_palette.add_block('camera1',
+                                hidden=not(second_cam),
+                                style='box-style-media',
+                                label=' ',
+                                default='CAMERA',
+                                help_string=_('camera output'),
+                                content_block=True)
+
+        # Depreciated block
+        sensors_palette.add_block('read_camera',
+                                  hidden=True,
+                                  style='box-style',
+                                  label=_('brightness'),
+                                  help_string=_(
+                        'Average RGB color from camera is pushed to the stack'),
+                                  value_block=True,
+                                  prim_name='read_camera')
+        self._parent.lc.def_prim(
+            'read_camera', 0,
+            Primitive(self.prim_read_camera,
+                      return_type=TYPE_NUMBER,
+                      kwarg_descs={'luminance_only': ConstantArg(False)}))
 
         NO_IMPORT.append('camera')
         BLOCKS_WITH_SKIN.append('camera')
@@ -243,7 +196,6 @@ is pushed to the stack'),
                 self._parent.lc.heap.append(-1)
                 self._parent.lc.heap.append(-1)
                 return
-
         array = None
         self._set_autogain(0, camera=camera)  # disable AUTOGAIN
         self._get_pixbuf_from_camera(camera=camera)