ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-09-08 22:44:49 +00:00
commit 38afc7e4cc
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/3w6/rev1/matrix.c
View file

@ -34,7 +34,7 @@ extern i2c_status_t tca9555_status;
// All address pins of the tca9555 are connected to the ground // All address pins of the tca9555 are connected to the ground
// | 0 | 1 | 0 | 0 | A2 | A1 | A0 | // | 0 | 1 | 0 | 0 | A2 | A1 | A0 |
// | 0 | 1 | 0 | 0 | 0 | 0 | 0 | // | 0 | 1 | 0 | 0 | 0 | 0 | 0 |
#define I2C_ADDR 0b0100000 #define I2C_ADDR (0b0100000 << 1)
// Register addresses // Register addresses
#define IODIRA 0x06 // i/o direction register #define IODIRA 0x06 // i/o direction register

5
keyboards/3w6/rev2/matrix.c
View file

@ -34,7 +34,7 @@ extern i2c_status_t tca9555_status;
// All address pins of the tca9555 are connected to the ground // All address pins of the tca9555 are connected to the ground
// | 0 | 1 | 0 | 0 | A2 | A1 | A0 | // | 0 | 1 | 0 | 0 | A2 | A1 | A0 |
// | 0 | 1 | 0 | 0 | 0 | 0 | 0 | // | 0 | 1 | 0 | 0 | 0 | 0 | 0 |
#define I2C_ADDR 0b0100000 #define I2C_ADDR (0b0100000 << 1)
// Register addresses // Register addresses
#define IODIRA 0x06 // i/o direction register #define IODIRA 0x06 // i/o direction register
@ -192,6 +192,7 @@ static matrix_row_t read_cols(uint8_t row) {
// do nothing // do nothing
return 0; return 0;
} else { } else {
port0 = ~port0;
// We read all the pins on GPIOA. // We read all the pins on GPIOA.
// The initial state was all ones and any depressed key at a given column for the currently selected row will have its bit flipped to zero. // The initial state was all ones and any depressed key at a given column for the currently selected row will have its bit flipped to zero.
// The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys. // The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys.
@ -247,7 +248,7 @@ static void select_row(uint8_t row) {
default: break; default: break;
} }
tca9555_status = i2c_writeReg(I2C_ADDR, OREGP1, &port1, 2, I2C_TIMEOUT); tca9555_status = i2c_writeReg(I2C_ADDR, OREGP1, &port1, 1, I2C_TIMEOUT);
// Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one. // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
// Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus. // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
} }

2
keyboards/handwired/dactyl/dactyl.h
View file

@ -6,7 +6,7 @@
#include "i2c_master.h" #include "i2c_master.h"
#include <util/delay.h> #include <util/delay.h>
#define I2C_ADDR 0b0100000 #define I2C_ADDR (0b0100000 << 1)
#define I2C_TIMEOUT 100 #define I2C_TIMEOUT 100
#define IODIRA 0x00 // i/o direction register #define IODIRA 0x00 // i/o direction register
#define IODIRB 0x01 #define IODIRB 0x01

2
keyboards/sx60/sx60.h
View file

@ -7,7 +7,7 @@
#include <util/delay.h> #include <util/delay.h>
/* I2C aliases and register addresses (see "mcp23018.md") */ /* I2C aliases and register addresses (see "mcp23018.md") */
#define I2C_ADDR 0b0100000 #define I2C_ADDR (0b0100000 << 1)
#define I2C_TIMEOUT 100 #define I2C_TIMEOUT 100
#define IODIRA 0x00 /* i/o direction register */ #define IODIRA 0x00 /* i/o direction register */
#define IODIRB 0x01 #define IODIRB 0x01