commit 7b1fdb9281fb29bd302bedf0d3e6e63863224ea1
author Charlie Mooney <charliemooney@chromium.org> Fri May 08 09:22:55 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu May 14 00:00:07 2015 +0000
tree e8a9bc55472d258c6b7c484f937f080d76d6d63f
parent cfb4a648f81f91350d8d40ed835f4ab8babdc7eb

Robot Support for Two-fat-fingers tracking test

This add robot support for the "Two fat fingers" tests.  These
tests are very similar to the other 2f tracking gestures, so
this patch reuses a lot of the existing code, but just replaces
the fingertips with 14mm probes.

BUG=chromium:474709
TEST=manual

Change-Id: If90af532e4bf6cd11baa3404e625895642df9081
Signed-off-by: Charlie Mooney <charliemooney@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/270049
Reviewed-by: Shyh-In Hwang <josephsih@chromium.org>

gesture_interpreter.py

diff --git a/gesture_interpreter.py b/gesture_interpreter.py
index 8e3a192..8b43ec4 100644
--- a/gesture_interpreter.py
+++ b/gesture_interpreter.py
@@ -17,9 +17,11 @@
 from touchbot import Touchbot
 
 
-NOISE_TESTING_FINGERTIP = '1round_12mm'
 STANDARD_FINGERTIP = '1round_9mm'
 STANDARD_SECONDARY_FINGERTIP = '2round_9mm'
+FAT_FINGERTIP = '1round_14mm'
+FAT_SECONDARY_FINGERTIP = '2round_14mm'
+NOISE_TESTING_FINGERTIP = '1round_12mm'
 
 BUFFER_SIZE = 0.1
 OVERSHOOT_DISTANCE = 0.05
@@ -84,6 +86,7 @@
 TWO_FINGER_LINE_TESTS = [
     tests.TWO_FINGER_TRACKING,
     tests.TWO_CLOSE_FINGERS_TRACKING,
+    tests.TWO_FAT_FINGERS_TRACKING,
 ]
 
 
@@ -125,9 +128,19 @@
     pause = 1 if test.name == tests.ONE_FINGER_TRACKING_FROM_CENTER else 0
     fn = lambda: _PerformOneFingerLineTest(variation, robot, device_spec, pause)
   elif test.name in TWO_FINGER_LINE_TESTS:
-    spacing = 0 if test.name == tests.TWO_CLOSE_FINGERS_TRACKING else 5
+    spacing = 5
+    fingertips = [robot.fingertips[STANDARD_FINGERTIP],
+                  robot.fingertips[STANDARD_SECONDARY_FINGERTIP]]
+
+    if test.name == tests.TWO_CLOSE_FINGERS_TRACKING:
+      spacing = 0
+    elif test.name == tests.TWO_FAT_FINGERS_TRACKING:
+      spacing = 10
+      fingertips = [robot.fingertips[FAT_FINGERTIP],
+                    robot.fingertips[FAT_SECONDARY_FINGERTIP]]
+
     fn = lambda: _PerformTwoFingerLineTest(variation, robot, device_spec,
-                                           spacing_mm=spacing)
+                                           fingertips, spacing)
   elif test.name == tests.RESTING_FINGER_PLUS_2ND_FINGER_MOVE:
     fn = lambda: _PerformRestingFingerTest(variation, robot, device_spec)
   elif test.name == tests.PINCH_TO_ZOOM:
@@ -176,14 +189,12 @@
   robot.PopSpeed()
 
 
-def _PerformTwoFingerLineTest(variation, robot, device_spec, spacing_mm):
+def _PerformTwoFingerLineTest(variation, robot, device_spec, fingertips,
+                              spacing_mm):
   direction, speed = variation
   start, end = LINE_DIRECTION_COORDINATES[direction]
   angle = _ComputePerpendicularAngle(start, end)
 
-  fingertips = [robot.fingertips[STANDARD_FINGERTIP],
-                robot.fingertips[STANDARD_SECONDARY_FINGERTIP]]
-
   robot.PushSpeed(SPEEDS[speed])
   robot.Line(device_spec, fingertips, start, end,
              fingertip_spacing=spacing_mm, fingertip_angle=angle)