* Use the new debounce algorithm in dactyl/matrix.c [#2065] This incorporates the fixed/optimized debounce code added to quantum/matrix.c in: * 508eddf8ba8548d3f71e1c09a404839beb49f45c * 4c6960835c0a6e29670dabdc27117d7d3c7f99f5 * 32f88c07173b795c6981c779057dceba00aeb1cb * f4030289744fc6dc82dd85c955070c0845813cc5 * a06115df19a74d39b08758472b221e630c3680d3 * Fix the row/column swap in dactyl [#2065] With a column-driven keyboard, reading from the mcp23081 returns a column-state, which takes some extra work to translate into the row-state used in the actual matrix. The ergodox_ez code sidestepped that problem by calling rows "columns" and columns "rows." With this change, the dactyl now calls rows "rows" and columns "columns." * Cleanup: variable names, documentation [#2065] * Support MATRIX_MASKED in dactyl/matrix.c [#2065] * Only unselect one col in unselect_col [#2065] Bonus: saves one i2c transaction per matrix_scan! * Implement COL2ROW in dactyl/matrix.c [#2065] * Fix a typo in dactyl/matrix.c This entirely doesn't matter. The PORT values are set during init_keyboard and never change. They're repeatedly set to the same thing. These PORT lines shouldn't even exist, but since they do, they should at least look right. * Implement COL_PINS/ROW_PINS for dactyl [#2065] * Rename "mcp23018" to "expander" [#2065] I honestly don't know whether/how well this code works with other I/O expanders, but at least in theory, it should be generic enough to work with others. Given that, the variable names shouldn't refer to a specific model of expander. * Remove matrix_power_up from dactyl/matrix.c [#2065] It's commented out in quantum/matrix.c, and the dactyl has no power up/down behavior beyond being unplugged (which goes to matrix_init), so there's no sense keeping it around. * Only initialize expander_input_mask once [#2065] ...and rename input_mask to expander_input_mask, since now that it isn't scoped to init_expander it isn't clear that it's only for the expander.
		
			
				
	
	
		
			68 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef DACTYL_H
 | 
						|
#define DACTYL_H
 | 
						|
 | 
						|
#include "quantum.h"
 | 
						|
#include <stdint.h>
 | 
						|
#include <stdbool.h>
 | 
						|
#include "i2cmaster.h"
 | 
						|
#include <util/delay.h>
 | 
						|
 | 
						|
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
 | 
						|
#define CPU_16MHz       0x00
 | 
						|
 | 
						|
#define I2C_ADDR        0b0100000
 | 
						|
#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
 | 
						|
#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
 | 
						|
#define IODIRA          0x00            // i/o direction register
 | 
						|
#define IODIRB          0x01
 | 
						|
#define GPPUA           0x0C            // GPIO pull-up resistor register
 | 
						|
#define GPPUB           0x0D
 | 
						|
#define GPIOA           0x12            // general purpose i/o port register (write modifies OLAT)
 | 
						|
#define GPIOB           0x13
 | 
						|
#define OLATA           0x14            // output latch register
 | 
						|
#define OLATB           0x15
 | 
						|
 | 
						|
extern uint8_t expander_status;
 | 
						|
extern uint8_t expander_input_pin_mask;
 | 
						|
extern bool i2c_initialized;
 | 
						|
 | 
						|
void init_dactyl(void);
 | 
						|
void init_expander(void);
 | 
						|
 | 
						|
#define KEYMAP(                                                         \
 | 
						|
                                                                        \
 | 
						|
    /* left hand, spatial positions */                                  \
 | 
						|
    k00,k01,k02,k03,k04,k05,                                            \
 | 
						|
    k10,k11,k12,k13,k14,k15,                                            \
 | 
						|
    k20,k21,k22,k23,k24,k25,                                            \
 | 
						|
    k30,k31,k32,k33,k34,k35,                                            \
 | 
						|
    k40,k41,k42,k43,k44,                                                \
 | 
						|
                            k55,k50,                                    \
 | 
						|
                                k54,                                    \
 | 
						|
                        k53,k52,k51,                                    \
 | 
						|
                                                                        \
 | 
						|
    /* right hand, spatial positions */                                 \
 | 
						|
            k06,k07,k08,k09,k0A,k0B,                                    \
 | 
						|
            k16,k17,k18,k19,k1A,k1B,                                    \
 | 
						|
            k26,k27,k28,k29,k2A,k2B,                                    \
 | 
						|
            k36,k37,k38,k39,k3A,k3B,                                    \
 | 
						|
                k47,k48,k49,k4A,k4B,                                    \
 | 
						|
    k5B,k56,                                                            \
 | 
						|
    k57,                                                                \
 | 
						|
    k5A,k59,k58 )                                                       \
 | 
						|
                                                                        \
 | 
						|
   /* matrix positions */                                               \
 | 
						|
   {                                                                    \
 | 
						|
    { k00, k01, k02, k03, k04, k05,     k06, k07, k08, k09, k0A, k0B }, \
 | 
						|
    { k10, k11, k12, k13, k14, k15,     k16, k17, k18, k19, k1A, k1B }, \
 | 
						|
    { k20, k21, k22, k23, k24, k25,     k26, k27, k28, k29, k2A, k2B }, \
 | 
						|
    { k30, k31, k32, k33, k34, k35,     k36, k37, k38, k39, k3A, k3B }, \
 | 
						|
    { k40, k41, k42, k43, k44, KC_NO, KC_NO, k47, k48, k49, k4A, k4B }, \
 | 
						|
    { k50, k51, k52, k53, k54, k55,     k56, k57, k58, k59, k5A, k5B }, \
 | 
						|
   }
 | 
						|
 | 
						|
 | 
						|
#define LAYOUT_dactyl KEYMAP
 | 
						|
 | 
						|
#endif
 |