Commit 2bb8d48
fwk: input_module: Allow full-width module in any location
Fixes: fwk-main 20999ff
Fixes: fwk-tulip-29169 d98acb5
The existing logic goes through the top-row pogos from left to right and
skips the ones that are covered.
This does not work with a full-width inputmodule that is not connected to the left-most pogo.
I didn't consider that the full-width module can have its connector on any of the pogos, because all of our official modules have them on the very left of the module.
Customers are building modules and reporting issues.
Add another loop that goes through every connector and returns true if
a full-width module is connected to any pogo.
To keep the logic simple, I also moved the touchpad check to the
beginning, then the last loop can just return.
> framework_tool --inputdeck
Chassis Closed: true
Input Deck State: On
Touchpad present: true
SLEEP# GPIO high: true
Positions:
Pos 0: Disconnected
Pos 1: FullWidth
Pos 2: Disconnected
Pos 3: Disconnected
Pos 4: Disconnected
ec:~> inputdeck
Deck state: ON
C-Deck status 0 = 15 2813 mV [X - - - -] [Disconnected]
C-Deck status 1 = 6 907 mV [- X - - -] [Generic Full Width]
C-Deck status 2 = 15 2813 mV [- - X - -] [Disconnected]
C-Deck status 3 = 15 2813 mV [- - - X -] [Disconnected]
C-Deck status 4 = 15 2813 mV [- - - - X] [Disconnected]
C-Deck status 5 = 13 2505 mV [Touchpad ] [Touchpad]
C-Deck status 6 = 15 2813 mV [Toprow disc.] [Disconnected]
C-Deck status 7 = 15 2813 mV [Hubboard ] [Disconnected]
Input module Overcurrent Events: 0
BRANCH=fwk-tulip-29169
BUG=Full-width input module connected not to left-most pogo does not enable input deck power
TEST=Keyboard/touchpad works with full-width inputmodule connected
TEST=`framework_tool --inputdeck`
TEST=EC console `inputdeck` command
Signed-off-by: Daniel Schaefer <dhs@frame.work>1 parent d2be67b commit 2bb8d48
1 file changed
Lines changed: 21 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
126 | 127 | | |
127 | 128 | | |
128 | 129 | | |
129 | 130 | | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
130 | 151 | | |
131 | 152 | | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | 153 | | |
136 | 154 | | |
137 | 155 | | |
| |||
148 | 166 | | |
149 | 167 | | |
150 | 168 | | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | 169 | | |
156 | 170 | | |
157 | 171 | | |
| |||
0 commit comments