drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Joshua Diamond 2021-02-15 20:55:54 -05:00
commit d36dbe66e1
60 changed files with 979 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

20
keyboards/dc01/right/matrix.c
View file

@ -31,8 +31,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "timer.h"
#include "i2c_slave.h"
#include "lufa.h"
#include "quantum.h"
#define SLAVE_I2C_ADDRESS 0x19
#define SLAVE_I2C_ADDRESS 0x32
/* Set 0 if debouncing isn't needed */
@ -196,12 +197,10 @@ uint8_t matrix_scan(void)
}
# endif
if (USB_DeviceState != DEVICE_STATE_Configured){
i2c_slave_reg[1] = 0x55;
for (uint8_t i = 0; i < MATRIX_ROWS; i++){
i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
}
}
i2c_slave_reg[1] = 0x55;
for (uint8_t i = 0; i < MATRIX_ROWS; i++){
i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
}
matrix_scan_quantum();
return 1;
@ -396,9 +395,6 @@ static void unselect_cols(void)
//this replases tmk code
void matrix_setup(void){
if (USB_DeviceState != DEVICE_STATE_Configured){
i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
sei(); //enable interupts
}
i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
sei(); //enable interupts
}