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

Rename UsbKeyboadTask() to updateUsbReports() and move it to main.c

Browse Source
This commit is contained in:
László Monda
2017-01-10 01:19:29 +01:00
parent a0c7f407e8
commit a76a690a98
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
right/src/main.c
View File

@@ -4,6 +4,7 @@
#include "usb_composite_device.h"
#include "led_driver.h"
#include "deserialize.h"
#include "action.h"
key_matrix_t KeyMatrix = {
.colNum = KEYBOARD_MATRIX_COLS_NUM,
@@ -58,18 +59,36 @@ static const uint8_t testData[] =
0x0a, 0x02, 0x2d, 0x02, 0x1d, 0x02, 0x1b, 0x02, 0x06, 0x02, 0x19, 0x02, 0x05, 0x02, 0x04, 0x02, 0x05, 0x02, 0x06,
0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x02, 0x00 };
void updateUsbReports()
{
ResetActiveUsbKeyboardReport();
KeyMatrix_Scan(&KeyMatrix);
memcpy(CurrentKeyStates[SLOT_ID_RIGHT_KEYBOARD_HALF], KeyMatrix.keyStates, MAX_KEY_COUNT_PER_MODULE);
uint8_t txData[] = {0};
bzero(CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], MAX_KEY_COUNT_PER_MODULE);
if (I2cWrite(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, txData, sizeof(txData)) == kStatus_Success) {
I2cRead(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
}
HandleKeyboardEvents(ActiveUsbKeyboardReport, &UsbMouseReport);
SwitchActiveUsbKeyboardReport();
}
void main() {
InitPeripherials();
InitClock();
LedDriver_InitAllLeds(1);
KeyMatrix_Init(&KeyMatrix);
UsbKeyboadTask();
updateUsbReports();
InitUsb();
// deserialize_Layer(testData, 0);
while (1) {
UsbKeyboadTask();
updateUsbReports();
asm("wfi");
}
}

18
right/src/usb_interface_keyboard.c
View File

@@ -58,24 +58,6 @@ void ResetActiveUsbKeyboardReport()
bzero(ActiveUsbKeyboardReport, USB_KEYBOARD_REPORT_LENGTH);
}
void UsbKeyboadTask()
{
ResetActiveUsbKeyboardReport();
KeyMatrix_Scan(&KeyMatrix);
memcpy(CurrentKeyStates[SLOT_ID_RIGHT_KEYBOARD_HALF], KeyMatrix.keyStates, MAX_KEY_COUNT_PER_MODULE);
uint8_t txData[] = {0};
bzero(CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], MAX_KEY_COUNT_PER_MODULE);
if (I2cWrite(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, txData, sizeof(txData)) == kStatus_Success) {
I2cRead(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
}
HandleKeyboardEvents(ActiveUsbKeyboardReport, &UsbMouseReport);
SwitchActiveUsbKeyboardReport();
}
static usb_status_t UsbKeyboardAction(void)
{
return USB_DeviceHidSend(UsbCompositeDevice.keyboardHandle, USB_KEYBOARD_ENDPOINT_INDEX,

2
right/src/usb_interface_keyboard.h
View File

@@ -40,6 +40,4 @@
extern void ResetActiveUsbKeyboardReport();
extern void SwitchActiveUsbKeyboardReport();
extern void UsbKeyboadTask();
#endif