add test for XO30 and adjust Motion Threshold

3 files changed, 11 insertions, 5 deletions

diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 0eb382d..a7588bc 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -73,6 +73,7 @@ DEFAULT_SCALE = 33
 XO1 = 'xo1'
 XO15 = 'xo1.5'
 XO175 = 'xo1.75'
+XO30 = 'xo3.0'
 UNKNOWN = 'unknown'
 
 CONSTANTS = {'leftpos': None, 'toppos': None, 'rightpos': None,
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index 36ecb3c..97b396d 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -42,7 +42,7 @@ except (ImportError, AttributeError):
 from StringIO import StringIO
 
 from taconstants import COLLAPSIBLE, HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, \
-    UNKNOWN
+    XO30, UNKNOWN
 
 SANDWICHES = ['sandwichtop', 'sandwichtop_no_label', 'sandwichtop_no_arm',
               'sandwichtop_no_arm_no_label']
@@ -809,7 +809,7 @@ def get_hardware():
     product = _get_dmi('product_name')
     if product is None:
         if os.path.exists('/sys/devices/platform/lis3lv02d/position'):
-            return XO175  # FIXME: temporary check for XO 1.75
+            return XO175  # FIXME: temporary check for XO 1.75 and XO 3.0
         elif os.path.exists('/etc/olpc-release') or \
            os.path.exists('/sys/power/olpc-pm'):
             return XO1
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 48d9acc..36628d8 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -49,7 +49,7 @@ from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \
     MACROS, TOP_LAYER, BLOCK_LAYER, OLD_NAMES, DEFAULT_TURTLE, TURTLE_LAYER, \
     CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \
     TEMPLATES, PYTHON_SKIN, PALETTE_HEIGHT, STATUS_LAYER, OLD_DOCK, \
-    EXPANDABLE_ARGS, XO1, XO15, XO175, TITLEXY, CONTENT_ARGS, \
+    EXPANDABLE_ARGS, XO1, XO15, XO175, XO30, TITLEXY, CONTENT_ARGS, \
     CONSTANTS, EXPAND_SKIN
 from tapalette import palette_names, palette_blocks, expandable_blocks, \
     block_names, content_blocks, default_values, special_names, block_styles, \
@@ -73,7 +73,7 @@ from sprites import Sprites, Sprite
 if GST_AVAILABLE:
     from tagplay import stop_media
 
-MOTION_THRESHOLD = 4
+MOTION_THRESHOLD = 6
 
 
 class TurtleArtWindow():
@@ -208,6 +208,11 @@ class TurtleArtWindow():
             self.sprite_list = None
 
         self.canvas = TurtleGraphics(self, self.width, self.height)
+        '''
+        # If and when we need this...
+        if self.hw == XO175 and self.canvas.width == 1024:
+            self.hw = XO30  # FIXME: temporary test
+        '''
         if self.interactive_mode:
             self.sprite_list.set_cairo_context(self.canvas.canvas)
 
@@ -1734,7 +1739,7 @@ class TurtleArtWindow():
         # Find the block we clicked on and process it.
         # Consider a very small move a click (for touch interfaces)
         if self.block_operation == 'click' or \
-           (self.hw == XO175 and self.block_operation == 'move' and (
+           (self.hw in [XO175, XO30] and self.block_operation == 'move' and (
                 abs(self.dx) < MOTION_THRESHOLD and \
                 abs(self.dy < MOTION_THRESHOLD))):
             self._click_block(x, y)