diff options
| author | skullY <skullydazed@gmail.com> | 2016-04-05 20:27:40 -0700 |
|---|---|---|
| committer | skullY <skullydazed@gmail.com> | 2016-04-05 20:27:40 -0700 |
| commit | 0da53d3811ed35f31f23219a61a67c09fe2860d9 (patch) | |
| tree | d2ba7fcd93886a2701f2829e77ca1ad0fd269fd7 | |
| parent | 34dd96187c5ea2fe6e806f662e6ab0c320d0df1b (diff) | |
Fixup the cluepad code
| -rw-r--r-- | keyboard/cluepad/backlight.c | 2 | ||||
| -rw-r--r-- | keyboard/cluepad/cluepad.c | 8 | ||||
| -rw-r--r-- | keyboard/cluepad/cluepad.h | 4 | ||||
| -rw-r--r-- | keyboard/cluepad/keymaps/keymap_default.c | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/keyboard/cluepad/backlight.c b/keyboard/cluepad/backlight.c index c0f8539494..a9caed1df8 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 ff3be5b9b5..d55b999605 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<<JTD); }; -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) if (matrix_scan_user) { diff --git a/keyboard/cluepad/cluepad.h b/keyboard/cluepad/cluepad.h index 0d10d50b8f..36bf591e4b 100644 --- a/keyboard/cluepad/cluepad.h +++ b/keyboard/cluepad/cluepad.h @@ -35,7 +35,7 @@ { k40, KC_NO, k42, KC_NO } \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); #endif diff --git a/keyboard/cluepad/keymaps/keymap_default.c b/keyboard/cluepad/keymaps/keymap_default.c index 32cb43c745..8ba49952f6 100644 --- a/keyboard/cluepad/keymaps/keymap_default.c +++ b/keyboard/cluepad/keymaps/keymap_default.c @@ -36,20 +36,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * .-------------------. * |NL F| | | Fn0| * |-------------------| - * | Fn2| | Fn4| | + * | | Fn4| | | * |--------------| | - * | Fn3|BL_S| Fn5| Fn6| + * | Fn3|BL_S| Fn2| Fn6| * |-------------------| - * | | | | | + * | | Fn5| | | * |--------------| | * | Fn1| | Fn7| * '-------------------' */ [_FL] = KEYMAP( LT(_FL, KC_NLCK), KC_TRNS, KC_TRNS, F(0), \ - F(2), KC_TRNS, F(4), F(6), \ - F(3), BL_STEP, F(5), \ - KC_TRNS, KC_TRNS, KC_TRNS, F(7), \ + KC_TRNS, F(4), KC_TRNS, F(6), \ + F(3), BL_STEP, F(2), \ + KC_TRNS, F(5), KC_TRNS, F(7), \ F(1), KC_TRNS) }; |