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

Rename key action related enums and values to be easier to read.

Browse Source
This commit is contained in:
László Monda
2017-06-15 19:14:05 +02:00
parent 480b184ab5
commit 976444b5fe
4 changed files with 352 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/usb_report_updater.c
+16 -16
View File
@@ -28,43 +28,43 @@ void processMouseAction(key_action_t action)
if (action.mouse.scrollActions) {
if (mouseWheelDivisorCounter == MOUSE_WHEEL_DIVISOR) {
mouseWheelDivisorCounter = 0;
if (action.mouse.scrollActions & MOUSE_SCROLL_UP) {
if (action.mouse.scrollActions & MouseScroll_Up) {
UsbMouseReport.wheelX = 1;
}
if (action.mouse.scrollActions & MOUSE_SCROLL_DOWN) {
if (action.mouse.scrollActions & MouseScroll_Down) {
UsbMouseReport.wheelX = -1;
}
}
}
if (action.mouse.moveActions & MOUSE_ACCELERATE || action.mouse.moveActions & MOUSE_DECELERATE) {
if (action.mouse.moveActions & MouseMove_Accelerate || action.mouse.moveActions & MouseMove_Decelerate) {
mouseSpeedAccelDivisorCounter++;
if (mouseSpeedAccelDivisorCounter == MOUSE_SPEED_ACCEL_DIVISOR) {
mouseSpeedAccelDivisorCounter = 0;
if (action.mouse.moveActions & MOUSE_ACCELERATE) {
if (action.mouse.moveActions & MouseMove_Accelerate) {
if (mouseSpeed < MOUSE_MAX_SPEED) {
mouseSpeed++;
}
}
if (action.mouse.moveActions & MOUSE_DECELERATE) {
if (action.mouse.moveActions & MouseMove_Decelerate) {
if (mouseSpeed > 1) {
mouseSpeed--;
}
}
}
} else if (action.mouse.moveActions) {
if (action.mouse.moveActions & MOUSE_MOVE_LEFT) {
if (action.mouse.moveActions & MouseMove_Left) {
UsbMouseReport.x = -mouseSpeed;
}
if (action.mouse.moveActions & MOUSE_MOVE_RIGHT) {
if (action.mouse.moveActions & MouseMove_Right) {
UsbMouseReport.x = mouseSpeed;
}
if (action.mouse.moveActions & MOUSE_MOVE_UP) {
if (action.mouse.moveActions & MouseMove_Up) {
UsbMouseReport.y = -mouseSpeed;
}
if (action.mouse.moveActions & MOUSE_MOVE_DOWN) {
if (action.mouse.moveActions & MouseMove_Down) {
UsbMouseReport.y = mouseSpeed;
}
}
@@ -120,7 +120,7 @@ void UpdateActiveUsbReports() {
for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {
if (CurrentKeyStates[slotId][keyId]) {
key_action_t action = CurrentKeymap[LAYER_ID_BASE][slotId][keyId];
if (action.type == KEY_ACTION_SWITCH_LAYER) {
if (action.type == KeyActionType_SwitchLayer) {
activeLayer = action.switchLayer.layer;
}
}
@@ -136,23 +136,23 @@ void UpdateActiveUsbReports() {
key_action_t action = CurrentKeymap[activeLayer][slotId][keyId];
switch (action.type) {
case KEY_ACTION_KEYSTROKE:
case KeyActionType_Keystroke:
ActiveUsbBasicKeyboardReport->modifiers |= action.keystroke.modifiers;
switch (action.keystroke.keystrokeType) {
case KEYSTROKE_BASIC:
case KeystrokeType_Basic:
if (basicScancodeIndex >= USB_BASIC_KEYBOARD_MAX_KEYS) {
break;
}
ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = action.keystroke.scancode;
break;
case KEYSTROKE_MEDIA:
case KeystrokeType_Media:
if (mediaScancodeIndex >= USB_MEDIA_KEYBOARD_MAX_KEYS) {
break;
}
ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = action.keystroke.scancode;
break;
case KEYSTROKE_SYSTEM:
case KeystrokeType_System:
if (systemScancodeIndex >= USB_SYSTEM_KEYBOARD_MAX_KEYS) {
break;
}
@@ -160,10 +160,10 @@ void UpdateActiveUsbReports() {
break;
}
break;
case KEY_ACTION_MOUSE:
case KeyActionType_Mouse:
processMouseAction(action);
break;
case KEY_ACTION_TEST:
case KeyActionType_Test:
processTestAction(action);
break;
}