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.

19 files changed, 29 insertions, 214 deletions

diff --git a/src/ble.c b/src/ble.c
index 266185f..18b4fe3 100644
--- a/src/ble.c
+++ b/src/ble.c
@@ -8,7 +8,7 @@
 #include <bluetooth/uuid.h>
 #include <bluetooth/gatt.h>
 
-#include "keys.h"
+#include <zmk/keys.h>
 
 static struct bt_conn *auth_passkey_entry_conn;
 static u8_t passkey_entries[6] = {0, 0, 0, 0, 0, 0};
diff --git a/src/ble.h b/src/ble.h
deleted file mode 100644
index 03b34fe..0000000
--- a/src/ble.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#pragma once
-
-int zmk_ble_init();
-bool zmk_ble_handle_key_user(struct zmk_key_event *key_event);
\ No newline at end of file
diff --git a/src/endpoints.c b/src/endpoints.c
index 1f78cb7..6854370 100644
--- a/src/endpoints.c
+++ b/src/endpoints.c
@@ -1,8 +1,8 @@
 
-#include "endpoints.h"
-#include "hid.h"
-#include "usb_hid.h"
-#include "hog.h"
+#include <zmk/endpoints.h>
+#include <zmk/hid.h>
+#include <zmk/usb_hid.h>
+#include <zmk/hog.h>
 
 int zmk_endpoints_init()
 {
@@ -15,6 +15,7 @@ int zmk_endpoints_init()
         return err;
     }
 
+#ifdef CONFIG_ZMK_BLE
     err = zmk_hog_init();
     if (err)
     {
@@ -22,6 +23,8 @@ int zmk_endpoints_init()
         return err;
     }
 
+#endif /* CONFIG_ZMK_BLE */
+
     return 0;
 }
 
@@ -46,12 +49,14 @@ int zmk_endpoints_send_key_event(struct zmk_key_event key_event)
     //     // LOG_DBG("USB Send Failed");
     // }
 
+#ifdef CONFIG_ZMK_BLE
     err = zmk_hog_send_report(report);
     if (err)
     {
         printk("FAILED TO SEND OVER HOG: %d\n", err);
         // LOG_DBG("HID Over GATTP Send Failed");
     }
+#endif /* CONFIG_ZMK_BLE */
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/endpoints.h b/src/endpoints.h
deleted file mode 100644
index cc200f1..0000000
--- a/src/endpoints.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "keys.h"
-
-int zmk_endpoints_init();
-int zmk_endpoints_send_key_event(struct zmk_key_event key_event);
\ No newline at end of file
diff --git a/src/handlers.c b/src/handlers.c
index 0ab93f6..b73c92c 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -1,8 +1,7 @@
 
-#include "handlers.h"
-
-#include "ble.h"
-#include "endpoints.h"
+#include <zmk/ble.h>
+#include <zmk/handlers.h>
+#include <zmk/endpoints.h>
 
 __attribute__((weak)) bool zmk_handle_key_user(struct zmk_key_event *key_event)
 {
@@ -16,10 +15,12 @@ void zmk_handle_key(struct zmk_key_event key_event)
 		return;
 	}
 
+#ifdef CONFIG_ZMK_BLE
 	if (!zmk_ble_handle_key_user(&key_event))
 	{
 		return;
 	}
+#endif /* CONFIG_ZMK_BLE */
 
 	zmk_endpoints_send_key_event(key_event);
 };
diff --git a/src/handlers.h b/src/handlers.h
deleted file mode 100644
index 382f3b8..0000000
--- a/src/handlers.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <dt-bindings/zmk/keys.h>
-
-#include "keymap.h"
-#include "keys.h"
-
-void zmk_handle_key(struct zmk_key_event key_event);
diff --git a/src/hid.c b/src/hid.c
index 8c42df5..faf3cfc 100644
--- a/src/hid.c
+++ b/src/hid.c
@@ -1,4 +1,4 @@
-#include "hid.h"
+#include <zmk/hid.h>
 
 static struct zmk_hid_report report = {
     .modifiers = 0,
@@ -53,4 +53,4 @@ int zmk_hid_release_key(zmk_key code)
 struct zmk_hid_report *zmk_hid_get_report()
 {
     return &report;
-}
\ No newline at end of file
+}
diff --git a/src/hid.h b/src/hid.h
deleted file mode 100644
index 0f34df2..0000000
--- a/src/hid.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
-
-#include <dt-bindings/zmk/keys.h>
-
-#include "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();
\ No newline at end of file
diff --git a/src/hog.c b/src/hog.c
index dcddba6..67ccf5b 100644
--- a/src/hog.c
+++ b/src/hog.c
@@ -3,9 +3,9 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/gatt.h>
 
