T-Cell

Merge lp:~cypressyew/t-cell/touchpad-detect into lp:t-cell

  1. touchpad-detect
  2. Merge into trunk
Proposed by Po-Hsu Lin
Status: Merged
Approved by: Po-Hsu Lin
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~cypressyew/t-cell/touchpad-detect
Merge into: lp:t-cell
Diff against target: 132 lines (+42/-2)
7 files modified
RunMe.py (+14/-2)
precise-3.11-bug.json (+3/-0)
precise-3.13-bug.json (+5/-0)
precise-3.5-bug.json (+3/-0)
precise-3.8-bug.json (+3/-0)
trusty-3.13-bug.json (+7/-0)
trusty-3.16-bug.json (+7/-0)
To merge this branch: bzr merge lp:~cypressyew/t-cell/touchpad-detect
Reviewer Review Type Date Requested Status
Po-Hsu Lin Approve
Review via email: mp+267372@code.launchpad.net

Description of the change

Add a better method to lookup touchpad bugs, also have database updated.

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Self approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'RunMe.py'
2--- RunMe.py 2015-08-06 08:17:51 +0000
3+++ RunMe.py 2015-08-07 15:57:49 +0000
4@@ -40,9 +40,20 @@
5 printer("Synaptics Touchpad", "1384042", "Input")
6
7
8+def parser_input():
9+ """Return devices found in /proc/bus/input/devices."""
10+ data = subprocess.check_output("cat /proc/bus/input/devices | sed -n 's/I: //p'", shell=True)
11+ data = re.sub('Vendor=', 'input-', data)
12+ data = re.sub(' Product=', ':', data)
13+# No Subsystem in input, but added here to retain consistency with PCIdev
14+ result = re.finditer('\w+ (?P<COMP>input-\w+:\w+) Version=(?P<REV>\w{4})'
15+ '(.+(?P<SUB>Subsystem-\w+:\w+))?', data)
16+ return result
17+
18+
19 def parser_usb():
20 """Return devices found in usb-devices command."""
21- data = subprocess.check_output("usb-devices", shell=True)
22+ data = subprocess.check_output("usb-devices", shell=False)
23 data = re.sub('Vendor=', 'usb-', data)
24 data = re.sub(' ProdID=', ':', data)
25 # No Subsystem in USB, but added here to retain consistency with PCIdev
26@@ -104,10 +115,11 @@
27 print('Checking touchpad/mouse')
28 xinput_detect()
29 print('Scanning components...')
30+ INPdev = parser_input()
31 USBdev = parser_usb()
32 PCIdev = parser_pci()
33 PNPdev = parser_pnp()
34- ALLdev = chain(USBdev, PCIdev, PNPdev)
35+ ALLdev = chain(INPdev, USBdev, PCIdev, PNPdev)
36 SUBtmp = []
37 print('Loading database...')
38 with open(fn, 'r') as database:
39
40=== modified file 'precise-3.11-bug.json'
41--- precise-3.11-bug.json 2014-12-17 11:06:58 +0000
42+++ precise-3.11-bug.json 2015-08-07 15:57:49 +0000
43@@ -35,6 +35,9 @@
44 },
45 "Ethernet": {
46 },
47+ "Touchpad": {
48+ "input-0002:000e": ["1188025"]
49+ },
50 "VideoCard": {
51 "pci-1002:9903": ["1204339","1288189"],
52 "pci-1002:9648": ["1243621","1243648","1243508"],
53
54=== modified file 'precise-3.13-bug.json'
55--- precise-3.13-bug.json 2015-02-06 06:45:34 +0000
56+++ precise-3.13-bug.json 2015-08-07 15:57:49 +0000
57@@ -24,6 +24,11 @@
58 "pci-1217:8520": ["1239938"],
59 "pci-10ec:5208": ["1233602"]
60 },
61+ "Touchpad": {
62+ "input-0002:000e": ["1188025"],
63+ "input-0002:0008": ["1337199"],
64+ "input-0002:0011": ["1218166"]
65+ },
66 "VideoCard": {
67 "pci-1002:6771": ["1271483"],
68 "pci-1002:677b": ["1356277"],
69
70=== modified file 'precise-3.5-bug.json'
71--- precise-3.5-bug.json 2014-12-17 11:06:58 +0000
72+++ precise-3.5-bug.json 2015-08-07 15:57:49 +0000
73@@ -32,6 +32,9 @@
74 "pci-1969:1090": ["927782"],
75 "pci-1969:1091": ["927782"]
76 },
77+ "Touchpad": {
78+ "input-0002:000e": ["1188025"]
79+ },
80 "VideoCard": {
81 "pci-1002:9808": ["1133980"],
82 "pci-1002:9809": ["1133980"],
83
84=== modified file 'precise-3.8-bug.json'
85--- precise-3.8-bug.json 2014-12-17 11:06:58 +0000
86+++ precise-3.8-bug.json 2015-08-07 15:57:49 +0000
87@@ -77,6 +77,9 @@
88 "pci-1969:1090": ["1234594"],
89 "pci-1969:1091": ["1234594"]
90 },
91+ "Touchpad": {
92+ "input-0002:000e": ["1188025"]
93+ },
94 "VideoCard": {
95 "pci-1002:9648": ["1243621", "1243648", "1243508"],
96 "pci-1002:9991": ["1249892"],
97
98=== modified file 'trusty-3.13-bug.json'
99--- trusty-3.13-bug.json 2015-08-05 11:26:39 +0000
100+++ trusty-3.13-bug.json 2015-08-07 15:57:49 +0000
101@@ -26,6 +26,13 @@
102 },
103 "Ethernet": {
104 },
105+ "Touchpad": {
106+ "input-0002:0007": ["1384042"],
107+ "input-0002:0008": ["1337199"],
108+ "input-0002:000e": ["1188025"],
109+ "input-0002:0011": ["1218166"],
110+ "input-06cb:2985": ["1434367", "1436137"]
111+ },
112 "Touchscreen": {
113 "usb-28c8:0001": ["1340110"]
114 },
115
116=== modified file 'trusty-3.16-bug.json'
117--- trusty-3.16-bug.json 2015-08-06 03:52:07 +0000
118+++ trusty-3.16-bug.json 2015-08-07 15:57:49 +0000
119@@ -21,6 +21,13 @@
120 },
121 "Ethernet": {
122 },
123+ "Touchpad": {
124+ "input-0002:0007": ["1384042"],
125+ "input-0002:0008": ["1337199"],
126+ "input-0002:0011": ["1218166"],
127+ "input-06cb:75bd": ["1481266"],
128+ "input-06cb:7622": ["1481266"]
129+ },
130 "Touchscreen": {
131 "usb-28c8:0001": ["1340110"]
132 },

Subscribers

People subscribed via source and target branches

to all changes: