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

Rename key_matrix_instance.[ch] to right_key_matrix.[ch]

Browse Source
This commit is contained in:
László Monda
2017-11-03 03:30:14 +01:00
parent fe2e611bb1
commit 88fac5c1ff
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
right/src/key_matrix_instance.h
View File

@@ -1,18 +0,0 @@
#ifndef __KEY_MATRIX_INSTANCE_H__
#define __KEY_MATRIX_INSTANCE_H__
// Includes:
#include "key_matrix.h"
// Macros:
#define KEYBOARD_MATRIX_COLS_NUM 7
#define KEYBOARD_MATRIX_ROWS_NUM 5
#define KEYBOARD_MATRIX_KEY_COUNT (KEYBOARD_MATRIX_COLS_NUM * KEYBOARD_MATRIX_ROWS_NUM)
// Variables:
extern key_matrix_t KeyMatrix;
#endif

2
right/src/key_scanner.c
View File

@@ -7,7 +7,7 @@ uint32_t counter = 0;
void PIT_KEY_SCANNER_HANDLER(void) void PIT_KEY_SCANNER_HANDLER(void)
{ {
*((uint32_t*)(UsbDebugInfo+20)) = counter++; *((uint32_t*)(UsbDebugInfo+20)) = counter++;
KeyMatrix_ScanRow(&KeyMatrix); KeyMatrix_ScanRow(&RightKeyMatrix);
PIT_ClearStatusFlags(PIT, PIT_KEY_SCANNER_CHANNEL, PIT_TFLG_TIF_MASK); PIT_ClearStatusFlags(PIT, PIT_KEY_SCANNER_CHANNEL, PIT_TFLG_TIF_MASK);
} }

4
right/src/key_scanner.h
View File

@@ -3,11 +3,11 @@
// Includes: // Includes:
#include "key_matrix_instance.h" #include "right_key_matrix.h"
// Macros: // Macros:
#define KEY_SCANNER_INTERVAL_USEC (1000 / KEYBOARD_MATRIX_ROWS_NUM) #define KEY_SCANNER_INTERVAL_USEC (1000 / RIGHT_KEY_MATRIX_ROWS_NUM)
#define PIT_KEY_SCANNER_HANDLER PIT1_IRQHandler #define PIT_KEY_SCANNER_HANDLER PIT1_IRQHandler
#define PIT_KEY_SCANNER_IRQ_ID PIT1_IRQn #define PIT_KEY_SCANNER_IRQ_ID PIT1_IRQn

6
right/src/main.c
View File

@@ -14,7 +14,7 @@
#include "command.h" #include "command.h"
#include "bootloader/wormhole.h" #include "bootloader/wormhole.h"
#include "eeprom.h" #include "eeprom.h"
#include "key_matrix_instance.h" #include "right_key_matrix.h"
#include "key_scanner.h" #include "key_scanner.h"
#include "key_states.h" #include "key_states.h"
@@ -25,7 +25,7 @@ void updateUsbReports(void)
} }
#ifndef INTERRUPT_KEY_SCANNER #ifndef INTERRUPT_KEY_SCANNER
KeyMatrix_Scan(&KeyMatrix); KeyMatrix_Scan(&RightKeyMatrix);
#endif #endif
ResetActiveUsbBasicKeyboardReport(); ResetActiveUsbBasicKeyboardReport();
@@ -68,7 +68,7 @@ void main(void)
handleUsbBusPalCommand(); handleUsbBusPalCommand();
} else { } else {
InitSlaveScheduler(); InitSlaveScheduler();
KeyMatrix_Init(&KeyMatrix); KeyMatrix_Init(&RightKeyMatrix);
#ifdef INTERRUPT_KEY_SCANNER #ifdef INTERRUPT_KEY_SCANNER
InitKeyScanner(); InitKeyScanner();
#endif #endif

8
right/src/key_matrix_instance.c → right/src/right_key_matrix.c
View File

@@ -1,8 +1,8 @@
#include "key_matrix_instance.h" #include "right_key_matrix.h"
key_matrix_t KeyMatrix = { key_matrix_t RightKeyMatrix = {
.colNum = KEYBOARD_MATRIX_COLS_NUM, .colNum = RIGHT_KEY_MATRIX_COLS_NUM,
.rowNum = KEYBOARD_MATRIX_ROWS_NUM, .rowNum = RIGHT_KEY_MATRIX_ROWS_NUM,
.cols = (key_matrix_pin_t[]){ .cols = (key_matrix_pin_t[]){
{PORTA, GPIOA, kCLOCK_PortA, 5}, {PORTA, GPIOA, kCLOCK_PortA, 5},
{PORTB, GPIOB, kCLOCK_PortB, 16}, {PORTB, GPIOB, kCLOCK_PortB, 16},

18
right/src/right_key_matrix.h Normal file
View File

@@ -0,0 +1,18 @@
#ifndef __RIGHT_KEY_MATRIX_H__
#define __RIGHT_KEY_MATRIX_H__
// Includes:
#include "key_matrix.h"
// Macros:
#define RIGHT_KEY_MATRIX_COLS_NUM 7
#define RIGHT_KEY_MATRIX_ROWS_NUM 5
#define RIGHT_KEY_MATRIX_KEY_COUNT (RIGHT_KEY_MATRIX_COLS_NUM * RIGHT_KEY_MATRIX_ROWS_NUM)
// Variables:
extern key_matrix_t RightKeyMatrix;
#endif

6
right/src/usb_report_updater.c
View File

@@ -10,7 +10,7 @@
#include "led_pwm.h" #include "led_pwm.h"
#include "macros.h" #include "macros.h"
#include "key_states.h" #include "key_states.h"
#include "key_matrix_instance.h" #include "right_key_matrix.h"
static uint8_t mouseWheelDivisorCounter = 0; static uint8_t mouseWheelDivisorCounter = 0;
static uint8_t mouseSpeedAccelDivisorCounter = 0; static uint8_t mouseSpeedAccelDivisorCounter = 0;
@@ -99,8 +99,8 @@ void UpdateActiveUsbReports(void)
static uint8_t previousModifiers = 0; static uint8_t previousModifiers = 0;
uint8_t activeLayer; uint8_t activeLayer;
for (uint8_t keyId=0; keyId < KEYBOARD_MATRIX_KEY_COUNT; keyId++) { for (uint8_t keyId=0; keyId < RIGHT_KEY_MATRIX_KEY_COUNT; keyId++) {
KeyStates[SlotId_RightKeyboardHalf][keyId].current = KeyMatrix.keyStates[keyId]; KeyStates[SlotId_RightKeyboardHalf][keyId].current = RightKeyMatrix.keyStates[keyId];
} }
if (MacroPlaying) { if (MacroPlaying) {