aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/dc01/numpad
diff options
context:
space:
mode:
authorJames Churchill <pelrun@gmail.com>2019-01-23 02:57:13 +1000
committerDrashna Jaelre <drashna@live.com>2019-01-22 08:57:13 -0800
commit8cf7265f8fae6f94b17c5d78ed41e52b22e2b218 (patch)
tree232852c96d17fc612a78f788ab8ce713b99c3ffe /keyboards/dc01/numpad
parent127ec5f1e38e9472990f956a4b76192c07508feb (diff)
downloadfirmware-8cf7265f8fae6f94b17c5d78ed41e52b22e2b218.tar.gz
firmware-8cf7265f8fae6f94b17c5d78ed41e52b22e2b218.tar.bz2
firmware-8cf7265f8fae6f94b17c5d78ed41e52b22e2b218.zip
Rename i2c_slave functions so it can coexist with i2c_master (#4875)
Also merges tx/rx buffers, as only one is necessary.
Diffstat (limited to 'keyboards/dc01/numpad')
-rw-r--r--keyboards/dc01/numpad/matrix.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c
index f9a9a7f63..39637241d 100644
--- a/keyboards/dc01/numpad/matrix.c
+++ b/keyboards/dc01/numpad/matrix.c
@@ -195,14 +195,14 @@ uint8_t matrix_scan(void)
debouncing = false;
}
# endif
-
+
if (USB_DeviceState != DEVICE_STATE_Configured){
- txbuffer[1] = 0x55;
+ i2c_slave_reg[1] = 0x55;
for (uint8_t i = 0; i < MATRIX_ROWS; i++){
- txbuffer[i+2] = matrix[i]; //send matrix over i2c
+ i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
}
}
-
+
matrix_scan_quantum();
return 1;
}
@@ -396,9 +396,9 @@ static void unselect_cols(void)
//this replases tmk code
void matrix_setup(void){
-
+
if (USB_DeviceState != DEVICE_STATE_Configured){
- i2c_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
+ i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
sei(); //enable interupts
}
} \ No newline at end of file