summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-06-17 00:57:59 +0900
committertmk <nobody@nowhere>2014-07-30 14:07:43 +0900
commitc67ae2a6b546c822759352586c14cd9dccbbe0ff (patch)
treeab77175c64bfce74d2662260b9cdb2af8d8a7efd /keyboard
parent04fe78ee0a7fe9baed39f021799a3dbb24ebeb36 (diff)
Port action_* to mbed
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/mbed_onekey/HIDKeyboard.h11
-rw-r--r--keyboard/mbed_onekey/Makefile1
-rw-r--r--keyboard/mbed_onekey/common.mk12
3 files changed, 8 insertions, 16 deletions
diff --git a/keyboard/mbed_onekey/HIDKeyboard.h b/keyboard/mbed_onekey/HIDKeyboard.h
index b00c97b9b0..4ebe610a63 100644
--- a/keyboard/mbed_onekey/HIDKeyboard.h
+++ b/keyboard/mbed_onekey/HIDKeyboard.h
@@ -3,16 +3,7 @@
#include "stdint.h"
#include "stdbool.h"
#include "USBHID.h"
-
-
-typedef union {
- uint8_t raw[8];
- struct {
- uint8_t mods;
- uint8_t reserved;
- uint8_t keys[6];
- };
-} __attribute__ ((packed)) report_keyboard_t;
+#include "report.h"
class HIDKeyboard : public USBDevice {
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index e194052c10..1bc91bc7e7 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -15,6 +15,7 @@ OBJDIR = ./build
OBJECTS = \
$(OBJDIR)/./HIDKeyboard.o \
+ $(OBJDIR)/./mbed_driver.o \
$(OBJDIR)/./main.o
SYS_OBJECTS =
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index 101a822052..6eb7f76995 100644
--- a/keyboard/mbed_onekey/common.mk
+++ b/keyboard/mbed_onekey/common.mk
@@ -2,20 +2,20 @@ COMMON_DIR = common
OBJECTS += \
$(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
$(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
+ $(OBJDIR)/$(COMMON_DIR)/action.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_util.o \
+ $(OBJDIR)/$(COMMON_DIR)/host.o \
INCLUDE_PATHS += \
-I$(TMK_DIR)/$(COMMON_DIR)
-# $(OBJDIR)/$(COMMON_DIR)/action.o \
-# $(OBJDIR)/$(COMMON_DIR)/host.o \
# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_util.o \
# $(OBJDIR)/$(COMMON_DIR)/keymap.o \
# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
# $(OBJDIR)/$(COMMON_DIR)/suspend.o \