Keep config files for old boards in platforms/
These old boards are obsolete and so their overlays were removed in
https://crrev.com/c/2223728, but we still have some useful tests that
simulate their touchpads. To keep those tests working, we just need to
keep their "X.org" configuration files around.
A couple of boards, mario and zgb, weren't being used any more, so I
just deleted those (since otherwise some tests would look for their
config files anyway when building a platform database).
BUG=none
TEST=run `touchtests`, and check that no tests error
Change-Id: I45d2b957dd3563efece02c4f150ae44cf5acee23
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/mttools/+/2264524
Reviewed-by: Jora Jacobi <jora@google.com>
Reviewed-by: Sean O'Brien <seobrien@chromium.org>
Tested-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
diff --git a/platforms/alex-1.0.props b/platforms/alex-1.0.props
index 7227ab1..5d1d875 100644
--- a/platforms/alex-1.0.props
+++ b/platforms/alex-1.0.props
@@ -2,8 +2,8 @@
"gestures": {
},
"xorg": {
- "file": "50-touchpad-cmt-alex.conf",
- "conf_directory": "src/overlays/overlay-x86-alex/chromeos-base/chromeos-bsp-x86-alex/files",
+ "file": "alex.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad alex"]
}
}
diff --git a/platforms/alex-1.1.props b/platforms/alex-1.1.props
index 7227ab1..5d1d875 100644
--- a/platforms/alex-1.1.props
+++ b/platforms/alex-1.1.props
@@ -2,8 +2,8 @@
"gestures": {
},
"xorg": {
- "file": "50-touchpad-cmt-alex.conf",
- "conf_directory": "src/overlays/overlay-x86-alex/chromeos-base/chromeos-bsp-x86-alex/files",
+ "file": "alex.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad alex"]
}
}
diff --git a/platforms/butterfly-1.0.props b/platforms/butterfly-1.0.props
index 6374555..0908dd9 100644
--- a/platforms/butterfly-1.0.props
+++ b/platforms/butterfly-1.0.props
@@ -6,8 +6,8 @@
"Sensor Jump Min Dist Move": 0.6
},
"xorg": {
- "file": "50-touchpad-cmt-butterfly.conf",
- "conf_directory": "src/overlays/overlay-butterfly/chromeos-base/chromeos-bsp-butterfly/files",
+ "file": "butterfly.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad butterfly", "touchpad butterfly cyapa"]
}
}
diff --git a/platforms/link-1.0.props b/platforms/link-1.0.props
index af68613..7356ce8 100644
--- a/platforms/link-1.0.props
+++ b/platforms/link-1.0.props
@@ -6,8 +6,8 @@
"Scroll Y Out Scale": 0.5
},
"xorg": {
- "file": "50-touchpad-cmt-link.conf",
- "conf_directory": "src/overlays/overlay-link/chromeos-base/chromeos-bsp-link/files",
+ "file": "link.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad link", "touchpad link atmel"]
}
}
diff --git a/platforms/lumpy-1.0.props b/platforms/lumpy-1.0.props
index f14039b..f9b5a5a 100644
--- a/platforms/lumpy-1.0.props
+++ b/platforms/lumpy-1.0.props
@@ -3,8 +3,8 @@
"Non-linearity correction data file": "tests/lumpy/lumpy_linearity.dat"
},
"xorg": {
- "file": "50-touchpad-cmt-lumpy.conf",
- "conf_directory": "src/overlays/overlay-lumpy/chromeos-base/chromeos-bsp-lumpy/files",
+ "file": "lumpy.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad lumpy", "touchpad lumpy cyapa"]
}
}
diff --git a/platforms/mario-1.0.hwprops b/platforms/mario-1.0.hwprops
deleted file mode 100644
index fca8108..0000000
--- a/platforms/mario-1.0.hwprops
+++ /dev/null
@@ -1,32 +0,0 @@
-N: SynPS/2-Synaptics-TouchPad
-I: 0011 0002 0007 01b1
-P: 0d 00 00 00 00 00 00 00
-B: 00 0b 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 01 00 00 00 00 00
-B: 01 20 64 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 02 00 00 00 00 00 00 00 00
-B: 03 03 00 00 11 00 80 60 02
-B: 04 00 00 00 00 00 00 00 00
-B: 05 00 00 00 00 00 00 00 00
-B: 11 00 00 00 00 00 00 00 00
-B: 12 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-A: 00 1472 5738 8 0 47
-A: 01 1408 4802 8 0 65
-A: 18 0 255 0 0
-A: 1c 0 15 0 0
-A: 2f 0 1 0 0
-A: 35 1472 5738 8 0 47
-A: 36 1408 4802 8 0 65
-A: 39 0 65535 0 0
diff --git a/platforms/mario-1.0.props b/platforms/mario-1.0.props
deleted file mode 100644
index b6e5f15..0000000
--- a/platforms/mario-1.0.props
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "gestures": {
- "SemiMT Non Linear Area Left": 1217,
- "SemiMT Non Linear Area Right": 5733,
- "SemiMT Non Linear Area Top": 1061,
- "SemiMT Non Linear Area Bottom": 4798
- },
- "xorg": {
- "file": "50-touchpad-cmt-mario.conf",
- "conf_directory": "src/overlays/overlay-x86-mario/chromeos-base/chromeos-bsp-x86-mario/files",
- "identifiers": ["touchpad mario"]
- },
- "ignore": [
- "Active Area Left",
- "Active Area Right",
- "Active Area Top",
- "Active Area Bottom"
- ]
-}
diff --git a/platforms/mario-2.0.hwprops b/platforms/mario-2.0.hwprops
deleted file mode 100644
index c8b297e..0000000
--- a/platforms/mario-2.0.hwprops
+++ /dev/null
@@ -1,33 +0,0 @@
-N: SynPS/2-Synaptics-TouchPad
-I: 0011 0002 0007 01b1
-P: 0d 00 00 00 00 00 00 00
-B: 00 0b 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 01 00 00 00 00 00
-B: 01 20 64 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 02 00 00 00 00 00 00 00 00
-B: 03 03 00 00 11 00 80 60 06
-B: 04 00 00 00 00 00 00 00 00
-B: 05 00 00 00 00 00 00 00 00
-B: 11 00 00 00 00 00 00 00 00
-B: 12 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-A: 00 1472 5516 8 0 46
-A: 01 1408 4544 8 0 62
-A: 18 0 255 0 0 0
-A: 1c 0 15 0 0 0
-A: 2f 0 1 0 0 0
-A: 35 1472 5516 8 0 46
-A: 36 1408 4544 8 0 62
-A: 39 0 65535 0 0 0
-A: 3a 0 255 0 0 0
diff --git a/platforms/mario-2.0.props b/platforms/mario-2.0.props
deleted file mode 100644
index b6e5f15..0000000
--- a/platforms/mario-2.0.props
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "gestures": {
- "SemiMT Non Linear Area Left": 1217,
- "SemiMT Non Linear Area Right": 5733,
- "SemiMT Non Linear Area Top": 1061,
- "SemiMT Non Linear Area Bottom": 4798
- },
- "xorg": {
- "file": "50-touchpad-cmt-mario.conf",
- "conf_directory": "src/overlays/overlay-x86-mario/chromeos-base/chromeos-bsp-x86-mario/files",
- "identifiers": ["touchpad mario"]
- },
- "ignore": [
- "Active Area Left",
- "Active Area Right",
- "Active Area Top",
- "Active Area Bottom"
- ]
-}
diff --git a/platforms/old-board-confs/alex.conf b/platforms/old-board-confs/alex.conf
new file mode 100644
index 0000000..8ef1698
--- /dev/null
+++ b/platforms/old-board-confs/alex.conf
@@ -0,0 +1,33 @@
+# Configure touchpads to use Chromium Multitouch (cmt) X input driver
+Section "InputClass"
+ Identifier "touchpad alex"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "SynPS/2 Synaptics TouchPad"
+ Option "Touchpad Stack Version" "1"
+ Option "Integrated Touchpad" "1"
+ Option "Pressure Calibration Offset" "-42.2"
+ Option "Pressure Calibration Slope" "1.61"
+ Option "Tap Minimum Pressure" "15.0"
+ Option "Input Queue Max Delay" "0.026"
+ Option "Fling Stop Timeout" "0.04"
+ # Bounds overrides:
+ Option "Active Area Left" "1265"
+ Option "Active Area Right" "5678"
+ Option "Active Area Top" "1165"
+ Option "Active Area Bottom" "4689"
+ # Enable Stationary Classifier
+ Option "Stationary Wiggle Filter Enabled" "1"
+ # Disable IIR filter
+ Option "IIR b0" "1"
+ Option "IIR b1" "0"
+ Option "IIR b2" "0"
+ Option "IIR b3" "0"
+ Option "IIR a1" "0"
+ Option "IIR a2" "0"
+ Option "IIR Distance Threshold" "1000"
+ Option "Two Finger Vertical Close Distance Thresh" "35.0"
+ Option "Fling Buffer Suppress Zero Length Scrolls" "0"
+ Option "Pinch Enable" "0"
+EndSection
+
diff --git a/platforms/old-board-confs/butterfly.conf b/platforms/old-board-confs/butterfly.conf
new file mode 100644
index 0000000..4d0eea3
--- /dev/null
+++ b/platforms/old-board-confs/butterfly.conf
@@ -0,0 +1,46 @@
+# Configure touchpads to use Chromium Multitouch (cmt) X input driver
+Section "InputClass"
+ Identifier "touchpad butterfly"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "cyapa"
+ Option "Touchpad Stack Version" "1"
+ Option "Integrated Touchpad" "1"
+ # Disable some causes of delay
+ Option "IIR b0" "1"
+ Option "IIR b1" "0"
+ Option "IIR b2" "0"
+ Option "IIR b3" "0"
+ Option "IIR a1" "0"
+ Option "IIR a2" "0"
+ Option "IIR Distance Threshold" "1000"
+ Option "Two Finger Vertical Close Distance Thresh" "35.0"
+ Option "Fling Buffer Suppress Zero Length Scrolls" "0"
+ Option "Pinch Enable" "0"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad butterfly cyapa"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "cyapa"
+ Option "Integrated Touchpad" "1"
+ Option "Pressure Calibration Offset" "-7.20313156370106"
+ Option "Pressure Calibration Slope" "3.95266938056467"
+ # Extra filters for Cyapa
+ Option "Box Width" "1.0"
+ Option "Box Height" "1.0"
+ Option "Sensor Jump Filter Enable" "1"
+ Option "Sensor Jump Min Dist Move" "0.9"
+ Option "Sensor Jump Similar Multiplier Move" "1.5"
+ Option "Sensor Jump Min Dist Non-Move" "0.3"
+ Option "Adjust IIR History On Warp" "1"
+ Option "Max Allowed Pressure Change Per Sec" "8000"
+ Option "Max Hysteresis Pressure Per Sec" "8000"
+ Option "Delay On Possible Liftoff" "1"
+ Option "Input Queue Max Delay" "0.019"
+ Option "Split Corrector Enabled" "1"
+ Option "Palm Pressure" "250"
+ Option "Pinch Enable" "0"
+EndSection
+
diff --git a/platforms/old-board-confs/link.conf b/platforms/old-board-confs/link.conf
new file mode 100644
index 0000000..211b0c1
--- /dev/null
+++ b/platforms/old-board-confs/link.conf
@@ -0,0 +1,67 @@
+# Configure touchpads to use Chromium Multitouch (cmt) X input driver
+Section "InputClass"
+ Identifier "touchpad link"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "Atmel|cyapa"
+ Option "Touchpad Stack Version" "1"
+ Option "Integrated Touchpad" "1"
+ # Disable some causes of delay
+ Option "IIR b0" "1"
+ Option "IIR b1" "0"
+ Option "IIR b2" "0"
+ Option "IIR b3" "0"
+ Option "IIR a1" "0"
+ Option "IIR a2" "0"
+ Option "IIR Distance Threshold" "1000"
+ # The flexible case can cause accidental physical clicks
+ Option "Zero Finger Click Enable" "0"
+ Option "Two Finger Vertical Close Distance Thresh" "35.0"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad link cyapa"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "cyapa"
+ Option "Pressure Calibration Offset" "-5.2469650828279"
+ Option "Pressure Calibration Slope" "1.7398671681412"
+ # Extra filters for Cyapa
+ Option "Box Width" "1.0"
+ Option "Box Height" "1.0"
+ Option "Sensor Jump Filter Enable" "1"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad link atmel"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "Atmel"
+ Option "Pressure Calibration Offset" "-15.369282490859"
+ Option "Pressure Calibration Slope" "1.3219851012421"
+ # TODO(clchiou): Calibrate bias on X-axis
+ Option "Touchpad Device Output Bias on X-Axis" "26.68917773528923"
+ Option "Touchpad Device Output Bias on Y-Axis" "26.68917773528923"
+ # We see lots of pressure changes under normal use, so raise thresholds
+ Option "Max Allowed Pressure Change Per Sec" "100000.0"
+ Option "Max Hysteresis Pressure Per Sec" "100000.0"
+ # People complain that light tap clicks don't register
+ Option "Tap Minimum Pressure" "21.0"
+ Option "Box Width" "0.3"
+ Option "Box Height" "0.3"
+ # Fix for finger merge issue
+ Option "Finger Merge Filter Enabled" "1"
+ # Fix for finger split issue
+ Option "Split Corrector Enabled" "1"
+ Option "Split Merge Max Separation" "14"
+EndSection
+
+# Not CMT related. This is to enable TouchNoiseFilter on Pixel touchscreen.
+Section "InputClass"
+ Identifier "Atmel touchscreen"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "Atmel"
+ Option "EnableTouchNoiseFilter" "1"
+EndSection
+
diff --git a/platforms/old-board-confs/lumpy.conf b/platforms/old-board-confs/lumpy.conf
new file mode 100644
index 0000000..a7d117a
--- /dev/null
+++ b/platforms/old-board-confs/lumpy.conf
@@ -0,0 +1,59 @@
+# Configure touchpads to use Chromium Multitouch (cmt) X input driver
+Section "InputClass"
+ Identifier "touchpad lumpy"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "Atmel|cyapa"
+ Option "Touchpad Stack Version" "1"
+ Option "Integrated Touchpad" "1"
+ # Disable some causes of delay
+ Option "IIR b0" "1"
+ Option "IIR b1" "0"
+ Option "IIR b2" "0"
+ Option "IIR b3" "0"
+ Option "IIR a1" "0"
+ Option "IIR a2" "0"
+ Option "IIR Distance Threshold" "1000"
+ Option "Two Finger Vertical Close Distance Thresh" "35.0"
+ Option "Fling Buffer Suppress Zero Length Scrolls" "0"
+ Option "Pinch Enable" "0"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad lumpy cyapa"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "cyapa"
+ Option "Pressure Calibration Offset" "-4.0418716653545"
+ Option "Pressure Calibration Slope" "1.9403694168841"
+ # Extra filters for Cyapa
+ Option "Box Width" "1.0"
+ Option "Box Height" "1.0"
+
+ Option "Sensor Jump Filter Enable" "1"
+ Option "Sensor Jump Min Dist Non-Move" "1.0"
+ Option "Sensor Jump Min Dist Move" "1.0"
+ Option "Sensor Jump No Warp Min Dist Move" "0.95"
+
+ Option "Non-linearity correction data file" "/usr/share/gestures/lumpy_linearity.dat"
+ Option "Enable non-linearity correction" "1"
+
+ Option "Split Corrector Enabled" "1"
+ Option "Pinch Enable" "0"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad lumpy atmel"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "Atmel"
+ Option "Pressure Calibration Offset" "-15.369282490859"
+ Option "Pressure Calibration Slope" "1.3219851012421"
+ # TODO(clchiou): Calibrate bias on X-axis
+ Option "Touchpad Device Output Bias on X-Axis" "26.68917773528923"
+ Option "Touchpad Device Output Bias on Y-Axis" "26.68917773528923"
+ # We see lots of pressure changes under normal use, so raise thresholds
+ Option "Max Allowed Pressure Change Per Sec" "100000.0"
+ Option "Max Hysteresis Pressure Per Sec" "100000.0"
+EndSection
+
diff --git a/platforms/old-board-confs/parrot.conf b/platforms/old-board-confs/parrot.conf
new file mode 100644
index 0000000..8ace0c3
--- /dev/null
+++ b/platforms/old-board-confs/parrot.conf
@@ -0,0 +1,41 @@
+# Configure touchpads to use Chromium Multitouch (cmt) X input driver
+Section "InputClass"
+ Identifier "touchpad parrot"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "cyapa"
+ Option "Touchpad Stack Version" "1"
+ Option "Integrated Touchpad" "1"
+ # Disable some causes of delay
+ Option "IIR b0" "1"
+ Option "IIR b1" "0"
+ Option "IIR b2" "0"
+ Option "IIR b3" "0"
+ Option "IIR a1" "0"
+ Option "IIR a2" "0"
+ Option "IIR Distance Threshold" "1000"
+ Option "Fling Buffer Suppress Zero Length Scrolls" "0"
+ Option "Pinch Enable" "0"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad parrot cyapa"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "cyapa"
+ Option "Pressure Calibration Offset" "-13.034105833098"
+ Option "Pressure Calibration Slope" "1.847199617737"
+ # Extra filters for Cyapa
+ Option "Box Width" "1.0"
+ Option "Box Height" "1.0"
+ Option "Sensor Jump Filter Enable" "1"
+ Option "Merge Max Ratio" "0.63"
+ Option "Split Merge Max Movement" "7.1"
+ Option "Max Allowed Pressure Change Per Sec" "4000"
+ Option "Max Hysteresis Pressure Per Sec" "4000"
+ Option "Delay On Possible Liftoff" "1"
+ Option "Input Queue Max Delay" "0.019"
+ Option "Split Corrector Enabled" "1"
+ Option "Pinch Enable" "0"
+EndSection
+
diff --git a/platforms/old-board-confs/stout.conf b/platforms/old-board-confs/stout.conf
new file mode 100644
index 0000000..379a419
--- /dev/null
+++ b/platforms/old-board-confs/stout.conf
@@ -0,0 +1,49 @@
+# Configure touchpads to use Chromium Multitouch (cmt) X input driver
+Section "InputClass"
+ Identifier "touchpad stout"
+ MatchIsTouchpad "on"
+ MatchProduct "SynPS/2 Synaptics TouchPad"
+ MatchDevicePath "/dev/input/event*"
+ Option "Touchpad Stack Version" "1"
+ Option "Integrated Touchpad" "1"
+ Option "Pressure Calibration Offset" "-46.5105265656204"
+ Option "Pressure Calibration Slope" "1.5272358063547"
+ # Bounds overrides:
+ Option "Active Area Left" "1176"
+ Option "Active Area Right" "5767"
+ Option "Active Area Top" "413"
+ Option "Active Area Bottom" "5534"
+ # Resolution overrides:
+ Option "Vertical Resolution" "142"
+ Option "Horizontal Resolution" "62"
+ # Reduce palm detection edge zone
+ Option "Tap Exclusion Border Width" "1"
+ Option "Palm Edge Zone Width" "2"
+ # Disable some causes of delay
+ Option "IIR b0" "1"
+ Option "IIR b1" "0"
+ Option "IIR b2" "0"
+ Option "IIR b3" "0"
+ Option "IIR a1" "0"
+ Option "IIR a2" "0"
+ Option "IIR Distance Threshold" "1000"
+ # Pressure change overrides
+ Option "Max Pressure Change Duration" "0.02"
+ Option "Max Allowed Pressure Change Per Sec" "1200"
+ Option "Max Hysteresis Pressure Per Sec" "1000"
+ # Reduce min. tap pressure
+ Option "Tap Minimum Pressure" "10"
+ # Reduce max. wiggle distance
+ Option "Wiggle Max Distance" "4.0"
+ # Box dimension overrides
+ Option "Box Width" "0.2"
+ Option "Box Height" "0.2"
+ # Enable Stationary Classifier
+ Option "Stationary Wiggle Filter Enabled" "1"
+ # Enable Liftoff Jump Filter
+ Option "Delay On Possible Liftoff" "1"
+ Option "Two Finger Vertical Close Distance Thresh" "35.0"
+ Option "Fling Buffer Suppress Zero Length Scrolls" "0"
+ Option "Pinch Enable" "0"
+EndSection
+
diff --git a/platforms/parrot-1.2.props b/platforms/parrot-1.2.props
index 2e5de73..91dd39b 100644
--- a/platforms/parrot-1.2.props
+++ b/platforms/parrot-1.2.props
@@ -2,8 +2,8 @@
"gestures": {
},
"xorg": {
- "file": "50-touchpad-cmt-parrot.conf",
- "conf_directory": "src/overlays/overlay-parrot/chromeos-base/chromeos-bsp-parrot/files",
+ "file": "parrot.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad parrot", "touchpad parrot cyapa"]
}
}
diff --git a/platforms/stout-1.0.props b/platforms/stout-1.0.props
index 24e88f6..7588ba1 100644
--- a/platforms/stout-1.0.props
+++ b/platforms/stout-1.0.props
@@ -2,8 +2,8 @@
"gestures": {
},
"xorg": {
- "file": "50-touchpad-cmt-stout.conf",
- "conf_directory": "src/overlays/overlay-stout/chromeos-base/chromeos-bsp-stout/files",
+ "file": "stout.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad stout"]
}
}
diff --git a/platforms/stout-1.1.props b/platforms/stout-1.1.props
index 3704f93..9c1a24a 100644
--- a/platforms/stout-1.1.props
+++ b/platforms/stout-1.1.props
@@ -2,8 +2,8 @@
"gestures": {
},
"xorg": {
- "file": "50-touchpad-cmt-stout.conf",
- "conf_directory": "src/overlays/overlay-stout/chromeos-base/chromeos-bsp-stout/files",
+ "file": "stout.conf",
+ "conf_directory": "src/platform/mttools/platforms/old-board-confs",
"identifiers": ["touchpad stout"]
},
"ignore": ["Vertical Resolution", "Horizontal Resolution"]
diff --git a/platforms/zgb-1.0.hwprops b/platforms/zgb-1.0.hwprops
deleted file mode 100644
index 105c0ad..0000000
--- a/platforms/zgb-1.0.hwprops
+++ /dev/null
@@ -1,33 +0,0 @@
-N: SynPS/2-Synaptics-TouchPad
-I: 0011 0002 0007 01b1
-P: 05 00 00 00 00 00 00 00
-B: 00 0b 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 01 00 00 00 00 00
-B: 01 20 e5 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 02 00 00 00 00 00 00 00 00
-B: 03 03 00 00 11 00 80 60 06
-B: 04 00 00 00 00 00 00 00 00
-B: 05 00 00 00 00 00 00 00 00
-B: 11 00 00 00 00 00 00 00 00
-B: 12 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-A: 00 1472 5678 0 0 45
-A: 01 1408 4752 0 0 67
-A: 18 0 255 0 0 0
-A: 1c 0 15 0 0 0
-A: 2f 0 1 0 0 0
-A: 35 1472 5678 0 0 45
-A: 36 1408 4752 0 0 67
-A: 39 0 65535 0 0 0
-A: 3a 0 255 0 0 0
diff --git a/platforms/zgb-1.0.props b/platforms/zgb-1.0.props
deleted file mode 100644
index 5699038..0000000
--- a/platforms/zgb-1.0.props
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "gestures": {
- "SemiMT Non Linear Area Left": 1265,
- "SemiMT Non Linear Area Right": 5678,
- "SemiMT Non Linear Area Top": 1103,
- "SemiMT Non Linear Area Bottom": 4754
- },
- "xorg": {
- "file": "50-touchpad-cmt-zgb.conf",
- "conf_directory": "src/overlays/overlay-x86-zgb/chromeos-base/chromeos-bsp-zgb/files",
- "identifiers": ["touchpad zgb"]
- },
- "ignore": [
- "Active Area Left",
- "Active Area Right",
- "Active Area Top",
- "Active Area Bottom"
- ]
-}
diff --git a/platforms/zgb-1.1.hwprops b/platforms/zgb-1.1.hwprops
deleted file mode 100644
index e631be5..0000000
--- a/platforms/zgb-1.1.hwprops
+++ /dev/null
@@ -1,33 +0,0 @@
-N: SynPS/2-Synaptics-TouchPad
-I: 0011 0002 0007 01b1
-P: 05 00 00 00 00 00 00 00
-B: 00 0b 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 01 00 00 00 00 00
-B: 01 20 e5 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 01 00 00 00 00 00 00 00 00
-B: 02 00 00 00 00 00 00 00 00
-B: 03 03 00 00 11 00 80 60 06
-B: 04 00 00 00 00 00 00 00 00
-B: 05 00 00 00 00 00 00 00 00
-B: 11 00 00 00 00 00 00 00 00
-B: 12 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-B: 15 00 00 00 00 00 00 00 00
-A: 00 1472 5678 0 0 55
-A: 01 1408 4752 0 0 77
-A: 18 0 255 0 0 0
-A: 1c 0 15 0 0 0
-A: 2f 0 1 0 0 0
-A: 35 1472 5678 0 0 55
-A: 36 1408 4752 0 0 77
-A: 39 0 65535 0 0 0
-A: 3a 0 255 0 0 0
diff --git a/platforms/zgb-1.1.props b/platforms/zgb-1.1.props
deleted file mode 100644
index 5699038..0000000
--- a/platforms/zgb-1.1.props
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "gestures": {
- "SemiMT Non Linear Area Left": 1265,
- "SemiMT Non Linear Area Right": 5678,
- "SemiMT Non Linear Area Top": 1103,
- "SemiMT Non Linear Area Bottom": 4754
- },
- "xorg": {
- "file": "50-touchpad-cmt-zgb.conf",
- "conf_directory": "src/overlays/overlay-x86-zgb/chromeos-base/chromeos-bsp-zgb/files",
- "identifiers": ["touchpad zgb"]
- },
- "ignore": [
- "Active Area Left",
- "Active Area Right",
- "Active Area Top",
- "Active Area Bottom"
- ]
-}