Get *basic* USB report sending working.

4 files changed, 108 insertions, 4 deletions

diff --git a/src/kscan.c b/src/kscan.c
index 6815aa2..54d08c4 100644
--- a/src/kscan.c
+++ b/src/kscan.c
@@ -12,6 +12,7 @@
 LOG_MODULE_REGISTER(zmk_kscan, CONFIG_ZMK_KSCAN_LOG_LEVEL);
 
 #include "keymap.h"
+#include "usb_hid.h"
 
 #define ZMK_KSCAN_EVENT_STATE_PRESSED 0
 #define ZMK_KSCAN_EVENT_STATE_RELEASED 1
@@ -35,7 +36,6 @@ static void zmk_kscan_callback(struct device *dev, u32_t row, u32_t column, bool
 		.column = column,
 		.state = (pressed ? ZMK_KSCAN_EVENT_STATE_PRESSED : ZMK_KSCAN_EVENT_STATE_RELEASED)
 	};
-	printk("Row: %d, col: %d, pressed: %s\n", ev.row, ev.column, (pressed ? "true" : "false"));
 
 	k_msgq_put(&zmk_kscan_msgq, &ev, K_NO_WAIT);
 	k_work_submit(&msg_processor.work);
@@ -44,13 +44,17 @@ static void zmk_kscan_callback(struct device *dev, u32_t row, u32_t column, bool
 void zmk_kscan_process_msgq(struct k_work *item)
 {
 	struct zmk_kscan_event ev;
-	printk("process messages!\n");
 
 	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);
-		printk("Row: %d, col: %d, code: %d, pressed: %s\n", ev.row, ev.column, code, (pressed ? "true" : "false"));
+		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);
+		}
 	}
 }
 
@@ -62,7 +66,6 @@ int zmk_kscan_init(char* name)
 		return -EINVAL;
 	}
 
-
 	k_work_init(&msg_processor.work, zmk_kscan_process_msgq);
 
 	kscan_config(dev, zmk_kscan_callback);
diff --git a/src/main.c b/src/main.c
index 5ad7ce6..33cf61d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,6 +9,7 @@
 #include <devicetree.h>
 
 #include "kscan.h"
+#include "usb_hid.h"
 
 void main(void)
 {
@@ -18,4 +19,9 @@ void main(void)
 		printk("Keyboard Scan Init Failed\n");
 		return;
 	}
+
+	if (zmk_usb_hid_init() < 0) {
+		printk("USB HID Init Failed\n");
+		return;
+	}
 }
diff --git a/src/usb_hid.c b/src/usb_hid.c
new file mode 100644
index 0000000..688b31c
--- /dev/null
+++ b/src/usb_hid.c
@@ -0,0 +1,81 @@
+
+#include <device.h>
+
+#include <usb/usb_device.h>
+#include <usb/class/usb_hid.h>
+
+LOG_MODULE_REGISTER(zmk_usb_hid, CONFIG_ZMK_USB_HID_LOG_LEVEL);
+
+static const u8_t hid_report_desc[] = HID_KEYBOARD_REPORT_DESC();
+static enum usb_dc_status_code usb_status;
+
+static struct device *hid_dev;
+static u8_t report[8] = { 0x00, 0x00 };
+
+#define KEY_OFFSET 0x02
+#define MAX_KEYS 6
+
+int zmk_usb_hid_press_key(enum hid_kbd_code code)
+{
+	if (usb_status == USB_DC_SUSPEND) {
+		return usb_wakeup_request();
+	}
+
+	for (int idx = 0; idx < MAX_KEYS; idx++) {
+		if (report[idx + KEY_OFFSET] != 0U) {
+			continue;
+		}
+
+		report[idx + KEY_OFFSET] = code;
+
+		return hid_int_ep_write(hid_dev, report, sizeof(report), NULL);
+	}
+
+	return -EINVAL;
+}
+
+int zmk_usb_hid_release_key(enum hid_kbd_code code)
+{
+	for (int idx = 0; idx < MAX_KEYS; idx++) {
+		if (report[idx + KEY_OFFSET] != code) {
+			continue;
+		}
+
+		report[idx + KEY_OFFSET] = 0U;
+
+		return hid_int_ep_write(hid_dev, report, sizeof(report), NULL);
+	}
+
+	return -EINVAL;
+}
+
+void usb_hid_status_cb(enum usb_dc_status_code status, const u8_t *params)
+{
+	usb_status = status;
+};
+
+int zmk_usb_hid_init()
+{
+	int usb_enable_ret;
+
+	hid_dev = device_get_binding("HID_0");
+	if (hid_dev == NULL) {
+		LOG_ERR("Unable to locate HID device");
+		return -EINVAL;
+	}
+
+	usb_hid_register_device(hid_dev,
+	                        hid_report_desc, sizeof(hid_report_desc),
+	                        NULL);
+
+	usb_hid_init(hid_dev);
+
+	usb_enable_ret = usb_enable(usb_hid_status_cb);
+
+	if (usb_enable_ret != 0) {
+		LOG_ERR("Unable to enable USB");
+		return -EINVAL;
+	}
+
+	return 0;
+}
diff --git a/src/usb_hid.h b/src/usb_hid.h
new file mode 100644
index 0000000..5bcd8bf
--- /dev/null
+++ b/src/usb_hid.h
@@ -0,0 +1,14 @@
+#ifndef ZMK_USB_HID
+#define ZMK_USB_HID
+
+#include <usb/usb_device.h>
+#include <usb/class/usb_hid.h>
+
+int zmk_usb_hid_init();
+
+// TODO: Modifiers!
+
+int zmk_usb_hid_press_key(enum hid_kbd_code code);
+int zmk_usb_hid_release_key(enum hid_kbd_code code);
+
+#endif