louis/kiibohd-controller: Scan/MatrixARM/matrix

annotate Scan/MatrixARM/matrix_scan.c @ 424:0d1cc6ec4af7

Merge branch 'master' of github.com:kiibohd/controller

author	CryHam <cryham@gmail.com>
date	Tue, 01 Mar 2016 19:40:00 +0100
parents	be6b57c5b438 23a1868b4ac2
children	7bc4c6249dff

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 );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	55 void cliFunc_matrixState( char* args );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	56
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
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	59 // ----- Variables -----
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	60
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	61 // Scan Module command dictionary
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	62 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." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	63 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	64
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	65 CLIDict_Def( matrixCLIDict, "Matrix Module Commands" ) = {
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	66 CLIDict_Item( matrixDebug ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	67 CLIDict_Item( matrixState ),
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	68 { 0, 0, 0 } // Null entry for dictionary end
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	69 };
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	70
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	71 // Debounce Array
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	72 KeyState Matrix_scanArray[ Matrix_colsNum * Matrix_rowsNum ];
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	73
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	74 // Ghost Arrays
416 060aa589b307 Minor styling fixes. CryHam <cryham@gmail.com> parents: 415 diff changeset	75 #ifdef GHOSTING_MATRIX
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	76 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	77
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	78 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	79 uint8_t col_ghost[Matrix_colsNum], row_ghost[Matrix_rowsNum]; // marked as having ghost if 1
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	80 #endif
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	81
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	82
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	83 // 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	84 // 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	85 uint8_t matrixDebugMode = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	86
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	87 // 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	88 uint16_t matrixDebugStateCounter = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	89
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	90 // Matrix Scan Counters
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	91 uint16_t matrixMaxScans = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	92 uint16_t matrixCurScans = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	93 uint16_t matrixPrevScans = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	94
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	95 // System Timer used for delaying debounce decisions
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	96 extern volatile uint32_t systick_millis_count;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	97
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	98
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	99
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	100 // ----- Functions -----
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	101
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	102 // Pin action (Strobe, Sense, Strobe Setup, Sense Setup)
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	103 // 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	104 // Only guaranteed to work with Freescale MK20 series uCs
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	105 uint8_t Matrix_pin( GPIO_Pin gpio, Type type )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	106 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	107 // 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	108 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	109 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	110
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	111 // 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	112 // See Lib/mk20dx.h
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	113 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	114 #ifndef GHOSTING_MATRIX
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	115 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	116 #endif
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	117 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	118 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	119 volatile unsigned int PORT_PCR = (unsigned int)(&PORTA_PCR0) + port_offset;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	120
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	121 // Operation depends on Type
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	122 switch ( type )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	123 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	124 case Type_StrobeOn:
423 be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	125 #ifdef GHOSTING_MATRIX
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	126 *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	127 *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	128 #else
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	129 *GPIO_PSOR \|= (1 << gpio.pin);
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	130 #endif
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	131 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	132
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	133 case Type_StrobeOff:
416 060aa589b307 Minor styling fixes. CryHam <cryham@gmail.com> parents: 415 diff changeset	134 #ifdef GHOSTING_MATRIX
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	135 // 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	136 *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	137 #endif
423 be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	138 *GPIO_PCOR \|= (1 << gpio.pin);
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	139 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	140
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	141 case Type_StrobeSetup:
423 be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	142 #ifdef GHOSTING_MATRIX
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	143 *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	144 *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	145 #else
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	146 // Set as output pin
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	147 *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	148 #endif
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	149
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	150 // 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	151 *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	152
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	153 // Enabling open-drain if specified
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	154 switch ( Matrix_type )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	155 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	156 case Config_Opendrain:
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	157 *PORT_PCR \|= PORT_PCR_ODE;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	158 break;
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 // Do nothing otherwise
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	161 default:
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 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	165
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	166 case Type_Sense:
423 be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	167 #ifdef GHOSTING_MATRIX // inverted
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	168 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	169 #else
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	170 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	171 #endif
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	172
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	173 case Type_SenseSetup:
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	174 // Set as input pin
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	175 *GPIO_PDDR &= ~(1 << gpio.pin);
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 // 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	178 *PORT_PCR = PORT_PCR_PFE \| PORT_PCR_MUX(1);
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	179
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	180 // Pull resistor config
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	181 switch ( Matrix_type )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	182 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	183 case Config_Pullup:
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	184 *PORT_PCR \|= PORT_PCR_PE \| PORT_PCR_PS;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	185 break;
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_Pulldown:
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	188 *PORT_PCR \|= PORT_PCR_PE;
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 // Do nothing otherwise
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	192 default:
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 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	196 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	197
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	198 return 0;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	199 }
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 // Setup GPIO pins for matrix scanning
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	202 void Matrix_setup()
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	203 {
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	204 // Register Matrix CLI dictionary
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	205 CLI_registerDictionary( matrixCLIDict, matrixCLIDictName );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	206
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	207 info_msg("Columns: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	208 printHex( Matrix_colsNum );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	209
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	210 // Setup Strobe Pins
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	211 for ( uint8_t pin = 0; pin < Matrix_colsNum; pin++ )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	212 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	213 Matrix_pin( Matrix_cols[ pin ], Type_StrobeSetup );
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	214 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	215
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	216 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	217 info_msg("Rows: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	218 printHex( Matrix_rowsNum );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	219
186 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 );
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	224 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	225
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	226 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	227 info_msg("Max Keys: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	228 printHex( Matrix_maxKeys );
389 fc2c2a1e9615 Adding basic remote capabilities + UART Rx DMA buffers Jacob Alexander <haata@kiibohd.com> parents: 357 diff changeset	229 print( NL );
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	230
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	231 // Clear out Debounce Array
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	232 for ( uint8_t item = 0; item < Matrix_maxKeys; item++ )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	233 {
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	234 Matrix_scanArray[ item ].prevState = KeyState_Off;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	235 Matrix_scanArray[ item ].curState = KeyState_Off;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	236 Matrix_scanArray[ item ].activeCount = 0;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	237 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	238 Matrix_scanArray[ item ].prevDecisionTime = 0;
416 060aa589b307 Minor styling fixes. CryHam <cryham@gmail.com> parents: 415 diff changeset	239 #ifdef GHOSTING_MATRIX
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	240 Matrix_ghostArray[ item ].prev = KeyState_Off;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	241 Matrix_ghostArray[ item ].cur = KeyState_Off;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	242 Matrix_ghostArray[ item ].saved = KeyState_Off;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	243 #endif
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	244 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	245
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	246 // Clear scan stats counters
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	247 matrixMaxScans = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	248 matrixPrevScans = 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	249 }
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 void Matrix_keyPositionDebug( KeyPosition pos )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	252 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	253 // 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	254 switch ( pos )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	255 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	256 case KeyState_Off:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	257 print("\033[1mO\033[0m");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	258 break;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	259
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	260 case KeyState_Press:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	261 print("\033[1;33mP\033[0m");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	262 break;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	263
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	264 case KeyState_Hold:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	265 print("\033[1;32mH\033[0m");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	266 break;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	267
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	268 case KeyState_Release:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	269 print("\033[1;35mR\033[0m");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	270 break;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	271
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	272 case KeyState_Invalid:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	273 default:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	274 print("\033[1;31mI\033[0m");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	275 break;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	276 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	277 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	278
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	279
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	280 // Scan the matrix for keypresses
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	281 // 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	282 void Matrix_scan( uint16_t scanNum )
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	283 {
299 c856f826bd49 Adding DebounceThrottleDiv define to slow down the debounce rate. Jacob Alexander <haata@kiibohd.com> parents: 293 diff changeset	284 #if ( DebounceThrottleDiv_define > 0 )
c856f826bd49 Adding DebounceThrottleDiv define to slow down the debounce rate. Jacob Alexander <haata@kiibohd.com> parents: 293 diff changeset	285 // Scan-rate throttling
c856f826bd49 Adding DebounceThrottleDiv define to slow down the debounce rate. Jacob Alexander <haata@kiibohd.com> parents: 293 diff changeset	286 // 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	287 // 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	288 // 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	289 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	290 return;
c856f826bd49 Adding DebounceThrottleDiv define to slow down the debounce rate. Jacob Alexander <haata@kiibohd.com> parents: 293 diff changeset	291 #endif
c856f826bd49 Adding DebounceThrottleDiv define to slow down the debounce rate. Jacob Alexander <haata@kiibohd.com> parents: 293 diff changeset	292
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	293 // Increment stats counters
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	294 if ( scanNum > matrixMaxScans ) matrixMaxScans = scanNum;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	295 if ( scanNum == 0 )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	296 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	297 matrixPrevScans = matrixCurScans;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	298 matrixCurScans = 0;
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 else
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 matrixCurScans++;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	303 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	304
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	305 // Read systick for event scheduling
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	306 uint8_t currentTime = (uint8_t)systick_millis_count;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	307
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	308 // For each strobe, scan each of the sense pins
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	309 for ( uint8_t strobe = 0; strobe < Matrix_colsNum; strobe++ )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	310 {
423 be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	311 #ifdef STROBE_DELAY
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	312 uint32_t start = micros();
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	313 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	314 #endif
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	315
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	316 // Strobe Pin
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	317 Matrix_pin( Matrix_cols[ strobe ], Type_StrobeOn );
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	318
423 be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	319 #ifdef STROBE_DELAY
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	320 start = micros();
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	321 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	322 #endif
be6b57c5b438 Changed CK3 matrix scan to Config_Pullup, inverted rows and columns CryHam <cryham@gmail.com> parents: 416 diff changeset	323
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	324 // Scan each of the sense pins
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	325 for ( uint8_t sense = 0; sense < Matrix_rowsNum; sense++ )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	326 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	327 // Key position
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	328 uint8_t key = Matrix_colsNum * sense + strobe;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	329 KeyState *state = &Matrix_scanArray[ key ];
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	330
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	331 // If first scan, reset state
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	332 if ( scanNum == 0 )
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	333 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	334 // Set previous state, and reset current state
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	335 state->prevState = state->curState;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	336 state->curState = KeyState_Invalid;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	337 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	338
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	339 // Signal Detected
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	340 // Increment count and right shift opposing count
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	341 // 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	342 // (coming from a steady state 0xFFFF off scans)
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	343 // Somewhat longer with switch bounciness
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	344 // 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	345 // 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	346 if ( Matrix_pin( Matrix_rows[ sense ], Type_Sense ) )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	347 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	348 // Only update if not going to wrap around
293 57f40871c726 Adding configurable DebounceDivThreshold Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	349 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	350 state->inactiveCount >>= 1;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	351 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	352 // Signal Not Detected
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	353 else
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	354 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	355 // Only update if not going to wrap around
293 57f40871c726 Adding configurable DebounceDivThreshold Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	356 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	357 state->activeCount >>= 1;
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	358 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	359
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	360 // 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	361 // But only if enough time has passed since last state change
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	362 // Only check if the minimum number of scans has been met
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	363 // the current state is invalid
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	364 // 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	365 if ( state->curState == KeyState_Invalid )
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	366 {
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	367 // Determine time since last decision
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	368 uint8_t lastTransition = currentTime - state->prevDecisionTime;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	369
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	370 // Attempt state transition
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	371 switch ( state->prevState )
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	372 {
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	373 case KeyState_Press:
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	374 case KeyState_Hold:
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	375 if ( state->activeCount > state->inactiveCount )
186 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 state->curState = KeyState_Hold;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	378 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	379 else
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	380 {
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	381 // If not enough time has passed since Hold
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	382 // Keep previous state
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	383 if ( lastTransition < MinDebounceTime_define )
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	384 {
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	385 //warn_print("FAST Release stopped");
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	386 state->curState = state->prevState;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	387 continue;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	388 }
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	389
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	390 state->curState = KeyState_Release;
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 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	393
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	394 case KeyState_Release:
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	395 case KeyState_Off:
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	396 if ( state->activeCount > state->inactiveCount )
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	397 {
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	398 // If not enough time has passed since Hold
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	399 // Keep previous state
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	400 if ( lastTransition < MinDebounceTime_define )
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	401 {
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	402 //warn_print("FAST Press stopped");
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	403 state->curState = state->prevState;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	404 continue;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	405 }
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	406
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	407 state->curState = KeyState_Press;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	408 }
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	409 else
186 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 state->curState = KeyState_Off;
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 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	414
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	415 case KeyState_Invalid:
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	416 default:
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	417 erro_print("Matrix scan bug!! Report me!");
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	418 break;
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	419 }
416 060aa589b307 Minor styling fixes. CryHam <cryham@gmail.com> parents: 415 diff changeset	420
343 e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	421 // Update decision time
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	422 state->prevDecisionTime = currentTime;
e464aaa4730f Adding timing based debounce code Jacob Alexander <haata@kiibohd.com> parents: 299 diff changeset	423
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	424 // Send keystate to macro module
416 060aa589b307 Minor styling fixes. CryHam <cryham@gmail.com> parents: 415 diff changeset	425 #ifndef GHOSTING_MATRIX
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	426 Macro_keyState( key, state->curState );
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	427 #endif
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	428
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	429 // 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	430 if ( matrixDebugMode && state->curState != state->prevState )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	431 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	432 // Basic debug output
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	433 if ( matrixDebugMode == 1 && state->curState == KeyState_Press )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	434 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	435 printHex( key );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	436 print(" ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	437 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	438 // State transition debug output
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	439 else if ( matrixDebugMode == 2 )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	440 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	441 printHex( key );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	442 Matrix_keyPositionDebug( state->curState );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	443 print(" ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	444 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	445 }
186 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 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	448
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	449 // Unstrobe Pin
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	450 Matrix_pin( Matrix_cols[ strobe ], Type_StrobeOff );
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	451 }
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	452
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	453
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	454 // Matrix ghosting check and elimination
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	455 // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
416 060aa589b307 Minor styling fixes. CryHam <cryham@gmail.com> parents: 415 diff changeset	456 #ifdef GHOSTING_MATRIX
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	457 // strobe = column, sense = row
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	458
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	459 // Count (rows) use for columns
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	460 //print("C ");
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	461 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	462 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	463 uint8_t used = 0;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	464 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	465 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	466 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	467 KeyState *state = &Matrix_scanArray[ key ];
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	468 if ( keyOn(state->curState) )
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	469 used++;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	470 }
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	471 //printInt8(used);
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	472 col_use[col] = used;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	473 col_ghost[col] = 0; // clear
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	474 }
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 // Count (columns) use for rows
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	477 //print(" R ");
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	478 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	479 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	480 uint8_t used = 0;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	481 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	482 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	483 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	484 KeyState *state = &Matrix_scanArray[ key ];
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	485 if ( keyOn(state->curState) )
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	486 used++;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	487 }
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	488 //printInt8(used);
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	489 row_use[row] = used;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	490 row_ghost[row] = 0; // clear
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	491 }
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	492
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	493 // Check if matrix has ghost
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	494 // 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	495 //print(" G ");
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	496 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	497 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	498 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	499 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	500 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	501 KeyState *state = &Matrix_scanArray[ key ];
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	502 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	503 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	504 // 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	505 col_ghost[col] = 1;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	506 row_ghost[row] = 1;
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	507 //print(" "); printInt8(col); print(","); printInt8(row);
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 }
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 //print( NL );
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	512
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	513 // Send keys
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	514 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	515 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	516 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	517 {
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	518 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	519 KeyState *state = &Matrix_scanArray[ key ];
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	520 KeyGhost *st = &Matrix_ghostArray[ key ];
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	521
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	522 // col or row is ghosting (crossed)
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	523 uint8_t ghost = (col_ghost[col] > 0 \|\| row_ghost[row] > 0) ? 1 : 0;
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	524
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	525 st->prev = st->cur; // previous
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	526 // 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	527 if ( ghost == 0 )
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	528 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	529 // final
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	530 // 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	531 st->cur = ghost > 0 ? st->saved : state->curState;
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	532
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	533 // Send keystate to macro module
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	534 KeyPosition k = !st->cur
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	535 ? (!st->prev ? KeyState_Off : KeyState_Release)
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	536 : ( st->prev ? KeyState_Hold : KeyState_Press);
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	537 Macro_keyState( key, k );
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	538 }
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	539 }
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	540 #endif
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	541 // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
415 293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	542
293154e4aafe Added support for ghosting matrices and code for elimination. CryHam <cryham@gmail.com> parents: 389 diff changeset	543
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	544 // State Table Output Debug
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	545 if ( matrixDebugStateCounter > 0 )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	546 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	547 // Decrement counter
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	548 matrixDebugStateCounter--;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	549
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	550 // 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	551 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	552 info_msg("Max scans: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	553 printHex( matrixMaxScans );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	554 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	555 info_msg("Previous scans: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	556 printHex( matrixPrevScans );
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 // Output current scan number
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	560 info_msg("Scan Number: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	561 printHex( scanNum );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	562 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	563
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	564 // Display the state info for each key
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	565 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	566 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	567 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	568 // Every 4 keys, put a newline
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	569 if ( key % 4 == 0 )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	570 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	571
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	572 print("\033[1m0x");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	573 printHex_op( key, 2 );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	574 print("\033[0m");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	575 print(":");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	576 Matrix_keyPositionDebug( Matrix_scanArray[ key ].prevState );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	577 Matrix_keyPositionDebug( Matrix_scanArray[ key ].curState );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	578 print(" 0x");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	579 printHex_op( Matrix_scanArray[ key ].activeCount, 4 );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	580 print(" 0x");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	581 printHex_op( Matrix_scanArray[ key ].inactiveCount, 4 );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	582 print(" ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	583 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	584
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	585 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	586 }
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	587 }
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: diff changeset	588
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	589
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	590 // 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	591 // current - mA
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	592 void Matrix_currentChange( unsigned int current )
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	593 {
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	594 // TODO - Any potential power savings?
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	595 }
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	596
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	597
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 416 diff changeset	598
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	599 // ----- CLI Command Functions -----
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	600
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	601 void cliFunc_matrixDebug ( char* args )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	602 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	603 // Parse number from argument
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	604 // NOTE: Only first argument is used
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	605 char* arg1Ptr;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	606 char* arg2Ptr;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	607 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	608
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	609 // 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	610 // If no argument, set to scan code only
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	611 // If set to T, set to state transition
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	612 switch ( arg1Ptr[0] )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	613 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	614 // T as argument
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	615 case 'T':
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	616 case 't':
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	617 matrixDebugMode = matrixDebugMode != 2 ? 2 : 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	618 break;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	619
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	620 // No argument
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	621 case '\0':
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	622 matrixDebugMode = matrixDebugMode != 1 ? 1 : 0;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	623 break;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	624
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	625 // Invalid argument
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	626 default:
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	627 return;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	628 }
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 print( NL );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	631 info_msg("Matrix Debug Mode: ");
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	632 printInt8( matrixDebugMode );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	633 }
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 void cliFunc_matrixState ( char* args )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	636 {
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	637 // Parse number from argument
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	638 // NOTE: Only first argument is used
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	639 char* arg1Ptr;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	640 char* arg2Ptr;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	641 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	642
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	643 // Default to 1 if no argument is given
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	644 matrixDebugStateCounter = 1;
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	645
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	646 if ( arg1Ptr[0] != '\0' )
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	647 {
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	648 matrixDebugStateCounter = (uint16_t)numToInt( arg1Ptr );
187 b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	649 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	650 }
b250056298df Matrix scanning for ARM now functional. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	651

Mercurial > louis > kiibohd-controller

annotate Scan/MatrixARM/matrix_scan.c @ 424:0d1cc6ec4af7