locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Keyboard] Convert ErgoDox EZ to Matrix Lite (#10189)

Browse Source 
* Convert ErgoDox EZ to lite matrix

* Add initial config from Dactyl config

Based on ErinCall's work to generalize the mcp i/o expander matrix code

* formatting

* Fix number of pins

* Remove unused defines
This commit is contained in:
Drashna Jaelre 2020-09-30 16:52:47 -07:00 committed by GitHub
parent 482c9fbbf2
commit 11c308d436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 147 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keyboards/ergodox_ez/config.h
View File

@ -32,6 +32,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
#define MATRIX_COLS 6 #define MATRIX_COLS 6
#define COL_EXPANDED { true, true, true, true, true, true, true, false, false, false, false, false, false, false }
#define MATRIX_ONBOARD_ROW_PINS { 0, 0, 0, 0, 0, 0, 0, B0, B1, B2, B3, D2, D3, C6 }
#define MATRIX_ONBOARD_COL_PINS { F0, F1, F4, F5, F6, F7 }
#define DIODE_DIRECTION COL2ROW
#define EXPANDER_COL_REGISTER GPIOB
#define EXPANDER_ROW_REGISTER GPIOA
#define MATRIX_EXPANDER_COL_PINS { 5, 4, 3, 2, 1, 0 }
#define MATRIX_EXPANDER_ROW_PINS { 0, 1, 2, 3, 4, 5, 6 }
#define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0 #define MOUSEKEY_DELAY 0
#define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_TIME_TO_MAX 60

2
keyboards/ergodox_ez/ergodox_ez.c
View File

@ -1,4 +1,4 @@
#include QMK_KEYBOARD_H #include "ergodox_ez.h"
extern inline void ergodox_board_led_on(void); extern inline void ergodox_board_led_on(void);
extern inline void ergodox_right_led_1_on(void); extern inline void ergodox_right_led_1_on(void);

4
keyboards/ergodox_ez/ergodox_ez.h
View File

@ -4,10 +4,6 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "i2c_master.h" #include "i2c_master.h"
#include <util/delay.h>
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
#define CPU_16MHz 0x00
// I2C aliases and register addresses (see "mcp23018.md") // I2C aliases and register addresses (see "mcp23018.md")
#define I2C_ADDR 0b0100000 #define I2C_ADDR 0b0100000

153
keyboards/ergodox_ez/matrix.c
View File

@ -30,7 +30,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h" #include "util.h"
#include "matrix.h" #include "matrix.h"
#include "debounce.h" #include "debounce.h"
#include QMK_KEYBOARD_H #include "ergodox_ez.h"
/* /*
* This constant define not debouncing time in msecs, assuming eager_pr. * This constant define not debouncing time in msecs, assuming eager_pr.
@ -45,8 +46,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* matrix state(1:on, 0:off) */ /* matrix state(1:on, 0:off) */
static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
static matrix_row_t matrix[MATRIX_ROWS]; // debounced values extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
static matrix_row_t read_cols(uint8_t row); static matrix_row_t read_cols(uint8_t row);
static void init_cols(void); static void init_cols(void);
@ -54,48 +55,14 @@ static void unselect_rows(void);
static void select_row(uint8_t row); static void select_row(uint8_t row);
static uint8_t mcp23018_reset_loop; static uint8_t mcp23018_reset_loop;
// static uint16_t mcp23018_reset_loop;
__attribute__((weak)) void matrix_init_user(void) {} void matrix_init_custom(void) {
__attribute__((weak)) void matrix_scan_user(void) {}
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
void matrix_init(void) {
// initialize row and col // initialize row and col
mcp23018_status = init_mcp23018(); mcp23018_status = init_mcp23018();
unselect_rows(); unselect_rows();
init_cols(); init_cols();
// initialize matrix state: all keys off
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
matrix[i] = 0;
raw_matrix[i] = 0;
}
debounce_init(MATRIX_ROWS);
matrix_init_quantum();
}
void matrix_power_up(void) {
mcp23018_status = init_mcp23018();
unselect_rows();
init_cols();
// initialize matrix state: all keys off
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
matrix[i] = 0;
}
} }
// Reads and stores a row, returning // Reads and stores a row, returning
@ -109,12 +76,9 @@ static inline bool store_raw_matrix_row(uint8_t index) {
return false; return false;
} }
uint8_t matrix_scan(void) { bool matrix_scan_custom(matrix_row_t current_matrix[]) {
if (mcp23018_status) { // if there was an error if (mcp23018_status) { // if there was an error
if (++mcp23018_reset_loop == 0) { if (++mcp23018_reset_loop == 0) {
// if (++mcp23018_reset_loop >= 1300) {
// since mcp23018_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans
// this will be approx bit more frequent than once per second
print("trying to reset mcp23018\n"); print("trying to reset mcp23018\n");
mcp23018_status = init_mcp23018(); mcp23018_status = init_mcp23018();
if (mcp23018_status) { if (mcp23018_status) {
@ -140,46 +104,13 @@ uint8_t matrix_scan(void) {
select_row(left_index); select_row(left_index);
select_row(right_index); select_row(right_index);
// we don't need a 30us delay anymore, because selecting a
// left-hand row requires more than 30us for i2c.
changed |= store_raw_matrix_row(left_index); changed |= store_raw_matrix_row(left_index);
changed |= store_raw_matrix_row(right_index); changed |= store_raw_matrix_row(right_index);
unselect_rows(); unselect_rows();
} }
debounce(raw_matrix, matrix, MATRIX_ROWS, changed); return changed;
matrix_scan_quantum();
return 1;
}
bool matrix_is_modified(void) // deprecated and evidently not called.
{
return true;
}
inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
void matrix_print(void) {
print("\nr/c 0123456789ABCDEF\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
phex(row);
print(": ");
pbin_reverse16(matrix_get_row(row));
print("\n");
}
}
uint8_t matrix_key_count(void) {
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += bitpop16(matrix[i]);
}
return count;
} }
/* Column pin configuration /* Column pin configuration
@ -197,9 +128,12 @@ static void init_cols(void) {
// not needed, already done as part of init_mcp23018() // not needed, already done as part of init_mcp23018()
// init on teensy // init on teensy
// Input with pull-up(DDR:0, PORT:1) setPinInputHigh(F0);
DDRF &= ~(1 << 7 | 1 << 6 | 1 << 5 | 1 << 4 | 1 << 1 | 1 << 0); setPinInputHigh(F1);
PORTF |= (1 << 7 | 1 << 6 | 1 << 5 | 1 << 4 | 1 << 1 | 1 << 0); setPinInputHigh(F4);
setPinInputHigh(F5);
setPinInputHigh(F6);
setPinInputHigh(F7);
} }
static matrix_row_t read_cols(uint8_t row) { static matrix_row_t read_cols(uint8_t row) {
@ -210,10 +144,8 @@ static matrix_row_t read_cols(uint8_t row) {
uint8_t data = 0; uint8_t data = 0;
// reading GPIOB (column port) since in mcp23018's sequential mode // reading GPIOB (column port) since in mcp23018's sequential mode
// it is addressed directly after writing to GPIOA in select_row() // it is addressed directly after writing to GPIOA in select_row()
mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT); mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
if (mcp23018_status) goto out; mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status < 0) goto out;
mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT);
if (mcp23018_status < 0) goto out;
data = ~((uint8_t)mcp23018_status); data = ~((uint8_t)mcp23018_status);
mcp23018_status = I2C_STATUS_SUCCESS; mcp23018_status = I2C_STATUS_SUCCESS;
out: out:
@ -247,29 +179,24 @@ static void unselect_rows(void) {
// direction // direction
// unselect on teensy // unselect on teensy
// Hi-Z(DDR:0, PORT:0) to unselect setPinInput(B0);
DDRB &= ~(1 << 0 | 1 << 1 | 1 << 2 | 1 << 3); setPinInput(B1);
PORTB &= ~(1 << 0 | 1 << 1 | 1 << 2 | 1 << 3); setPinInput(B2);
DDRD &= ~(1 << 2 | 1 << 3); setPinInput(B3);
PORTD &= ~(1 << 2 | 1 << 3); setPinInput(D2);
DDRC &= ~(1 << 6); setPinInput(D3);
PORTC &= ~(1 << 6); setPinInput(C6);
} }
static void select_row(uint8_t row) { static void select_row(uint8_t row) {
if (row < 7) { if (row < 7) {
// select on mcp23018 // select on mcp23018
if (mcp23018_status) { // if there was an error if (!mcp23018_status) {
// do nothing
} else {
// set active row low : 0 // set active row low : 0
// set other rows hi-Z : 1 // set other rows hi-Z : 1
mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
if (mcp23018_status) goto out; mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); mcp23018_status = i2c_write(0xFF & ~(1 << row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
if (mcp23018_status) goto out;
mcp23018_status = i2c_write(0xFF & ~(1 << row), ERGODOX_EZ_I2C_TIMEOUT);
if (mcp23018_status) goto out;
out: out:
i2c_stop(); i2c_stop();
} }
@ -278,32 +205,32 @@ static void select_row(uint8_t row) {
// Output low(DDR:1, PORT:0) to select // Output low(DDR:1, PORT:0) to select
switch (row) { switch (row) {
case 7: case 7:
DDRB |= (1 << 0); setPinOutput(B0);
PORTB &= ~(1 << 0); writePinLow(B0);
break; break;
case 8: case 8:
DDRB |= (1 << 1); setPinOutput(B1);
PORTB &= ~(1 << 1); writePinLow(B1);
break; break;
case 9: case 9:
DDRB |= (1 << 2); setPinOutput(B2);
PORTB &= ~(1 << 2); writePinLow(B2);
break; break;
case 10: case 10:
DDRB |= (1 << 3); setPinOutput(B3);
PORTB &= ~(1 << 3); writePinLow(B3);
break; break;
case 11: case 11:
DDRD |= (1 << 2); setPinOutput(D2);
PORTD &= ~(1 << 2); writePinLow(D2);
break; break;
case 12: case 12:
DDRD |= (1 << 3); setPinOutput(D3);
PORTD &= ~(1 << 3); writePinLow(D3);
break; break;
case 13: case 13:
DDRC |= (1 << 6); setPinOutput(C6);
PORTC &= ~(1 << 6); writePinLow(C6);
break; break;
} }
} }

2
keyboards/ergodox_ez/rules.mk
View File

@ -24,7 +24,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDox EZ CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
UNICODE_ENABLE = yes # Unicode UNICODE_ENABLE = yes # Unicode
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard