summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-06-16 11:12:45 +0900
committertmk <nobody@nowhere>2014-07-30 14:07:43 +0900
commit867f115bee190515aa195dc3e58f1c381ea9695b (patch)
treea738787299cbac2fbaf26e586393f4d4170e8775 /keyboard
parentf15b2691c92e1d9b3c0e59363c803ec540303f37 (diff)
Port timer to mbed
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/mbed_onekey/common.mk29
-rw-r--r--keyboard/mbed_onekey/main.cpp21
2 files changed, 31 insertions, 19 deletions
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index f21fce8864..975ae9d0da 100644
--- a/keyboard/mbed_onekey/common.mk
+++ b/keyboard/mbed_onekey/common.mk
@@ -1,19 +1,20 @@
COMMON_DIR = common
OBJECTS += \
-# $(COMMON_DIR)/host.o \
-# $(COMMON_DIR)/keyboard.o \
-# $(COMMON_DIR)/action.o \
-# $(COMMON_DIR)/action_tapping.o \
-# $(COMMON_DIR)/action_macro.o \
-# $(COMMON_DIR)/action_layer.o \
-# $(COMMON_DIR)/action_util.o \
-# $(COMMON_DIR)/keymap.o \
-# $(COMMON_DIR)/timer.o \
- $(COMMON_DIR)/print.o \
-# $(COMMON_DIR)/bootloader.o \
-# $(COMMON_DIR)/suspend.o \
- $(COMMON_DIR)/xprintf.o \
- $(COMMON_DIR)/util.o
+ $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
INCLUDE_PATHS += \
-I$(TMK_DIR)/$(COMMON_DIR)
+
+
+
+
+# $(OBJDIR)/$(COMMON_DIR)/host.o \
+# $(OBJDIR)/$(COMMON_DIR)/keyboard.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)/keymap.o \
+# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
+# $(OBJDIR)/$(COMMON_DIR)/suspend.o \
diff --git a/keyboard/mbed_onekey/main.cpp b/keyboard/mbed_onekey/main.cpp
index 581534e025..1df940aa97 100644
--- a/keyboard/mbed_onekey/main.cpp
+++ b/keyboard/mbed_onekey/main.cpp
@@ -1,6 +1,7 @@
#include "mbed.h"
#include "HIDKeyboard.h"
#include "debug.h"
+#include "timer.h"
/*
//#define DEBUG
@@ -27,11 +28,16 @@ int main(void) {
//led_red = 0;
//led_green = 0;
debug_enable = true;
- dprintf("HIDKeyboard:\n");
- print("aaa");
+ dprintf("HIDKeyboard:\r\n");
+
+ timer_init();
+ xprintf("timer: %i\r\n", timer_read());
report_keyboard_t report = { 2, 0, 4, }; //a
report_keyboard_t report_off = { 0 };
+
+ bool last_isp = isp;
+ uint32_t last_timer;
while (1) {
//keyboard.mediaControl(KEY_VOLUME_DOWN);
//keyboard.printf("Hello World from Mbed\r\n");
@@ -42,14 +48,19 @@ int main(void) {
//leds = keyboard.lockStatus();
//ser.putc(ser.getc());
+ if (last_isp == isp) continue;
if (isp == 0) {
led_red = 0; // on
- keyboard.sendReport(report);
+ xprintf("timer: %i\r\n", timer_read32());
+ xprintf("diff: %i\r\n", timer_elapsed32(last_timer));
+ //keyboard.sendReport(report);
} else {
led_red = 1; // off
- keyboard.sendReport(report_off);
+ //keyboard.sendReport(report_off);
}
- led_green = !led_green;
+ last_isp = isp;
+ last_timer = timer_read();
+ //led_green = !led_green;
//wait(0.5);
}
}