From 073b44924cdfd28d64ad2ee1dbe88b00f92d2c72 Mon Sep 17 00:00:00 2001 From: skullY Date: Sun, 27 Mar 2016 16:17:40 -0700 Subject: Adding clueboard/cluepad support to qmk --- keyboard/cluepad/cluepad.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 keyboard/cluepad/cluepad.h (limited to 'keyboard/cluepad/cluepad.h') diff --git a/keyboard/cluepad/cluepad.h b/keyboard/cluepad/cluepad.h new file mode 100644 index 000000000..0d10d50b8 --- /dev/null +++ b/keyboard/cluepad/cluepad.h @@ -0,0 +1,41 @@ +#ifndef CLUEPAD_H +#define CLUEPAD_H + +#include "matrix.h" +#include "keymap_common.h" +#include + + +/* Cluepad matrix layout + * .-------------------. + * |NLCK| /| *| -| + * |-------------------| + * | 7| 8| 9| | + * |--------------| | + * | 4| 5| 6| +| + * |-------------------| + * | 1| 2| 3| | + * |--------------| | + * | 0| .| Ent| + * '-------------------' + */ +// The first section contains all of the arguments +// The second converts the arguments into a two-dimensional array +#define KEYMAP( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k20, k21, k22, \ + k30, k31, k32, k33, \ + k40, k42 \ +) { \ + { k00, k01, k02, k03, }, \ + { k10, k11, k12, k13, }, \ + { k20, k21, k22, KC_NO, }, \ + { k30, k31, k32, k33, }, \ + { k40, KC_NO, k42, KC_NO } \ +} + +void * matrix_init_user(void); +void * matrix_scan_user(void); + +#endif -- cgit v1.2.3 From 0da53d3811ed35f31f23219a61a67c09fe2860d9 Mon Sep 17 00:00:00 2001 From: skullY Date: Tue, 5 Apr 2016 20:27:40 -0700 Subject: Fixup the cluepad code --- keyboard/cluepad/backlight.c | 2 +- keyboard/cluepad/cluepad.c | 8 ++++---- keyboard/cluepad/cluepad.h | 4 ++-- keyboard/cluepad/keymaps/keymap_default.c | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'keyboard/cluepad/cluepad.h') diff --git a/keyboard/cluepad/backlight.c b/keyboard/cluepad/backlight.c index c0f853949..a9caed1df 100644 --- a/keyboard/cluepad/backlight.c +++ b/keyboard/cluepad/backlight.c @@ -6,7 +6,7 @@ int pwm_level; -void led_set(uint8_t usb_led) +void led_set_kb(uint8_t usb_led) { print("led_set\n"); } diff --git a/keyboard/cluepad/cluepad.c b/keyboard/cluepad/cluepad.c index ff3be5b9b..d55b99960 100644 --- a/keyboard/cluepad/cluepad.c +++ b/keyboard/cluepad/cluepad.c @@ -1,16 +1,16 @@ #include "cluepad.h" __attribute__ ((weak)) -void * matrix_init_user(void) { +void matrix_init_user(void) { // leave these blank }; __attribute__ ((weak)) -void * matrix_scan_user(void) { +void matrix_scan_user(void) { // leave these blank }; -void * matrix_init_kb(void) { +void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up if (matrix_init_user) { @@ -30,7 +30,7 @@ void * matrix_init_kb(void) { MCUCR |= (1<