summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authortmk <hasu@tmk-kbd.com>2015-05-17 19:34:34 +0900
committertmk <hasu@tmk-kbd.com>2015-05-19 00:39:43 +0900
commit6b588eb7f7893500e18686e673dbf12b511dc975 (patch)
tree62d7a75008d3407f318ae650c7a45643944eee31 /tmk_core/common
parent9a2282157fbdf57ef0a50d4fea7da72505906588 (diff)
Add keyboard_setup() and matrix_setup()
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/avr/suspend.c2
-rw-r--r--tmk_core/common/keyboard.c6
-rw-r--r--tmk_core/common/keyboard.h8
-rw-r--r--tmk_core/common/matrix.h4
4 files changed, 16 insertions, 4 deletions
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index 80243f02bc..af99f52b5e 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -85,6 +85,8 @@ void suspend_power_down(void)
power_down(WDTO_15MS);
}
+__attribute__ ((weak)) void matrix_power_up(void) {}
+__attribute__ ((weak)) void matrix_power_down(void) {}
bool suspend_wakeup_condition(void)
{
matrix_power_up();
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index b03b124d76..eb7b096bed 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -62,6 +62,12 @@ static bool has_ghost_in_row(uint8_t row)
#endif
+__attribute__ ((weak)) void matrix_setup(void) {}
+void keyboard_setup(void)
+{
+ matrix_setup();
+}
+
void keyboard_init(void)
{
timer_init();
diff --git a/tmk_core/common/keyboard.h b/tmk_core/common/keyboard.h
index 6442716fc7..7738251b64 100644
--- a/tmk_core/common/keyboard.h
+++ b/tmk_core/common/keyboard.h
@@ -58,13 +58,15 @@ static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) &&
}
+/* it runs once at early stage of startup before keyboard_init. */
+void keyboard_setup(void);
+/* it runs once after initializing host side protocol, debug and MCU peripherals. */
void keyboard_init(void);
+/* it runs repeatedly in main loop */
void keyboard_task(void);
+/* it runs when host LED status is updated */
void keyboard_set_leds(uint8_t leds);
-__attribute__ ((weak)) void matrix_power_up(void) {}
-__attribute__ ((weak)) void matrix_power_down(void) {}
-
#ifdef __cplusplus
}
#endif
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 107ee72653..ec6f8cd431 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -43,7 +43,9 @@ extern "C" {
uint8_t matrix_rows(void);
/* number of matrix columns */
uint8_t matrix_cols(void);
-/* intialize matrix for scaning. should be called once. */
+/* should be called at early stage of startup before matrix_init.(optional) */
+void matrix_setup(void);
+/* intialize matrix for scaning. */
void matrix_init(void);
/* scan all key states on matrix */
uint8_t matrix_scan(void);