Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

Expanded handler implementation, more key defines.

Browse Source
This commit is contained in:
Pete Johanson
2020-05-10 17:13:24 -04:00
parent 70bf1230fa
commit 60feb8fb09
8 changed files with 189 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/handlers.c Normal file
View File

@@ -0,0 +1,25 @@
#include "handlers.h"
#include "usb_hid.h"
__attribute__((weak)) bool zmk_handle_key_user(struct zmk_key_event key_event)
{
return true;
};
void zmk_handle_key(struct zmk_key_event key_event)
{
if (!zmk_handle_key_user(key_event))
{
return;
}
if (key_event.pressed)
{
zmk_usb_hid_press_key(key_event.key);
}
else
{
zmk_usb_hid_release_key(key_event.key);
}
};

12
src/handlers.h Normal file
View File

@@ -0,0 +1,12 @@
#pragma once
#include "keymap.h"
#include <dt-bindings/zmk/keys.h>
struct zmk_key_event
{
zmk_key key;
bool pressed;
};
void zmk_handle_key(struct zmk_key_event key_event);

73
src/keymap.c
View File

@@ -1,34 +1,69 @@
#include "keymap.h"
static enum hid_kbd_code zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_MATRIX_ROWS * ZMK_MATRIX_COLS] = {
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,0)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,0,keys),
static u32_t zmk_keymap_layer_state = 0;
static u32_t zmk_keymap_layer_default = 0;
static zmk_key zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_MATRIX_ROWS * ZMK_MATRIX_COLS] = {
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 0)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 0, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,1)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,1,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 1)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 1, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,2)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,2,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 2)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 2, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,3)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,3,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 3)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 3, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,4)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,4,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 4)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 4, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,5)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,5,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 5)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 5, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,6)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,6,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 6)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 6, keys),
#endif
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE,layers,7)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE,layers,7,keys),
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 7)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 7, keys),
#endif
};
enum hid_kbd_code zmk_keymap_keycode_from_position(u32_t row, u32_t column)
#define SET_LAYER_STATE(layer, state) \
if (layer >= 32) \
{ \
return false; \
} \
WRITE_BIT(zmk_keymap_layer_state, layer, true); \
return true;
bool zmk_keymap_layer_activate(u8_t layer)
{
return zmk_keymap[0][(row * ZMK_MATRIX_ROWS) + column];
SET_LAYER_STATE(layer, true);
};
bool zmk_keymap_layer_deactivate(u8_t layer)
{
SET_LAYER_STATE(layer, false);
};
zmk_key zmk_keymap_keycode_from_position(u32_t row, u32_t column)
{
for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--)
{
if ((zmk_keymap_layer_state & BIT(layer)) == BIT(layer))
{
zmk_key key = zmk_keymap[layer][(row * ZMK_MATRIX_ROWS) + column];
if (key == ZC_TRNS)
{
continue;
}
return key;
}
}
return ZC_NOOP;
}

13
src/keymap.h
View File

@@ -1,16 +1,19 @@
#ifndef ZMK_KEYMAP_H
#define ZMK_KEYMAP_H
#pragma once
#include <devicetree.h>
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
#include "dt-bindings/zmk/keys.h"
#include "zmk.h"
#define ZMK_KEYMAP_NODE DT_CHOSEN(zmk_keymap)
#define ZMK_KEYMAP_LAYERS_LEN DT_PROP_LEN(ZMK_KEYMAP_NODE,layers)
#define ZMK_KEYMAP_LAYERS_LEN DT_PROP_LEN(ZMK_KEYMAP_NODE, layers)
typedef u64_t zmk_key;
enum hid_kbd_code zmk_keymap_keycode_from_position(u32_t row, u32_t column);
bool zmk_keymap_layer_activate(u8_t layer);
bool zmk_keymap_layer_deactivate(u8_t layer);
#endif
zmk_key
zmk_keymap_keycode_from_position(u32_t row, u32_t column);

31
src/kscan.c
View File

@@ -13,17 +13,20 @@ LOG_MODULE_REGISTER(zmk_kscan, CONFIG_ZMK_KSCAN_LOG_LEVEL);
#include "keymap.h"
#include "usb_hid.h"
#include "handlers.h"
#define ZMK_KSCAN_EVENT_STATE_PRESSED 0
#define ZMK_KSCAN_EVENT_STATE_RELEASED 1
struct zmk_kscan_event {
struct zmk_kscan_event
{
u32_t row;
u32_t column;
u32_t state;
};
struct zmk_kscan_msg_processor {
struct zmk_kscan_msg_processor
{
struct k_work work;
} msg_processor;
@@ -34,8 +37,7 @@ static void zmk_kscan_callback(struct device *dev, u32_t row, u32_t column, bool
struct zmk_kscan_event ev = {
.row = row,
.column = column,
.state = (pressed ? ZMK_KSCAN_EVENT_STATE_PRESSED : ZMK_KSCAN_EVENT_STATE_RELEASED)
};
.state = (pressed ? ZMK_KSCAN_EVENT_STATE_PRESSED : ZMK_KSCAN_EVENT_STATE_RELEASED)};
k_msgq_put(&zmk_kscan_msgq, &ev, K_NO_WAIT);
k_work_submit(&msg_processor.work);
@@ -45,23 +47,22 @@ void zmk_kscan_process_msgq(struct k_work *item)
{
struct zmk_kscan_event ev;
while(k_msgq_get(&zmk_kscan_msgq, &ev, K_NO_WAIT) == 0) {
while (k_msgq_get(&zmk_kscan_msgq, &ev, K_NO_WAIT) == 0)
{
bool pressed = (ev.state == ZMK_KSCAN_EVENT_STATE_PRESSED);
// TODO: More than basic mapping, layers, etc.
enum hid_kbd_code code = zmk_keymap_keycode_from_position(ev.row, ev.column);
LOG_DBG("Row: %d, col: %d, code: %d, pressed: %s\n", ev.row, ev.column, code, (pressed ? "true" : "false"));
if (pressed) {
zmk_usb_hid_press_key(code);
} else {
zmk_usb_hid_release_key(code);
}
zmk_key key = zmk_keymap_keycode_from_position(ev.row, ev.column);
struct zmk_key_event kev = (struct zmk_key_event){.key = key, .pressed = pressed};
LOG_DBG("Row: %d, col: %d, key: %lld, pressed: %s\n", ev.row, ev.column, key, (pressed ? "true" : "false"));
zmk_handle_key(kev);
}
}
int zmk_kscan_init(char* name)
int zmk_kscan_init(char *name)
{
struct device *dev = device_get_binding(name);
if (dev == NULL) {
if (dev == NULL)
{
LOG_ERR("Failed to get the KSCAN device");
return -EINVAL;
}

5
src/kscan.h
View File

@@ -1,6 +1,3 @@
#ifndef ZMK_KSCAN_H
#define ZMK_KSCAN_H
#pragma once
int zmk_kscan_init(char *name);
#endif