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

Replace SLOT_ID_* macros with SlotId_* enum values.

Browse Source
This commit is contained in:
László Monda
2017-09-26 20:01:18 +02:00
parent 065a19fdc8
commit 9dde9ee917
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
right/src/main.c
View File

@@ -50,7 +50,7 @@ void UpdateUsbReports()
KeyMatrix_Scan(&KeyMatrix); KeyMatrix_Scan(&KeyMatrix);
memcpy(CurrentKeyStates[SLOT_ID_RIGHT_KEYBOARD_HALF], KeyMatrix.keyStates, MAX_KEY_COUNT_PER_MODULE); memcpy(CurrentKeyStates[SlotId_RightKeyboardHalf], KeyMatrix.keyStates, MAX_KEY_COUNT_PER_MODULE);
UpdateActiveUsbReports(); UpdateActiveUsbReports();
SwitchActiveUsbBasicKeyboardReport(); SwitchActiveUsbBasicKeyboardReport();

2
right/src/slave_drivers/uhk_module_driver.c
View File

@@ -47,7 +47,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
break; break;
case UhkModulePhase_ProcessKeystates: case UhkModulePhase_ProcessKeystates:
if (CRC16_IsMessageValid(&rxMessage)) { if (CRC16_IsMessageValid(&rxMessage)) {
BoolBitsToBytes(rxMessage.data, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT); BoolBitsToBytes(rxMessage.data, CurrentKeyStates[SlotId_LeftKeyboardHalf], LEFT_KEYBOARD_HALF_KEY_COUNT);
} }
status = kStatus_Uhk_NoOp; status = kStatus_Uhk_NoOp;
uhkModulePhase = UhkModulePhase_SetTestLed; uhkModulePhase = UhkModulePhase_SetTestLed;

14
right/src/slot.h
View File

@@ -12,11 +12,15 @@
// Macros: // Macros:
#define SLOT_ID_RIGHT_KEYBOARD_HALF 0
#define SLOT_ID_LEFT_KEYBOARD_HALF 1
#define SLOT_ID_LEFT_MODULE 2
#define SLOT_ID_RIGHT_MODULE 3
#define SLOT_COUNT 4 #define SLOT_COUNT 4
// Typedefs:
typedef enum {
SlotId_RightKeyboardHalf = 0,
SlotId_LeftKeyboardHalf = 1,
SlotId_LeftModule = 2,
SlotId_RightModule = 3,
} slot_t;
#endif #endif