diff options
| author | James Churchill <pelrun@gmail.com> | 2019-01-23 02:57:13 +1000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-01-22 08:57:13 -0800 |
| commit | 8cf7265f8fae6f94b17c5d78ed41e52b22e2b218 (patch) | |
| tree | 232852c96d17fc612a78f788ab8ce713b99c3ffe /keyboards/dc01 | |
| parent | 127ec5f1e38e9472990f956a4b76192c07508feb (diff) | |
| download | qmk_firmware-8cf7265f8fae6f94b17c5d78ed41e52b22e2b218.tar.gz qmk_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')
| -rw-r--r-- | keyboards/dc01/arrow/matrix.c | 12 | ||||
| -rw-r--r-- | keyboards/dc01/numpad/matrix.c | 12 | ||||
| -rw-r--r-- | keyboards/dc01/right/matrix.c | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c index 68abb6791a..85591f6026 100644 --- a/keyboards/dc01/arrow/matrix.c +++ b/keyboards/dc01/arrow/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 diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index f9a9a7f63d..39637241d7 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 diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index aa2e880d01..50fe19b8d1 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 |