$(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 \
--- /dev/null
+/*
+Copyright 2011 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+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"
+
+
+// counter resolution 1ms
+// NOTE: union { uint32_t timer32; struct { uint16_t dummy; uint16_t timer16; }}
+volatile uint32_t timer_count = 0;
+
+void timer_init(void)
+{
+ // Timer0 CTC mode
+ TCCR0A = 0x02;
+
+#if TIMER_PRESCALER == 1
+ TCCR0B = 0x01;
+#elif TIMER_PRESCALER == 8
+ TCCR0B = 0x02;
+#elif TIMER_PRESCALER == 64
+ TCCR0B = 0x03;
+#elif TIMER_PRESCALER == 256
+ TCCR0B = 0x04;
+#elif TIMER_PRESCALER == 1024
+ TCCR0B = 0x05;
+#else
+# error "Timer prescaler value is NOT vaild."
+#endif
+
+ OCR0A = TIMER_RAW_TOP;
+ TIMSK0 = (1<<OCIE0A);
+}
+
+inline
+void timer_clear(void)
+{
+ uint8_t sreg = SREG;
+ cli();
+ timer_count = 0;
+ SREG = sreg;
+}
+
+inline
+uint16_t timer_read(void)
+{
+ uint32_t t;
+
+ uint8_t sreg = SREG;
+ cli();
+ t = timer_count;
+ SREG = sreg;
+
+ return (t & 0xFFFF);
+}
+
+inline
+uint32_t timer_read32(void)
+{
+ uint32_t t;
+
+ uint8_t sreg = SREG;
+ cli();
+ t = timer_count;
+ SREG = sreg;
+
+ return t;
+}
+
+inline
+uint16_t timer_elapsed(uint16_t last)
+{
+ uint32_t t;
+
+ uint8_t sreg = SREG;
+ cli();
+ t = timer_count;
+ SREG = sreg;
+
+ return TIMER_DIFF_16((t & 0xFFFF), last);
+}
+
+inline
+uint32_t timer_elapsed32(uint32_t last)
+{
+ uint32_t t;
+
+ uint8_t sreg = SREG;
+ cli();
+ t = timer_count;
+ SREG = sreg;
+
+ return TIMER_DIFF_32(t, last);
+}
+
+// excecuted once per 1ms.(excess for just timer count?)
+ISR(TIMER0_COMPA_vect)
+{
+ timer_count++;
+}
--- /dev/null
+#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);
+}
+++ /dev/null
-/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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.h"
-
-
-// counter resolution 1ms
-// NOTE: union { uint32_t timer32; struct { uint16_t dummy; uint16_t timer16; }}
-volatile uint32_t timer_count = 0;
-
-void timer_init(void)
-{
- // Timer0 CTC mode
- TCCR0A = 0x02;
-
-#if TIMER_PRESCALER == 1
- TCCR0B = 0x01;
-#elif TIMER_PRESCALER == 8
- TCCR0B = 0x02;
-#elif TIMER_PRESCALER == 64
- TCCR0B = 0x03;
-#elif TIMER_PRESCALER == 256
- TCCR0B = 0x04;
-#elif TIMER_PRESCALER == 1024
- TCCR0B = 0x05;
-#else
-# error "Timer prescaler value is NOT vaild."
-#endif
-
- OCR0A = TIMER_RAW_TOP;
- TIMSK0 = (1<<OCIE0A);
-}
-
-inline
-void timer_clear(void)
-{
- uint8_t sreg = SREG;
- cli();
- timer_count = 0;
- SREG = sreg;
-}
-
-inline
-uint16_t timer_read(void)
-{
- uint32_t t;
-
- uint8_t sreg = SREG;
- cli();
- t = timer_count;
- SREG = sreg;
-
- return (t & 0xFFFF);
-}
-
-inline
-uint32_t timer_read32(void)
-{
- uint32_t t;
-
- uint8_t sreg = SREG;
- cli();
- t = timer_count;
- SREG = sreg;
-
- return t;
-}
-
-inline
-uint16_t timer_elapsed(uint16_t last)
-{
- uint32_t t;
-
- uint8_t sreg = SREG;
- cli();
- t = timer_count;
- SREG = sreg;
-
- return TIMER_DIFF_16((t & 0xFFFF), last);
-}
-
-inline
-uint32_t timer_elapsed32(uint32_t last)
-{
- uint32_t t;
-
- uint8_t sreg = SREG;
- cli();
- t = timer_count;
- SREG = sreg;
-
- return TIMER_DIFF_32(t, last);
-}
-
-// excecuted once per 1ms.(excess for just timer count?)
-ISR(TIMER0_COMPA_vect)
-{
- timer_count++;
-}
#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)
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 \
#include "mbed.h"\r
#include "HIDKeyboard.h"\r
#include "debug.h"\r
+#include "timer.h"\r
\r
/*\r
//#define DEBUG \r
//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
//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
projects / tmk_firmware.git / commitdiff