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

move SERIALIZED_KEYSTROKE_TYPE_* macros to parse_keymap.h

Browse Source
This commit is contained in:
László Monda
2017-06-15 19:00:44 +02:00
parent 3d4def76f8
commit 480b184ab5
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
right/src/config/parse_keymap.c
View File

@@ -4,14 +4,6 @@
#define longCompactLengthPrefix 0xff
#define HAS_SCANCODE 0b00001
#define HAS_MODS 0b00010
#define HAS_LONGPRESS 0b00100
#define KEYSTROKE_TYPE 0b11000
#define KEYSTROKE_TYPE_SHIFT 3
// ----------------
static uint8_t readUInt8(serialized_buffer_t *buffer) {
return buffer->buffer[buffer->offset++];
}
@@ -55,7 +47,7 @@ static void parseKeyStrokeAction(key_action_t *action, uint8_t actionType, seria
action->type = KEY_ACTION_KEYSTROKE;
uint8_t keystrokeType = (KEYSTROKE_TYPE & flags) >> KEYSTROKE_TYPE_SHIFT;
uint8_t keystrokeType = (SERIALIZED_KEYSTROKE_TYPE_MASK_KEYSTROKE_TYPE & flags) >> SERIALIZED_KEYSTROKE_TYPE_OFFSET_KEYSTROKE_TYPE;
switch (keystrokeType) {
case SerializedKeystrokeType_Basic:
action->keystroke.keystrokeType = KEYSTROKE_BASIC;
@@ -68,13 +60,13 @@ static void parseKeyStrokeAction(key_action_t *action, uint8_t actionType, seria
action->keystroke.keystrokeType = KEYSTROKE_SYSTEM;
break;
}
if (flags & HAS_SCANCODE) {
if (flags & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_SCANCODE) {
action->keystroke.scancode = keystrokeType == SerializedKeystrokeType_LongMedia ? readUInt16(buffer) : readUInt8(buffer);
}
if (flags & HAS_MODS) {
if (flags & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_MODIFIERS) {
action->keystroke.modifiers = readUInt8(buffer);
}
if (flags & HAS_LONGPRESS) {
if (flags & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_LONGPRESS) {
action->keystroke.longPressAction = readUInt8(buffer);
}
}

8
right/src/config/parse_keymap.h
View File

@@ -5,6 +5,14 @@
#include <stdint.h>
// Macros:
#define SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_SCANCODE 0b00001
#define SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_MODIFIERS 0b00010
#define SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_LONGPRESS 0b00100
#define SERIALIZED_KEYSTROKE_TYPE_MASK_KEYSTROKE_TYPE 0b11000
#define SERIALIZED_KEYSTROKE_TYPE_OFFSET_KEYSTROKE_TYPE 3
// Typedefs:
typedef enum {