Port timer to mbed

diff --git a/common.mk b/common.mk
index 62ac0ff787e9dba800cb8a0375b9bc69001de43e..9d58fa2145ffb8f3cdb14392c5bda2aa05be7807 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -7,7 +7,7 @@ SRC +=  $(COMMON_DIR)/host.c \
        $(COMMON_DIR)/action_layer.c \
        $(COMMON_DIR)/action_util.c \
        $(COMMON_DIR)/keymap.c \
-       $(COMMON_DIR)/timer.c \
+       $(COMMON_DIR)/avr/timer.c \
        $(COMMON_DIR)/print.c \
        $(COMMON_DIR)/bootloader.c \
        $(COMMON_DIR)/suspend.c \

diff --git a/common/timer.c b/common/avr/timer.c
similarity index 98%
rename from common/timer.c
rename to common/avr/timer.c
index e0dec6cefcf9d07fef9f25b32f8efcd640e1958e..292b41c3a6c29fca9e4319114a0759473ea3e7e3 100644 (file)
--- a/common/timer.c
+++ b/common/avr/timer.c
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <stdint.h>
+#include "timer_avr.h"
 #include "timer.h"
 
 

diff --git a/common/mbed/timer.c b/common/mbed/timer.c
new file mode 100644 (file)
index 0000000..a64a772
--- /dev/null
+++ b/common/mbed/timer.c
@@ -0,0 +1,40 @@
+#include "cmsis.h"
+#include "timer.h"
+
+/* Mill second tick count */
+volatile uint32_t timer_count = 0;
+
+/* Timer interrupt handler */
+void SysTick_Handler(void)  {
+    timer_count++;
+}
+
+void timer_init(void)
+{
+    SysTick_Config(SystemCoreClock / 1000); /* 1ms tick */
+}
+
+void timer_clear(void)
+{
+    timer_count = 0;
+}
+
+uint16_t timer_read(void)
+{
+    return (uint16_t)(timer_count & 0xFFFF);
+}
+
+uint32_t timer_read32(void)
+{
+    return timer_count;
+}
+
+uint16_t timer_elapsed(uint16_t last)
+{
+    return TIMER_DIFF_16(timer_read(), last);
+}
+
+uint32_t timer_elapsed32(uint32_t last)
+{
+    return TIMER_DIFF_32(timer_read32(), last);
+}

diff --git a/common/timer.h b/common/timer.h
index 6437473ff772051ab3f5208bbb319e43d493b9f2..f0c5ffc98ae6a4ebbf8995aa69ff5f84076e2b65 100644 (file)
--- a/common/timer.h
+++ b/common/timer.h
@@ -20,25 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 
-#ifndef TIMER_PRESCALER
-#   if F_CPU > 16000000
-#       define TIMER_PRESCALER      256
-#   elif F_CPU > 2000000
-#       define TIMER_PRESCALER      64
-#   elif F_CPU > 250000
-#       define TIMER_PRESCALER      8
-#   else
-#       define TIMER_PRESCALER      1
-#   endif
-#endif
-#define TIMER_RAW_FREQ      (F_CPU/TIMER_PRESCALER)
-#define TIMER_RAW           TCNT0
-#define TIMER_RAW_TOP       (TIMER_RAW_FREQ/1000)
-
-#if (TIMER_RAW_TOP > 255)
-#   error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
-#endif
-
 #define TIMER_DIFF(a, b, max)   ((a) >= (b) ?  (a) - (b) : (max) - (b) + (a))
 #define TIMER_DIFF_8(a, b)      TIMER_DIFF(a, b, UINT8_MAX)
 #define TIMER_DIFF_16(a, b)     TIMER_DIFF(a, b, UINT16_MAX)

diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index f21fce8864bf12e46326486793da9694e91cab00..975ae9d0dae2c8bcc2e73b3b9e54608791b9c126 100644 (file)
--- 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 581534e02549475185198c7c4e33e7bfdf5681bf..1df940aa9781045a922015ec3cc729a8ef066246 100644 (file)
--- a/keyboard/mbed_onekey/main.cpp
+++ b/keyboard/mbed_onekey/main.cpp
@@ -1,6 +1,7 @@
 #include "mbed.h"\r
 #include "HIDKeyboard.h"\r
 #include "debug.h"\r
+#include "timer.h"\r
  \r
 /*\r
 //#define DEBUG \r
@@ -27,11 +28,16 @@ int main(void) {
     //led_red = 0;\r
     //led_green = 0;\r
     debug_enable = true;\r
-    dprintf("HIDKeyboard:\n");\r
-    print("aaa");\r
+    dprintf("HIDKeyboard:\r\n");\r
+\r
+    timer_init();\r
+    xprintf("timer: %i\r\n", timer_read());\r
 \r
     report_keyboard_t report = { 2, 0, 4, }; //a\r
     report_keyboard_t report_off = { 0 };\r
+\r
+    bool last_isp = isp;\r
+    uint32_t last_timer;\r
     while (1) {\r
         //keyboard.mediaControl(KEY_VOLUME_DOWN);\r
         //keyboard.printf("Hello World from Mbed\r\n");\r
@@ -42,14 +48,19 @@ int main(void) {
         //leds = keyboard.lockStatus();\r
         //ser.putc(ser.getc());\r
 \r
+        if (last_isp == isp) continue;\r
         if (isp == 0) {\r
             led_red = 0;    // on\r
-            keyboard.sendReport(report);\r
+    xprintf("timer: %i\r\n", timer_read32());\r
+    xprintf("diff: %i\r\n", timer_elapsed32(last_timer));\r
+            //keyboard.sendReport(report);\r
         } else {\r
             led_red = 1;    // off\r
-            keyboard.sendReport(report_off);\r
+            //keyboard.sendReport(report_off);\r
         }\r
-        led_green = !led_green;\r
+        last_isp = isp;\r
+        last_timer = timer_read();\r
+        //led_green = !led_green;\r
         //wait(0.5);\r
     }\r
 }\r