diff options
author | Ryan <[email protected]> | 2024-03-27 23:41:53 +1100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-03-27 12:41:53 +0000 |
commit | 01be746fc41d7c0860df379849b5fa79ed6c5587 (patch) | |
tree | 54d28e566092a9718e1d17e4b717303704ab951e /keyboards/handwired | |
parent | 148d66fc9f46b9186ec16e8b33f63bf267b7bb82 (diff) | |
download | qmk_firmware-01be746fc41d7c0860df379849b5fa79ed6c5587.tar.gz qmk_firmware-01be746fc41d7c0860df379849b5fa79ed6c5587.zip |
Update I2C API usage in keyboard code (#23360)
Diffstat (limited to 'keyboards/handwired')
-rw-r--r-- | keyboards/handwired/frenchdev/frenchdev.c | 4 | ||||
-rw-r--r-- | keyboards/handwired/frenchdev/matrix.c | 6 | ||||
-rw-r--r-- | keyboards/handwired/pterodactyl/matrix.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/handwired/frenchdev/frenchdev.c b/keyboards/handwired/frenchdev/frenchdev.c index 65f1ccce4b..818c395c8e 100644 --- a/keyboards/handwired/frenchdev/frenchdev.c +++ b/keyboards/handwired/frenchdev/frenchdev.c @@ -84,14 +84,14 @@ uint8_t init_mcp23018(void) { // - input : input : 1 // - driving : output : 0 uint8_t data[] = {0b00000000, 0b00111111}; - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT); if (!mcp23018_status) { // set pull-up // - unused : on : 1 // - input : on : 1 // - driving : off : 0 - mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT); } // SREG=sreg_prev; diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c index af7c8b5444..68ec8e0801 100644 --- a/keyboards/handwired/frenchdev/matrix.c +++ b/keyboards/handwired/frenchdev/matrix.c @@ -224,7 +224,7 @@ static matrix_row_t read_cols(uint8_t row) return 0; } else { uint8_t data = 0; - mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT); + mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT); return ~data; } @@ -259,7 +259,7 @@ static void unselect_rows(void) // set all rows hi-Z : 1 uint8_t data; data = 0xFF & ~(0<<8); - mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); } @@ -283,7 +283,7 @@ static void select_row(uint8_t row) // set active row low : 0 // set other rows hi-Z : 1 uint8_t data = 0xFF & ~(1<<row) & ~(0<<8); - mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); } } else { // select on teensy diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c index 0dff65eda6..54da26a7d4 100644 --- a/keyboards/handwired/pterodactyl/matrix.c +++ b/keyboards/handwired/pterodactyl/matrix.c @@ -182,14 +182,14 @@ void init_expander(void) { uint8_t data[] = { expander_input_pin_mask, 0}; # endif #endif - expander_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT); + expander_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT); if (!expander_status) { // set pull-up // - unused : off : 0 // - input : on : 1 // - driving : off : 0 - expander_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT); + expander_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT); } } @@ -305,7 +305,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // Read columns from expander, unless it's in an error state if (! expander_status) { uint8_t data; - i2c_readReg(I2C_ADDR, EXPANDER_COL_REGISTER, &data, 1, I2C_TIMEOUT); + i2c_read_register(I2C_ADDR, EXPANDER_COL_REGISTER, &data, 1, I2C_TIMEOUT); current_matrix[current_row] |= (~data) & expander_input_pin_mask; } @@ -329,7 +329,7 @@ static void select_row(uint8_t row) { // set active row low : 0 // set other rows hi-Z : 1 uint8_t data = 0xFF & ~(1<<row); - i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &data, 1, I2C_TIMEOUT); + i2c_write_register(I2C_ADDR, EXPANDER_ROW_REGISTER, &data, 1, I2C_TIMEOUT); } // select on teensy @@ -385,7 +385,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) return false; } - i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT); + i2c_write_register(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT); column_state = ~column_state; } else { for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { |