Mercurial > louis > kiibohd-controller
annotate Scan/MatrixARM/matrix_scan.c @ 440:94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
author | CryHam <cryham@gmail.com> |
---|---|
date | Sun, 08 May 2016 09:31:48 +0200 |
parents | ac7a07c54b70 |
children | b61ee829f278 |
rev | line source |
---|---|
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
1 /* Copyright (C) 2014-2016 by Jacob Alexander |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
2 * |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
3 * Permission is hereby granted, free of charge, to any person obtaining a copy |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
4 * of this software and associated documentation files (the "Software"), to deal |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
5 * in the Software without restriction, including without limitation the rights |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
6 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
7 * copies of the Software, and to permit persons to whom the Software is |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
8 * furnished to do so, subject to the following conditions: |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
9 * |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
10 * The above copyright notice and this permission notice shall be included in |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
11 * all copies or substantial portions of the Software. |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
12 * |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
13 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
14 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
15 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
16 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
17 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
18 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
19 * THE SOFTWARE. |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
20 */ |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
21 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
22 // ----- Includes ----- |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
23 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
24 // Compiler Includes |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
25 #include <Lib/ScanLib.h> |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
26 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
27 // Project Includes |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
28 #include <cli.h> |
357
86b937945313
Fixing CMake dependency checking for kll_defs.h
Jacob Alexander <haata@kiibohd.com>
parents:
343
diff
changeset
|
29 #include <kll_defs.h> |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
30 #include <led.h> |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
31 #include <print.h> |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
32 #include <macro.h> |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
33 #include <Lib/delay.h> |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
34 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
35 // Local Includes |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
36 #include "matrix_scan.h" |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
37 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
38 // Matrix Configuration |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
39 #include <matrix.h> |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
40 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
41 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
42 |
299
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
43 // ----- Defines ----- |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
44 |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
45 #if ( DebounceThrottleDiv_define > 0 ) |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
46 nat_ptr_t Matrix_divCounter = 0; |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
47 #endif |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
48 |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
49 |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
50 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
51 // ----- Function Declarations ----- |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
52 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
53 // CLI Functions |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
54 void cliFunc_matrixDebug( char* args ); |
431
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
55 void cliFunc_matrixInfo( char* args ); |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
56 void cliFunc_matrixState( char* args ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
57 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
58 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
59 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
60 // ----- Variables ----- |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
61 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
62 // Scan Module command dictionary |
239
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
63 CLIDict_Entry( matrixDebug, "Enables matrix debug mode, prints out each scan code." NL "\t\tIf argument \033[35mT\033[0m is given, prints out each scan code state transition." ); |
431
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
64 CLIDict_Entry( matrixInfo, "Print info about the configured matrix." ); |
239
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
65 CLIDict_Entry( matrixState, "Prints out the current scan table N times." NL "\t\t \033[1mO\033[0m - Off, \033[1;33mP\033[0m - Press, \033[1;32mH\033[0m - Hold, \033[1;35mR\033[0m - Release, \033[1;31mI\033[0m - Invalid" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
66 |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
67 CLIDict_Def( matrixCLIDict, "Matrix Module Commands" ) = { |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
68 CLIDict_Item( matrixDebug ), |
431
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
69 CLIDict_Item( matrixInfo ), |
239
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
70 CLIDict_Item( matrixState ), |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
71 { 0, 0, 0 } // Null entry for dictionary end |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
72 }; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
73 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
74 // Debounce Array |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
75 KeyState Matrix_scanArray[ Matrix_colsNum * Matrix_rowsNum ]; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
76 |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
77 // Ghost Arrays |
416 | 78 #ifdef GHOSTING_MATRIX |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
79 KeyGhost Matrix_ghostArray[ Matrix_colsNum * Matrix_rowsNum ]; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
80 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
81 uint8_t col_use[Matrix_colsNum], row_use[Matrix_rowsNum]; // used count |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
82 uint8_t col_ghost[Matrix_colsNum], row_ghost[Matrix_rowsNum]; // marked as having ghost if 1 |
440
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
83 uint8_t col_ghost_old[Matrix_colsNum], row_ghost_old[Matrix_rowsNum]; // old ghost state |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
84 #endif |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
85 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
86 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
87 // Matrix debug flag - If set to 1, for each keypress the scan code is displayed in hex |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
88 // If set to 2, for each key state change, the scan code is displayed along with the state |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
89 uint8_t matrixDebugMode = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
90 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
91 // Matrix State Table Debug Counter - If non-zero display state table after every matrix scan |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
92 uint16_t matrixDebugStateCounter = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
93 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
94 // Matrix Scan Counters |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
95 uint16_t matrixMaxScans = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
96 uint16_t matrixCurScans = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
97 uint16_t matrixPrevScans = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
98 |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
99 // System Timer used for delaying debounce decisions |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
100 extern volatile uint32_t systick_millis_count; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
101 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
102 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
103 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
104 // ----- Functions ----- |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
105 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
106 // Pin action (Strobe, Sense, Strobe Setup, Sense Setup) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
107 // NOTE: This function is highly dependent upon the organization of the register map |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
108 // Only guaranteed to work with Freescale MK20 series uCs |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
109 uint8_t Matrix_pin( GPIO_Pin gpio, Type type ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
110 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
111 // Register width is defined as size of a pointer |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
112 unsigned int gpio_offset = gpio.port * 0x40 / sizeof(unsigned int*); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
113 unsigned int port_offset = gpio.port * 0x1000 / sizeof(unsigned int*) + gpio.pin; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
114 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
115 // Assumes 0x40 between GPIO Port registers and 0x1000 between PORT pin registers |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
116 // See Lib/mk20dx.h |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
117 volatile unsigned int *GPIO_PDDR = (unsigned int*)(&GPIOA_PDDR) + gpio_offset; |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
118 #ifndef GHOSTING_MATRIX |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
119 volatile unsigned int *GPIO_PSOR = (unsigned int*)(&GPIOA_PSOR) + gpio_offset; |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
120 #endif |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
121 volatile unsigned int *GPIO_PCOR = (unsigned int*)(&GPIOA_PCOR) + gpio_offset; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
122 volatile unsigned int *GPIO_PDIR = (unsigned int*)(&GPIOA_PDIR) + gpio_offset; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
123 volatile unsigned int *PORT_PCR = (unsigned int*)(&PORTA_PCR0) + port_offset; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
124 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
125 // Operation depends on Type |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
126 switch ( type ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
127 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
128 case Type_StrobeOn: |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
129 #ifdef GHOSTING_MATRIX |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
130 *GPIO_PCOR |= (1 << gpio.pin); |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
131 *GPIO_PDDR |= (1 << gpio.pin); // output, low |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
132 #else |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
133 *GPIO_PSOR |= (1 << gpio.pin); |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
134 #endif |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
135 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
136 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
137 case Type_StrobeOff: |
416 | 138 #ifdef GHOSTING_MATRIX |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
139 // Ghosting martix needs to put not used (off) strobes in high impedance state |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
140 *GPIO_PDDR &= ~(1 << gpio.pin); // input, high Z state |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
141 #endif |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
142 *GPIO_PCOR |= (1 << gpio.pin); |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
143 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
144 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
145 case Type_StrobeSetup: |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
146 #ifdef GHOSTING_MATRIX |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
147 *GPIO_PDDR &= ~(1 << gpio.pin); // input, high Z state |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
148 *GPIO_PCOR |= (1 << gpio.pin); |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
149 #else |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
150 // Set as output pin |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
151 *GPIO_PDDR |= (1 << gpio.pin); |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
152 #endif |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
153 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
154 // Configure pin with slow slew, high drive strength and GPIO mux |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
155 *PORT_PCR = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1); |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
156 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
157 // Enabling open-drain if specified |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
158 switch ( Matrix_type ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
159 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
160 case Config_Opendrain: |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
161 *PORT_PCR |= PORT_PCR_ODE; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
162 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
163 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
164 // Do nothing otherwise |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
165 default: |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
166 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
167 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
168 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
169 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
170 case Type_Sense: |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
171 #ifdef GHOSTING_MATRIX // inverted |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
172 return *GPIO_PDIR & (1 << gpio.pin) ? 0 : 1; |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
173 #else |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
174 return *GPIO_PDIR & (1 << gpio.pin) ? 1 : 0; |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
175 #endif |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
176 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
177 case Type_SenseSetup: |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
178 // Set as input pin |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
179 *GPIO_PDDR &= ~(1 << gpio.pin); |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
180 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
181 // Configure pin with passive filter and GPIO mux |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
182 *PORT_PCR = PORT_PCR_PFE | PORT_PCR_MUX(1); |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
183 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
184 // Pull resistor config |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
185 switch ( Matrix_type ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
186 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
187 case Config_Pullup: |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
188 *PORT_PCR |= PORT_PCR_PE | PORT_PCR_PS; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
189 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
190 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
191 case Config_Pulldown: |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
192 *PORT_PCR |= PORT_PCR_PE; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
193 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
194 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
195 // Do nothing otherwise |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
196 default: |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
197 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
198 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
199 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
200 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
201 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
202 return 0; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
203 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
204 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
205 // Setup GPIO pins for matrix scanning |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
206 void Matrix_setup() |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
207 { |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
208 // Register Matrix CLI dictionary |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
209 CLI_registerDictionary( matrixCLIDict, matrixCLIDictName ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
210 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
211 // Setup Strobe Pins |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
212 for ( uint8_t pin = 0; pin < Matrix_colsNum; pin++ ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
213 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
214 Matrix_pin( Matrix_cols[ pin ], Type_StrobeSetup ); |
440
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
215 col_use[pin] = 0; |
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
216 col_ghost[pin] = 0; |
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
217 col_ghost_old[pin] = 0; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
218 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
219 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
220 // Setup Sense Pins |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
221 for ( uint8_t pin = 0; pin < Matrix_rowsNum; pin++ ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
222 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
223 Matrix_pin( Matrix_rows[ pin ], Type_SenseSetup ); |
440
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
224 row_use[pin] = 0; |
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
225 row_ghost[pin] = 0; |
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
226 row_ghost_old[pin] = 0; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
227 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
228 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
229 // Clear out Debounce Array |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
230 for ( uint8_t item = 0; item < Matrix_maxKeys; item++ ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
231 { |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
232 Matrix_scanArray[ item ].prevState = KeyState_Off; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
233 Matrix_scanArray[ item ].curState = KeyState_Off; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
234 Matrix_scanArray[ item ].activeCount = 0; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
235 Matrix_scanArray[ item ].inactiveCount = DebounceDivThreshold_define; // Start at 'off' steady state |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
236 Matrix_scanArray[ item ].prevDecisionTime = 0; |
416 | 237 #ifdef GHOSTING_MATRIX |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
238 Matrix_ghostArray[ item ].prev = KeyState_Off; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
239 Matrix_ghostArray[ item ].cur = KeyState_Off; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
240 Matrix_ghostArray[ item ].saved = KeyState_Off; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
241 #endif |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
242 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
243 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
244 // Clear scan stats counters |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
245 matrixMaxScans = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
246 matrixPrevScans = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
247 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
248 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
249 void Matrix_keyPositionDebug( KeyPosition pos ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
250 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
251 // Depending on the state, use a different flag + color |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
252 switch ( pos ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
253 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
254 case KeyState_Off: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
255 print("\033[1mO\033[0m"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
256 break; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
257 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
258 case KeyState_Press: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
259 print("\033[1;33mP\033[0m"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
260 break; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
261 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
262 case KeyState_Hold: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
263 print("\033[1;32mH\033[0m"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
264 break; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
265 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
266 case KeyState_Release: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
267 print("\033[1;35mR\033[0m"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
268 break; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
269 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
270 case KeyState_Invalid: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
271 default: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
272 print("\033[1;31mI\033[0m"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
273 break; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
274 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
275 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
276 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
277 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
278 // Scan the matrix for keypresses |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
279 // NOTE: scanNum should be reset to 0 after a USB send (to reset all the counters) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
280 void Matrix_scan( uint16_t scanNum ) |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
281 { |
299
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
282 #if ( DebounceThrottleDiv_define > 0 ) |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
283 // Scan-rate throttling |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
284 // By scanning using a divider, the scan rate slowed down |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
285 // DebounceThrottleDiv_define == 1 means -> /2 or half scan rate |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
286 // This helps with bouncy switches on fast uCs |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
287 if ( !( Matrix_divCounter++ & (1 << ( DebounceThrottleDiv_define - 1 )) ) ) |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
288 return; |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
289 #endif |
c856f826bd49
Adding DebounceThrottleDiv define to slow down the debounce rate.
Jacob Alexander <haata@kiibohd.com>
parents:
293
diff
changeset
|
290 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
291 // Increment stats counters |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
292 if ( scanNum > matrixMaxScans ) matrixMaxScans = scanNum; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
293 if ( scanNum == 0 ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
294 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
295 matrixPrevScans = matrixCurScans; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
296 matrixCurScans = 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
297 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
298 else |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
299 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
300 matrixCurScans++; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
301 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
302 |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
303 // Read systick for event scheduling |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
304 uint8_t currentTime = (uint8_t)systick_millis_count; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
305 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
306 // For each strobe, scan each of the sense pins |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
307 for ( uint8_t strobe = 0; strobe < Matrix_colsNum; strobe++ ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
308 { |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
309 #ifdef STROBE_DELAY |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
310 uint32_t start = micros(); |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
311 while ((micros() - start) < STROBE_DELAY); |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
312 #endif |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
313 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
314 // Strobe Pin |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
315 Matrix_pin( Matrix_cols[ strobe ], Type_StrobeOn ); |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
316 |
423
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
317 #ifdef STROBE_DELAY |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
318 start = micros(); |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
319 while ((micros() - start) < STROBE_DELAY); |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
320 #endif |
be6b57c5b438
Changed CK3 matrix scan to Config_Pullup, inverted rows and columns
CryHam <cryham@gmail.com>
parents:
416
diff
changeset
|
321 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
322 // Scan each of the sense pins |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
323 for ( uint8_t sense = 0; sense < Matrix_rowsNum; sense++ ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
324 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
325 // Key position |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
326 uint8_t key = Matrix_colsNum * sense + strobe; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
327 KeyState *state = &Matrix_scanArray[ key ]; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
328 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
329 // If first scan, reset state |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
330 if ( scanNum == 0 ) |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
331 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
332 // Set previous state, and reset current state |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
333 state->prevState = state->curState; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
334 state->curState = KeyState_Invalid; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
335 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
336 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
337 // Signal Detected |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
338 // Increment count and right shift opposing count |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
339 // This means there is a maximum of scan 13 cycles on a perfect off to on transition |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
340 // (coming from a steady state 0xFFFF off scans) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
341 // Somewhat longer with switch bounciness |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
342 // The advantage of this is that the count is ongoing and never needs to be reset |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
343 // State still needs to be kept track of to deal with what to send to the Macro module |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
344 if ( Matrix_pin( Matrix_rows[ sense ], Type_Sense ) ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
345 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
346 // Only update if not going to wrap around |
293
57f40871c726
Adding configurable DebounceDivThreshold
Jacob Alexander <haata@kiibohd.com>
parents:
239
diff
changeset
|
347 if ( state->activeCount < DebounceDivThreshold_define ) state->activeCount += 1; |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
348 state->inactiveCount >>= 1; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
349 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
350 // Signal Not Detected |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
351 else |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
352 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
353 // Only update if not going to wrap around |
293
57f40871c726
Adding configurable DebounceDivThreshold
Jacob Alexander <haata@kiibohd.com>
parents:
239
diff
changeset
|
354 if ( state->inactiveCount < DebounceDivThreshold_define ) state->inactiveCount += 1; |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
355 state->activeCount >>= 1; |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
356 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
357 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
358 // Check for state change if it hasn't been set |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
359 // But only if enough time has passed since last state change |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
360 // Only check if the minimum number of scans has been met |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
361 // the current state is invalid |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
362 // and either active or inactive count is over the debounce threshold |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
363 if ( state->curState == KeyState_Invalid ) |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
364 { |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
365 // Determine time since last decision |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
366 uint8_t lastTransition = currentTime - state->prevDecisionTime; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
367 |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
368 // Attempt state transition |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
369 switch ( state->prevState ) |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
370 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
371 case KeyState_Press: |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
372 case KeyState_Hold: |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
373 if ( state->activeCount > state->inactiveCount ) |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
374 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
375 state->curState = KeyState_Hold; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
376 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
377 else |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
378 { |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
379 // If not enough time has passed since Hold |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
380 // Keep previous state |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
381 if ( lastTransition < MinDebounceTime_define ) |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
382 { |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
383 //warn_print("FAST Release stopped"); |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
384 state->curState = state->prevState; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
385 continue; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
386 } |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
387 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
388 state->curState = KeyState_Release; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
389 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
390 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
391 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
392 case KeyState_Release: |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
393 case KeyState_Off: |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
394 if ( state->activeCount > state->inactiveCount ) |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
395 { |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
396 // If not enough time has passed since Hold |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
397 // Keep previous state |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
398 if ( lastTransition < MinDebounceTime_define ) |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
399 { |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
400 //warn_print("FAST Press stopped"); |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
401 state->curState = state->prevState; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
402 continue; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
403 } |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
404 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
405 state->curState = KeyState_Press; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
406 } |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
407 else |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
408 { |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
409 state->curState = KeyState_Off; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
410 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
411 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
412 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
413 case KeyState_Invalid: |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
414 default: |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
415 erro_print("Matrix scan bug!! Report me!"); |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
416 break; |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
417 } |
416 | 418 |
343
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
419 // Update decision time |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
420 state->prevDecisionTime = currentTime; |
e464aaa4730f
Adding timing based debounce code
Jacob Alexander <haata@kiibohd.com>
parents:
299
diff
changeset
|
421 |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
422 // Send keystate to macro module |
416 | 423 #ifndef GHOSTING_MATRIX |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
424 Macro_keyState( key, state->curState ); |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
425 #endif |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
426 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
427 // Matrix Debug, only if there is a state change |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
428 if ( matrixDebugMode && state->curState != state->prevState ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
429 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
430 // Basic debug output |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
431 if ( matrixDebugMode == 1 && state->curState == KeyState_Press ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
432 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
433 printHex( key ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
434 print(" "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
435 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
436 // State transition debug output |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
437 else if ( matrixDebugMode == 2 ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
438 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
439 printHex( key ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
440 Matrix_keyPositionDebug( state->curState ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
441 print(" "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
442 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
443 } |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
444 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
445 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
446 |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
447 // Unstrobe Pin |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
448 Matrix_pin( Matrix_cols[ strobe ], Type_StrobeOff ); |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
449 } |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
450 |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
451 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
452 // Matrix ghosting check and elimination |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
453 // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . |
416 | 454 #ifdef GHOSTING_MATRIX |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
455 // strobe = column, sense = row |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
456 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
457 // Count (rows) use for columns |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
458 for ( uint8_t col = 0; col < Matrix_colsNum; col++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
459 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
460 uint8_t used = 0; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
461 for ( uint8_t row = 0; row < Matrix_rowsNum; row++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
462 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
463 uint8_t key = Matrix_colsNum * row + col; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
464 KeyState *state = &Matrix_scanArray[ key ]; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
465 if ( keyOn(state->curState) ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
466 used++; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
467 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
468 col_use[col] = used; |
440
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
469 col_ghost_old[col] = col_ghost[col]; |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
470 col_ghost[col] = 0; // clear |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
471 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
472 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
473 // Count (columns) use for rows |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
474 for ( uint8_t row = 0; row < Matrix_rowsNum; row++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
475 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
476 uint8_t used = 0; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
477 for ( uint8_t col = 0; col < Matrix_colsNum; col++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
478 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
479 uint8_t key = Matrix_colsNum * row + col; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
480 KeyState *state = &Matrix_scanArray[ key ]; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
481 if ( keyOn(state->curState) ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
482 used++; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
483 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
484 row_use[row] = used; |
440
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
485 row_ghost_old[row] = row_ghost[row]; |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
486 row_ghost[row] = 0; // clear |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
487 } |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
488 |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
489 // Check if matrix has ghost |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
490 // Happens when key is pressed and some other key is pressed in same row and another in same column |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
491 for ( uint8_t col = 0; col < Matrix_colsNum; col++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
492 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
493 for ( uint8_t row = 0; row < Matrix_rowsNum; row++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
494 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
495 uint8_t key = Matrix_colsNum * row + col; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
496 KeyState *state = &Matrix_scanArray[ key ]; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
497 if ( keyOn(state->curState) && col_use[col] >= 2 && row_use[row] >= 2 ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
498 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
499 // mark col and row as having ghost |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
500 col_ghost[col] = 1; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
501 row_ghost[row] = 1; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
502 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
503 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
504 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
505 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
506 // Send keys |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
507 for ( uint8_t col = 0; col < Matrix_colsNum; col++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
508 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
509 for ( uint8_t row = 0; row < Matrix_rowsNum; row++ ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
510 { |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
511 uint8_t key = Matrix_colsNum * row + col; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
512 KeyState *state = &Matrix_scanArray[ key ]; |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
513 KeyGhost *st = &Matrix_ghostArray[ key ]; |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
514 |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
515 // col or row is ghosting (crossed) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
516 uint8_t ghost = (col_ghost[col] > 0 || row_ghost[row] > 0) ? 1 : 0; |
440
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
517 uint8_t ghost_old = (col_ghost_old[col] > 0 || row_ghost_old[row] > 0) ? 1 : 0; |
94ef7b561d7d
Fixed ghosting matrix check (did send bad keys on release), now using also ghost_old state
CryHam <cryham@gmail.com>
parents:
436
diff
changeset
|
518 ghost = ghost || ghost_old ? 1 : 0; |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
519 |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
520 st->prev = st->cur; // previous |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
521 // save state if no ghost or outside ghosted area |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
522 if ( ghost == 0 ) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
523 st->saved = state->curState; // save state if no ghost |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
524 // final |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
525 // use saved state if ghosting, or current if not |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
526 st->cur = ghost > 0 ? st->saved : state->curState; |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
527 |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
528 // Send keystate to macro module |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
529 KeyPosition k = !st->cur |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
530 ? (!st->prev ? KeyState_Off : KeyState_Release) |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
531 : ( st->prev ? KeyState_Hold : KeyState_Press); |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
532 Macro_keyState( key, k ); |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
533 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
534 } |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
535 #endif |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
536 // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . |
415
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
537 |
293154e4aafe
Added support for ghosting matrices and code for elimination.
CryHam <cryham@gmail.com>
parents:
389
diff
changeset
|
538 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
539 // State Table Output Debug |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
540 if ( matrixDebugStateCounter > 0 ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
541 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
542 // Decrement counter |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
543 matrixDebugStateCounter--; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
544 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
545 // Output stats on number of scans being done per USB send |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
546 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
547 info_msg("Max scans: "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
548 printHex( matrixMaxScans ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
549 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
550 info_msg("Previous scans: "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
551 printHex( matrixPrevScans ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
552 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
553 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
554 // Output current scan number |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
555 info_msg("Scan Number: "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
556 printHex( scanNum ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
557 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
558 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
559 // Display the state info for each key |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
560 print("<key>:<previous state><current state> <active count> <inactive count>"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
561 for ( uint8_t key = 0; key < Matrix_maxKeys; key++ ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
562 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
563 // Every 4 keys, put a newline |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
564 if ( key % 4 == 0 ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
565 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
566 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
567 print("\033[1m0x"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
568 printHex_op( key, 2 ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
569 print("\033[0m"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
570 print(":"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
571 Matrix_keyPositionDebug( Matrix_scanArray[ key ].prevState ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
572 Matrix_keyPositionDebug( Matrix_scanArray[ key ].curState ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
573 print(" 0x"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
574 printHex_op( Matrix_scanArray[ key ].activeCount, 4 ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
575 print(" 0x"); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
576 printHex_op( Matrix_scanArray[ key ].inactiveCount, 4 ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
577 print(" "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
578 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
579 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
580 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
581 } |
186
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
582 } |
50702debf278
Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
583 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
584 |
420
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
585 // Called by parent scan module whenever the available current changes |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
586 // current - mA |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
587 void Matrix_currentChange( unsigned int current ) |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
588 { |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
589 // TODO - Any potential power savings? |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
590 } |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
591 |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
592 |
23a1868b4ac2
Adding dynamic USB power support
Jacob Alexander <haata@kiibohd.com>
parents:
416
diff
changeset
|
593 |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
594 // ----- CLI Command Functions ----- |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
595 |
431
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
596 void cliFunc_matrixInfo( char* args ) |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
597 { |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
598 print( NL ); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
599 info_msg("Columns: "); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
600 printHex( Matrix_colsNum ); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
601 |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
602 print( NL ); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
603 info_msg("Rows: "); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
604 printHex( Matrix_rowsNum ); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
605 |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
606 print( NL ); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
607 info_msg("Max Keys: "); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
608 printHex( Matrix_maxKeys ); |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
609 } |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
610 |
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
611 void cliFunc_matrixDebug( char* args ) |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
612 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
613 // Parse number from argument |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
614 // NOTE: Only first argument is used |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
615 char* arg1Ptr; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
616 char* arg2Ptr; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
617 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
618 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
619 // Set the matrix debug flag depending on the argument |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
620 // If no argument, set to scan code only |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
621 // If set to T, set to state transition |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
622 switch ( arg1Ptr[0] ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
623 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
624 // T as argument |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
625 case 'T': |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
626 case 't': |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
627 matrixDebugMode = matrixDebugMode != 2 ? 2 : 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
628 break; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
629 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
630 // No argument |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
631 case '\0': |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
632 matrixDebugMode = matrixDebugMode != 1 ? 1 : 0; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
633 break; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
634 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
635 // Invalid argument |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
636 default: |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
637 return; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
638 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
639 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
640 print( NL ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
641 info_msg("Matrix Debug Mode: "); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
642 printInt8( matrixDebugMode ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
643 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
644 |
431
7bc4c6249dff
Move matrix information to a cli command
Jacob Alexander <haata@kiibohd.com>
parents:
424
diff
changeset
|
645 void cliFunc_matrixState( char* args ) |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
646 { |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
647 // Parse number from argument |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
648 // NOTE: Only first argument is used |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
649 char* arg1Ptr; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
650 char* arg2Ptr; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
651 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr ); |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
652 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
653 // Default to 1 if no argument is given |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
654 matrixDebugStateCounter = 1; |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
655 |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
656 if ( arg1Ptr[0] != '\0' ) |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
657 { |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
658 matrixDebugStateCounter = (uint16_t)numToInt( arg1Ptr ); |
187
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
659 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
660 } |
b250056298df
Matrix scanning for ARM now functional.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
661 |