uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make bidirectional communication work between the keyboard halves. Make the set test LED USB command set the test LED of the left half, too.

Browse Source
This commit is contained in:
László Monda
2016-10-19 19:39:00 +02:00
parent 1286d9cfc3
commit 7a6e5523fb
9 changed files with 167 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
right/src/usb_interface_keyboard.c
View File

@@ -81,15 +81,10 @@ static usb_status_t UsbKeyboardAction(void)
UsbKeyboardReport.scancodes[scancodeIdx] = 0;
}
i2c_master_transfer_t masterXfer;
masterXfer.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF;
masterXfer.direction = kI2C_Read;
masterXfer.subaddress = 0;
masterXfer.subaddressSize = 0;
masterXfer.data = leftKeyStates;
masterXfer.dataSize = KEY_STATE_COUNT;
masterXfer.flags = kI2C_TransferDefaultFlag;
I2C_MasterTransferBlocking(I2C_MAIN_BUS_BASEADDR, &masterXfer);
uint8_t data[] = {0};
I2cWrite(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, data, sizeof(data));
I2cRead(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, leftKeyStates, KEY_STATE_COUNT);
scancodeIdx = 0;
for (uint8_t keyId=0; keyId<KEYBOARD_MATRIX_COLS_NUM*KEYBOARD_MATRIX_ROWS_NUM; keyId++) {

7
right/src/usb_protocol_handler.c
View File

@@ -103,8 +103,11 @@ void JumpToBootloader() {
void GetSetTestLed()
{
uint8_t arg = GenericHidInBuffer[1];
switch (arg) {
uint8_t ledState = GenericHidInBuffer[1];
uint8_t data[] = {1, ledState};
I2cWrite(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, data, sizeof(data));
switch (ledState) {
case 0:
TEST_LED_ON();
break;