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

Inline isKeyPressed(). Rename key to action within HandleMouseKey() and a few other identifiers to make the code more intuitive.

Browse Source
This commit is contained in:
László Monda
2017-02-26 01:34:38 +01:00
parent 66d41a0d49
commit 476a2fb89a
4 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
right/src/action.c
View File

@@ -5,75 +5,65 @@
#include "usb_interface_mouse.h" #include "usb_interface_mouse.h"
#include "current_keymap.h" #include "current_keymap.h"
static uint8_t ActiveLayer = LAYER_ID_BASE; static uint8_t activeLayer = LAYER_ID_BASE;
static bool isKeyPressed(const uint8_t *currKeyStates, uint8_t keyId)
{
return currKeyStates[keyId];
}
static uint8_t mouseWheelDivisorCounter = 0; static uint8_t mouseWheelDivisorCounter = 0;
static uint8_t mouseSpeedAccelDivisorCounter = 0; static uint8_t mouseSpeedAccelDivisorCounter = 0;
static uint8_t mouseSpeed = 3; static uint8_t mouseSpeed = 3;
static bool wasPreviousMouseActionWheelAction = false; static bool wasPreviousMouseActionWheelAction = false;
void HandleMouseKey(usb_mouse_report_t *report, key_action_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) void HandleMouseKey(key_action_t action)
{ {
if (!isKeyPressed(currKeyStates, keyId)) { bool isWheelAction = action.mouse.scrollActions && !action.mouse.moveActions && !action.mouse.buttonActions;
return;
}
bool isWheelAction = key.mouse.scrollActions && !key.mouse.moveActions && !key.mouse.buttonActions;
if (isWheelAction && wasPreviousMouseActionWheelAction) { if (isWheelAction && wasPreviousMouseActionWheelAction) {
mouseWheelDivisorCounter++; mouseWheelDivisorCounter++;
} }
if (key.mouse.scrollActions) { if (action.mouse.scrollActions) {
if (mouseWheelDivisorCounter == MOUSE_WHEEL_DIVISOR) { if (mouseWheelDivisorCounter == MOUSE_WHEEL_DIVISOR) {
mouseWheelDivisorCounter = 0; mouseWheelDivisorCounter = 0;
if (key.mouse.scrollActions & MOUSE_SCROLL_UP) { if (action.mouse.scrollActions & MOUSE_SCROLL_UP) {
report->wheelX = 1; UsbMouseReport.wheelX = 1;
} }
if (key.mouse.scrollActions & MOUSE_SCROLL_DOWN) { if (action.mouse.scrollActions & MOUSE_SCROLL_DOWN) {
report->wheelX = -1; UsbMouseReport.wheelX = -1;
} }
} }
} }
if (key.mouse.moveActions & MOUSE_ACCELERATE || key.mouse.moveActions & MOUSE_DECELERATE) { if (action.mouse.moveActions & MOUSE_ACCELERATE || action.mouse.moveActions & MOUSE_DECELERATE) {
mouseSpeedAccelDivisorCounter++; mouseSpeedAccelDivisorCounter++;
if (mouseSpeedAccelDivisorCounter == MOUSE_SPEED_ACCEL_DIVISOR) { if (mouseSpeedAccelDivisorCounter == MOUSE_SPEED_ACCEL_DIVISOR) {
mouseSpeedAccelDivisorCounter = 0; mouseSpeedAccelDivisorCounter = 0;
if (key.mouse.moveActions & MOUSE_ACCELERATE) { if (action.mouse.moveActions & MOUSE_ACCELERATE) {
if (mouseSpeed < MOUSE_MAX_SPEED) { if (mouseSpeed < MOUSE_MAX_SPEED) {
mouseSpeed++; mouseSpeed++;
} }
} }
if (key.mouse.moveActions & MOUSE_DECELERATE) { if (action.mouse.moveActions & MOUSE_DECELERATE) {
if (mouseSpeed > 1) { if (mouseSpeed > 1) {
mouseSpeed--; mouseSpeed--;
} }
} }
} }
} else if (key.mouse.moveActions) { } else if (action.mouse.moveActions) {
if (key.mouse.moveActions & MOUSE_MOVE_LEFT) { if (action.mouse.moveActions & MOUSE_MOVE_LEFT) {
report->x = -mouseSpeed; UsbMouseReport.x = -mouseSpeed;
} }
if (key.mouse.moveActions & MOUSE_MOVE_RIGHT) { if (action.mouse.moveActions & MOUSE_MOVE_RIGHT) {
report->x = mouseSpeed; UsbMouseReport.x = mouseSpeed;
} }
if (key.mouse.moveActions & MOUSE_MOVE_UP) { if (action.mouse.moveActions & MOUSE_MOVE_UP) {
report->y = -mouseSpeed; UsbMouseReport.y = -mouseSpeed;
} }
if (key.mouse.moveActions & MOUSE_MOVE_DOWN) { if (action.mouse.moveActions & MOUSE_MOVE_DOWN) {
report->y = mouseSpeed; UsbMouseReport.y = mouseSpeed;
} }
} }
report->buttons |= key.mouse.buttonActions; UsbMouseReport.buttons |= action.mouse.buttonActions;
wasPreviousMouseActionWheelAction = isWheelAction; wasPreviousMouseActionWheelAction = isWheelAction;
} }
@@ -81,13 +71,13 @@ void HandleMouseKey(usb_mouse_report_t *report, key_action_t key, const uint8_t
void HandleKeyboardEvents() { void HandleKeyboardEvents() {
int scancodeIdx = 0; int scancodeIdx = 0;
ActiveLayer = LAYER_ID_BASE; activeLayer = LAYER_ID_BASE;
for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) { for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) { for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {
if (CurrentKeyStates[slotId][keyId]) { if (CurrentKeyStates[slotId][keyId]) {
key_action_t action = CurrentKeymap[LAYER_ID_BASE][slotId][keyId]; key_action_t action = CurrentKeymap[LAYER_ID_BASE][slotId][keyId];
if (action.type == KEY_ACTION_SWITCH_LAYER) { if (action.type == KEY_ACTION_SWITCH_LAYER) {
ActiveLayer = action.switchLayer.layer; activeLayer = action.switchLayer.layer;
} }
} }
} }
@@ -100,14 +90,14 @@ void HandleKeyboardEvents() {
continue; continue;
} }
key_action_t action = CurrentKeymap[ActiveLayer][slotId][keyId]; key_action_t action = CurrentKeymap[activeLayer][slotId][keyId];
switch (action.type) { switch (action.type) {
case KEY_ACTION_KEYSTROKE: case KEY_ACTION_KEYSTROKE:
ActiveUsbKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.key; ActiveUsbKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.key;
ActiveUsbKeyboardReport->modifiers |= action.keystroke.mods; ActiveUsbKeyboardReport->modifiers |= action.keystroke.mods;
break; break;
case KEY_ACTION_MOUSE: case KEY_ACTION_MOUSE:
HandleMouseKey(&UsbMouseReport, action, PreviousKeyStates[slotId], CurrentKeyStates[slotId], keyId); HandleMouseKey(action);
break; break;
} }
} }

2
right/src/action.h
View File

@@ -90,7 +90,7 @@ typedef struct {
}; };
} __attribute__ ((packed)) key_action_t; } __attribute__ ((packed)) key_action_t;
void HandleMouseKey(usb_mouse_report_t *report, key_action_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId); void HandleMouseKey(key_action_t action);
void HandleKeyboardEvents(); void HandleKeyboardEvents();
#endif #endif

2
right/src/main.c
View File

@@ -74,7 +74,7 @@ void UpdateUsbReports()
// I2cRead(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT); // I2cRead(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
// } // }
HandleKeyboardEvents(ActiveUsbKeyboardReport, &UsbMouseReport); HandleKeyboardEvents();
SwitchActiveUsbKeyboardReport(); SwitchActiveUsbKeyboardReport();
} }

5
right/src/usb_interface_mouse.c
View File

@@ -53,11 +53,6 @@ static volatile usb_status_t UsbMouseAction(void)
return ret; return ret;
} }
void fillMouseReport(key_action_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId)
{
HandleMouseKey(&UsbMouseReport, key, prevKeyStates, currKeyStates, keyId);
}
usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param) usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param)
{ {
usb_status_t error = kStatus_USB_Error; usb_status_t error = kStatus_USB_Error;