Cian-H/qmk_firmware
1
0
Fork 0
mirror of https://github.com/Cian-H/qmk_firmware.git synced 2026-08-13 01:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update GPIO expander API naming (#23375)

Browse Source
This commit is contained in:
Ryan
2024-03-29 16:57:21 +00:00
committed by GitHub
parent e891109c4e
commit d0cf7b8519
14 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keyboards/geistmaschine/macropod/matrix.c
+1 -1
View File
@@ -55,7 +55,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
pca9555_setup();
}
// Read the entire port into this byte, 1 = not pressed, 0 = pressed
bool ret = pca9555_readPins(IC1, PCA9555_PORT0, &pin_states);
bool ret = pca9555_read_pins(IC1, PCA9555_PORT0, &pin_states);
// Update state
if (ret) {
keyboards/ktec/ergodone/matrix.c
+1 -1
View File
@@ -49,7 +49,7 @@ static matrix_row_t expander_read_row(void) {
}
uint8_t ret = 0xFF;
mcp23018_errors += !mcp23018_readPins(I2C_ADDR, mcp23018_PORTA, &ret);
mcp23018_errors += !mcp23018_read_pins(I2C_ADDR, mcp23018_PORTA, &ret);
ret = bitrev(~ret);
ret = ((ret & 0b11111000) >> 1) | (ret & 0b00000011);
keyboards/mechwild/sugarglider/matrix.c
+1 -1
View File
@@ -38,7 +38,7 @@ static matrix_row_t read_cols(void) {
}
uint8_t ret = 0xFF; // sets all to 1
mcp23018_errors += !mcp23018_readPins(I2C_ADDR, mcp23018_PORTB, &ret); // will update with values 0 = pulled down by connection, 1 = pulled up by pullup resistors
mcp23018_errors += !mcp23018_read_pins(I2C_ADDR, mcp23018_PORTB, &ret); // will update with values 0 = pulled down by connection, 1 = pulled up by pullup resistors
return (~ret) & 0b00111111; // Clears out the two row bits in the B buffer.
}
keyboards/moon/matrix.c
+2 -2
View File
@@ -145,8 +145,8 @@ static void select_row(uint8_t row) {
static uint16_t read_cols(void) {
uint8_t state_1 = 0;
uint8_t state_2 = 0;
pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
pca9555_read_pins(IC2, PCA9555_PORT0, &state_1);
pca9555_read_pins(IC2, PCA9555_PORT1, &state_2);
uint16_t state = (((uint16_t)state_1 & PORT0_COLS_MASK) << 3) | (((uint16_t)state_2 & PORT1_COLS_MASK));
keyboards/switchplate/southpaw_65/matrix.c
+3 -3
View File
@@ -54,9 +54,9 @@ static uint32_t read_cols(void) {
uint8_t state_1 = 0;
uint8_t state_2 = 0;
uint8_t state_3 = 0;
pca9555_readPins(IC1, PCA9555_PORT1, &state_1);
pca9555_readPins(IC2, PCA9555_PORT0, &state_2);
pca9555_readPins(IC2, PCA9555_PORT1, &state_3);
pca9555_read_pins(IC1, PCA9555_PORT1, &state_1);
pca9555_read_pins(IC2, PCA9555_PORT0, &state_2);
pca9555_read_pins(IC2, PCA9555_PORT1, &state_3);
uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4));
return ~state;
keyboards/viktus/sp111/matrix.c
+1 -1
View File
@@ -117,7 +117,7 @@ static void select_row_MCP23018(uint8_t row) {
static uint16_t read_cols_MCP23018(void) {
uint16_t tmp = 0xFFFF;
mcp23018_errors += !mcp23018_readPins_all(I2C_ADDR, &tmp);
mcp23018_errors += !mcp23018_read_pins_all(I2C_ADDR, &tmp);
uint16_t state = ((tmp & 0b11111111) << 2) | ((tmp & 0b0110000000000000) >> 13);
return (~state) & 0b1111111111;
keyboards/xiudi/xd84/matrix.c
+3 -3
View File
@@ -51,10 +51,10 @@ static void select_row(uint8_t row) {
}
static uint16_t read_cols(void) {
// uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
// uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
// uint16_t state_1 = pca9555_read_pins(IC2, PCA9555_PORT0);
// uint16_t state_2 = pca9555_read_pins(IC2, PCA9555_PORT1);
uint16_t state = 0;
pca9555_readPins_all(IC2, &state);
pca9555_read_pins_all(IC2, &state);
// For the XD84 all cols are on the same IC and mapped sequentially
// while this technically gives 16 column reads,
keyboards/xiudi/xd96/matrix.c
+3 -3
View File
@@ -53,9 +53,9 @@ static uint32_t read_cols(void) {
uint8_t state_1 = 0;
uint8_t state_2 = 0;
uint8_t state_3 = 0;
pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
pca9555_read_pins(IC2, PCA9555_PORT0, &state_1);
pca9555_read_pins(IC2, PCA9555_PORT1, &state_2);
pca9555_read_pins(IC1, PCA9555_PORT1, &state_3);
// For the XD96 the pins are mapped to port expanders as follows:
// all 8 pins port 0 IC2, first 6 pins port 1 IC2, first 4 pins port 1 IC1