Refactor build/config/keymaps.

* Move all headers to `include/zmk` directory.
* Update includes to reference them properly.
* Add `keymap.c` file from keymap, if found.
* Toplevel CONFIG_ZMK_BLE aggregate config setting.
This commit is contained in:
Pete Johanson
2020-05-18 09:11:46 -04:00
parent b3babe2505
commit c1905745b3
26 changed files with 109 additions and 64 deletions

7
include/zmk/ble.h Normal file
View File

@@ -0,0 +1,7 @@
#pragma once
#include <zmk/keys.h>
int zmk_ble_init();
bool zmk_ble_handle_key_user(struct zmk_key_event *key_event);

6
include/zmk/endpoints.h Normal file
View File

@@ -0,0 +1,6 @@
#pragma once
#include <zmk/keys.h>
int zmk_endpoints_init();
int zmk_endpoints_send_key_event(struct zmk_key_event key_event);

8
include/zmk/handlers.h Normal file
View File

@@ -0,0 +1,8 @@
#pragma once
#include <dt-bindings/zmk/keys.h>
#include <zmk/keymap.h>
#include <zmk/keys.h>
void zmk_handle_key(struct zmk_key_event key_event);

107
include/zmk/hid.h Normal file
View File

@@ -0,0 +1,107 @@
#pragma once
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
#include <dt-bindings/zmk/keys.h>
#include <zmk/keys.h>
#define ZMK_HID_MAX_KEYCODE KC_APP
static const u8_t zmk_hid_report_desc[] = {
/* USAGE_PAGE (Generic Desktop) */
HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP,
/* USAGE (Keyboard) */
HID_LI_USAGE,
USAGE_GEN_DESKTOP_KEYBOARD,
/* COLLECTION (Application) */
HID_MI_COLLECTION,
COLLECTION_APPLICATION,
/* REPORT ID (1) */
HID_GI_REPORT_ID,
0x01,
/* USAGE_PAGE (Keypad) */
HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP_KEYPAD,
/* USAGE_MINIMUM (Keyboard LeftControl) */
HID_LI_USAGE_MIN(1),
0xE0,
/* USAGE_MAXIMUM (Keyboard Right GUI) */
HID_LI_USAGE_MAX(1),
0xE7,
/* LOGICAL_MINIMUM (0) */
HID_GI_LOGICAL_MIN(1),
0x00,
/* LOGICAL_MAXIMUM (1) */
HID_GI_LOGICAL_MAX(1),
0x01,
/* REPORT_SIZE (1) */
HID_GI_REPORT_SIZE,
0x01,
/* REPORT_COUNT (8) */
HID_GI_REPORT_COUNT,
0x08,
/* INPUT (Data,Var,Abs) */
HID_MI_INPUT,
0x02,
/* USAGE_PAGE (Keypad) */
HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP_KEYPAD,
/* LOGICAL_MINIMUM (0) */
HID_GI_LOGICAL_MIN(1),
0x00,
/* LOGICAL_MAXIMUM (101) */
HID_GI_LOGICAL_MAX(1),
0x01,
/* USAGE_MINIMUM (Reserved) */
HID_LI_USAGE_MIN(1),
0x00,
/* USAGE_MAXIMUM (Keyboard Application) */
HID_LI_USAGE_MAX(1),
ZMK_HID_MAX_KEYCODE,
/* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE,
0x01,
/* REPORT_COUNT (6) */
HID_GI_REPORT_COUNT,
ZMK_HID_MAX_KEYCODE + 1,
/* INPUT (Data,Ary,Abs) */
HID_MI_INPUT,
0x02,
/* USAGE_PAGE (Keypad) */
HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP_KEYPAD,
/* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE,
0x02,
/* REPORT_COUNT (6) */
HID_GI_REPORT_COUNT,
0x01,
/* INPUT (Cnst,Var,Abs) */
HID_MI_INPUT,
0x03,
/* END_COLLECTION */
HID_MI_COLLECTION_END,
};
// struct zmk_hid_boot_report
// {
// u8_t modifiers;
// u8_t _unused;
// u8_t keys[6];
// } __packed;
struct zmk_hid_report
{
u8_t modifiers;
u8_t keys[13];
} __packed;
int zmk_hid_press_key(zmk_key key);
int zmk_hid_release_key(zmk_key key);
struct zmk_hid_report *zmk_hid_get_report();

9
include/zmk/hog.h Normal file
View File

@@ -0,0 +1,9 @@
#pragma once
#include <zmk/keys.h>
#include <zmk/hid.h>
int zmk_hog_init();
int zmk_hog_send_report(struct zmk_hid_report *report);

18
include/zmk/keymap.h Normal file
View File

@@ -0,0 +1,18 @@
#pragma once
#include <devicetree.h>
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
#include <dt-bindings/zmk/keys.h>
#include <zmk/matrix.h>
#include <zmk/keys.h>
#define ZMK_KEYMAP_NODE DT_CHOSEN(zmk_keymap)
#define ZMK_KEYMAP_LAYERS_LEN DT_PROP_LEN(ZMK_KEYMAP_NODE, layers)
bool zmk_keymap_layer_activate(u8_t layer);
bool zmk_keymap_layer_deactivate(u8_t layer);
zmk_key
zmk_keymap_keycode_from_position(u32_t row, u32_t column);

12
include/zmk/keys.h Normal file
View File

@@ -0,0 +1,12 @@
#pragma once
#include <zephyr.h>
#include <dt-bindings/zmk/keys.h>
typedef u64_t zmk_key;
struct zmk_key_event
{
zmk_key key;
bool pressed;
};

3
include/zmk/kscan.h Normal file
View File

@@ -0,0 +1,3 @@
#pragma once
int zmk_kscan_init(char *name);

6
include/zmk/matrix.h Normal file
View File

@@ -0,0 +1,6 @@
#pragma once
#define ZMK_MATRIX_NODE_ID DT_CHOSEN(zmk_kscan)
#define ZMK_MATRIX_ROWS DT_PROP_LEN(ZMK_MATRIX_NODE_ID,row_gpios)
#define ZMK_MATRIX_COLS DT_PROP_LEN(ZMK_MATRIX_NODE_ID,col_gpios)

14
include/zmk/usb_hid.h Normal file
View File

@@ -0,0 +1,14 @@
#ifndef ZMK_USB_HID
#define ZMK_USB_HID
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
#include <zmk/keys.h>
#include <zmk/hid.h>
int zmk_usb_hid_init();
int zmk_usb_hid_send_report(const struct zmk_hid_report *report);
#endif