-#include "ble.h"
-#include "hog.h"
-#include "hid.h"
+#include <zmk/ble.h>
+#include <zmk/hog.h>
+#include <zmk/hid.h>
 
 int zmk_hog_init()
 {
diff --git a/src/hog.h b/src/hog.h
deleted file mode 100644
index a1e4142..0000000
--- a/src/hog.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#pragma once
-
-#include "keys.h"
-#include "hid.h"
-
-int zmk_hog_init();
-
-int zmk_hog_send_report(struct zmk_hid_report *report);
\ No newline at end of file
diff --git a/src/keymap.c b/src/keymap.c
index 1f55b1f..b47809b 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,5 +1,5 @@
 
-#include "keymap.h"
+#include <zmk/keymap.h>
 
 static u32_t zmk_keymap_layer_state = 0;
 static u8_t zmk_keymap_layer_default = 0;
diff --git a/src/keymap.h b/src/keymap.h
deleted file mode 100644
index 20bd483..0000000
--- a/src/keymap.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#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"
-#include "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);
diff --git a/src/keys.h b/src/keys.h
deleted file mode 100644
index b61ef81..0000000
--- a/src/keys.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#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;
-};
\ No newline at end of file
diff --git a/src/kscan.c b/src/kscan.c
index 25bbbfa..09ca387 100644
--- a/src/kscan.c
+++ b/src/kscan.c
@@ -11,9 +11,8 @@
 
 LOG_MODULE_REGISTER(zmk_kscan, CONFIG_ZMK_KSCAN_LOG_LEVEL);
 
-#include "keymap.h"
-#include "usb_hid.h"
-#include "handlers.h"
+#include <zmk/keymap.h>
+#include <zmk/handlers.h>
 
 #define ZMK_KSCAN_EVENT_STATE_PRESSED 0
 #define ZMK_KSCAN_EVENT_STATE_RELEASED 1
diff --git a/src/kscan.h b/src/kscan.h
deleted file mode 100644
index ebffccd..0000000
--- a/src/kscan.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-int zmk_kscan_init(char *name);
diff --git a/src/main.c b/src/main.c
index 708f4ff..00a1cd0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,9 +8,9 @@
 #include <device.h>
 #include <devicetree.h>
 
-#include "zmk.h"
-#include "kscan.h"
-#include "endpoints.h"
+#include <zmk/matrix.h>
+#include <zmk/kscan.h>
+#include <zmk/endpoints.h>
 
 #define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID)
 
diff --git a/src/usb_hid.c b/src/usb_hid.c
index 80b2138..ee8ee13 100644
--- a/src/usb_hid.c
+++ b/src/usb_hid.c
@@ -5,8 +5,8 @@
 #include <usb/class/usb_hid.h>
 #include <dt-bindings/zmk/keys.h>
 
-#include "hid.h"
-#include "keymap.h"
+#include <zmk/hid.h>
+#include <zmk/keymap.h>
 
 LOG_MODULE_REGISTER(zmk_usb_hid, CONFIG_ZMK_USB_HID_LOG_LEVEL);
 
diff --git a/src/usb_hid.h b/src/usb_hid.h
deleted file mode 100644
index 4b55688..0000000
--- a/src/usb_hid.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ZMK_USB_HID
-#define ZMK_USB_HID
-
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
-
-#include "keys.h"
-#include "hid.h"
-
-int zmk_usb_hid_init();
-
-int zmk_usb_hid_send_report(const struct zmk_hid_report *report);
-
-#endif
diff --git a/src/zmk.h b/src/zmk.h
deleted file mode 100644
index 82ef3b6..0000000
--- a/src/zmk.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef ZMK_H
-#define ZMK_H
-
-#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)
-
-#endif