summaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-03-27 23:41:53 +1100
committerGitHub <noreply@github.com>2024-03-27 12:41:53 +0000
commit01be746fc41d7c0860df379849b5fa79ed6c5587 (patch)
tree54d28e566092a9718e1d17e4b717303704ab951e /keyboards/ergodox_ez
parent148d66fc9f46b9186ec16e8b33f63bf267b7bb82 (diff)
Update I2C API usage in keyboard code (#23360)
Diffstat (limited to 'keyboards/ergodox_ez')
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.c6
-rw-r--r--keyboards/ergodox_ez/matrix.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 3d6272ae66..5270738f86 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -156,14 +156,14 @@ uint8_t init_mcp23018(void) {
156 // - input : input : 1 156 // - input : input : 1
157 // - driving : output : 0 157 // - driving : output : 0
158 uint8_t data[] = {0b00000000, 0b00111111}; 158 uint8_t data[] = {0b00000000, 0b00111111};
159 mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); 159 mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
160 160
161 if (!mcp23018_status) { 161 if (!mcp23018_status) {
162 // set pull-up 162 // set pull-up
163 // - unused : on : 1 163 // - unused : on : 1
164 // - input : on : 1 164 // - input : on : 1
165 // - driving : off : 0 165 // - driving : off : 0
166 mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); 166 mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
167 } 167 }
168 168
169#ifdef LEFT_LEDS 169#ifdef LEFT_LEDS
@@ -191,7 +191,7 @@ uint8_t ergodox_left_leds_update(void) {
191 uint8_t data[2]; 191 uint8_t data[2];
192 data[0] = 0b11111111 & ~(ergodox_left_led_3 << LEFT_LED_3_SHIFT); 192 data[0] = 0b11111111 & ~(ergodox_left_led_3 << LEFT_LED_3_SHIFT);
193 data[1] = 0b11111111 & ~(ergodox_left_led_2 << LEFT_LED_2_SHIFT) & ~(ergodox_left_led_1 << LEFT_LED_1_SHIFT); 193 data[1] = 0b11111111 & ~(ergodox_left_led_2 << LEFT_LED_2_SHIFT) & ~(ergodox_left_led_1 << LEFT_LED_1_SHIFT);
194 mcp23018_status = i2c_writeReg(I2C_ADDR, OLATA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); 194 mcp23018_status = i2c_write_register(I2C_ADDR, OLATA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
195 195
196 return mcp23018_status; 196 return mcp23018_status;
197} 197}
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 28bee05779..9013c0785f 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -193,7 +193,7 @@ static void select_row(uint8_t row) {
193 // set other rows hi-Z : 1 193 // set other rows hi-Z : 1
194 uint8_t data; 194 uint8_t data;
195 data = 0xFF & ~(1 << row); 195 data = 0xFF & ~(1 << row);
196 mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT); 196 mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
197 } 197 }
198 } else { 198 } else {
199 // select on teensy 199 // select on teensy