From 8cf7265f8fae6f94b17c5d78ed41e52b22e2b218 Mon Sep 17 00:00:00 2001 From: James Churchill Date: Wed, 23 Jan 2019 02:57:13 +1000 Subject: Rename i2c_slave functions so it can coexist with i2c_master (#4875) Also merges tx/rx buffers, as only one is necessary. --- keyboards/dc01/right/matrix.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboards/dc01/right') diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index aa2e880d0..50fe19b8d 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/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 -- cgit v1.2.3-70-g09d2