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

Rename keyMatrix to KeyMatrix because it's a global.

Browse Source
This commit is contained in:
László Monda
2017-01-02 23:11:24 +01:00
parent c1a6eaffde
commit 3942d089de
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
right/src/main.c
View File

@@ -4,7 +4,7 @@
#include "usb_composite_device.h" #include "usb_composite_device.h"
#include "led_driver.h" #include "led_driver.h"
key_matrix_t keyMatrix = { key_matrix_t KeyMatrix = {
.colNum = KEYBOARD_MATRIX_COLS_NUM, .colNum = KEYBOARD_MATRIX_COLS_NUM,
.rowNum = KEYBOARD_MATRIX_ROWS_NUM, .rowNum = KEYBOARD_MATRIX_ROWS_NUM,
#if UHK_PCB_MAJOR_VERSION == 7 #if UHK_PCB_MAJOR_VERSION == 7
@@ -48,7 +48,7 @@ void main() {
InitPeripherials(); InitPeripherials();
InitClock(); InitClock();
LedDriver_InitAllLeds(1); LedDriver_InitAllLeds(1);
KeyMatrix_Init(&keyMatrix); KeyMatrix_Init(&KeyMatrix);
UsbKeyboadTask(); UsbKeyboadTask();
InitUsb(); InitUsb();

2
right/src/main.h
View File

@@ -12,6 +12,6 @@
// Variables: // Variables:
extern key_matrix_t keyMatrix; extern key_matrix_t KeyMatrix;
#endif #endif

4
right/src/usb_interface_keyboard.c
View File

@@ -50,7 +50,7 @@ void UsbKeyboadTask()
UsbKeyboardReport[newReportIndex].modifiers = 0; UsbKeyboardReport[newReportIndex].modifiers = 0;
UsbKeyboardReport[newReportIndex].reserved = 0; UsbKeyboardReport[newReportIndex].reserved = 0;
KeyMatrix_Scan(&keyMatrix); KeyMatrix_Scan(&KeyMatrix);
uint8_t txData[] = {0}; uint8_t txData[] = {0};
static uint8_t leftKeyStates[KEY_STATE_COUNT]; static uint8_t leftKeyStates[KEY_STATE_COUNT];
@@ -60,7 +60,7 @@ void UsbKeyboadTask()
} }
bzero(&UsbKeyboardReport[newReportIndex].scancodes, USB_KEYBOARD_MAX_KEYS); bzero(&UsbKeyboardReport[newReportIndex].scancodes, USB_KEYBOARD_MAX_KEYS);
HandleKeyboardEvents(&UsbKeyboardReport[newReportIndex], &UsbMouseReport, leftKeyStates, keyMatrix.keyStates); HandleKeyboardEvents(&UsbKeyboardReport[newReportIndex], &UsbMouseReport, leftKeyStates, KeyMatrix.keyStates);
activeReportIndex = newReportIndex; activeReportIndex = newReportIndex;
} }