Move touch action definitions to shared repo
BUG=b:148627899
TEST=Run tests and view analysis results
Cq-Depend: chromium:2842563
Change-Id: I92f3d947b4d1c3c8ad59252d1d28e38dd2e7dd4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/optofidelity_chromeos_touch_sender/+/2842185
Commit-Queue: Sean O'Brien <seobrien@chromium.org>
Tested-by: Sean O'Brien <seobrien@chromium.org>
Reviewed-by: Harry Cutts <hcutts@chromium.org>
diff --git a/OptoFidelity_Touch_Test/chromeos_tester/eventsenders.py b/OptoFidelity_Touch_Test/chromeos_tester/eventsenders.py
index dc95df5..34845db 100644
--- a/OptoFidelity_Touch_Test/chromeos_tester/eventsenders.py
+++ b/OptoFidelity_Touch_Test/chromeos_tester/eventsenders.py
@@ -13,10 +13,10 @@
from evdev import ecodes
from threading import Lock
-from optofidelity_protocols.dut import Measurement, DUTConfig, Axis
+from optofidelity_protocols.dut import Action, Axis, DUTConfig, Measurement
from .event import MtEvent
-from .state_machine import (Action, MtFinger, MtSnapshot,
- MtbStateMachine, StylusStateMachine)
+from .state_machine import (MtFinger, MtSnapshot, MtbStateMachine,
+ StylusStateMachine)
from .sockethandler import SocketHandler
from .guihandler import JavascriptGUI
from .util import devicechooser
diff --git a/OptoFidelity_Touch_Test/chromeos_tester/state_machine.py b/OptoFidelity_Touch_Test/chromeos_tester/state_machine.py
index 793b586..e3e8841 100644
--- a/OptoFidelity_Touch_Test/chromeos_tester/state_machine.py
+++ b/OptoFidelity_Touch_Test/chromeos_tester/state_machine.py
@@ -3,9 +3,9 @@
# found in the LICENSE_chromiumos file.
import math
from collections import namedtuple
-from enum import IntEnum
from .event import MtEvent
from evdev.ecodes import EV_ABS, ABS_MT_TRACKING_ID
+from optofidelity_protocols.dut import Action
MtFinger = namedtuple('MtFinger', ['tid', 'syn_time', 'x', 'y', 'pressure',
@@ -14,16 +14,6 @@
MtSnapshot = namedtuple('MtSnapshot', ['syn_time', 'button_pressed',
'fingers', 'raw_events'])
-class Action(IntEnum):
- """ Touch actions """
- DOWN = 0
- UP = 1
- MOVE = 2
- CANCEL = 3
- HOVER_DOWN = 9
- HOVER_MOVE = 7
- HOVER_UP = 10
-
class MtStateMachine(object):
""" This is an abstract base class that defines the interface of a multitouch
state machine. This class should never be instantiated directly, but rather
diff --git a/OptoFidelity_Touch_Test/optofidelity_protocols b/OptoFidelity_Touch_Test/optofidelity_protocols
index de0f039..a5f60b2 160000
--- a/OptoFidelity_Touch_Test/optofidelity_protocols
+++ b/OptoFidelity_Touch_Test/optofidelity_protocols
@@ -1 +1 @@
-Subproject commit de0f039db20a1b2cf3a439be7633d9076b96afe5
+Subproject commit a5f60b2f9bcd417a71ecbd8f82e93f74adb817eb
