diff options
| author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:14:08 +0200 |
|---|---|---|
| committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:23:00 +0200 |
| commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
| tree | 29170847273e786384bd3d7c7781e67dc4335bbb /keyboard/jd45 | |
| parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
| parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) | |
| download | qmk_firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.gz qmk_firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.xz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
Diffstat (limited to 'keyboard/jd45')
| -rw-r--r-- | keyboard/jd45/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/jd45/jd45.c | 8 | ||||
| -rw-r--r-- | keyboard/jd45/jd45.h | 4 | ||||
| -rw-r--r-- | keyboard/jd45/keymaps/default.c (renamed from keyboard/jd45/keymaps/keymap_default.c) | 0 | ||||
| -rw-r--r-- | keyboard/jd45/keymaps/justin.c (renamed from keyboard/jd45/keymaps/keymap_justin.c) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/keyboard/jd45/Makefile b/keyboard/jd45/Makefile index 076dced82..f6a8d10c5 100644 --- a/keyboard/jd45/Makefile +++ b/keyboard/jd45/Makefile @@ -54,9 +54,9 @@ SRC = jd45.c \ backlight.c ifdef KEYMAP - SRC := keymaps/keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/keymaps/(KEYMAP).c $(SRC) else - SRC := keymaps/keymap_default.c $(SRC) + SRC := keymaps/keymaps/default.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/jd45/jd45.c b/keyboard/jd45/jd45.c index d05714f07..bc3fcd3dd 100644 --- a/keyboard/jd45/jd45.c +++ b/keyboard/jd45/jd45.c @@ -1,16 +1,16 @@ #include "jd45.h" __attribute__ ((weak)) -void * matrix_init_user(void) { +void matrix_init_user(void) { }; __attribute__ ((weak)) -void * matrix_scan_user(void) { +void matrix_scan_user(void) { }; -void * matrix_init_kb(void) { +void matrix_init_kb(void) { #ifdef BACKLIGHT_ENABLE backlight_init_ports(); #endif @@ -20,7 +20,7 @@ void * matrix_init_kb(void) { } }; -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { if (matrix_scan_user) { (*matrix_scan_user)(); } diff --git a/keyboard/jd45/jd45.h b/keyboard/jd45/jd45.h index f07bd5e13..d0ca1a88d 100644 --- a/keyboard/jd45/jd45.h +++ b/keyboard/jd45/jd45.h @@ -6,7 +6,7 @@ #include "backlight.h" #include <stddef.h> -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/jd45/keymaps/keymap_default.c b/keyboard/jd45/keymaps/default.c index 05dd46e79..05dd46e79 100644 --- a/keyboard/jd45/keymaps/keymap_default.c +++ b/keyboard/jd45/keymaps/default.c diff --git a/keyboard/jd45/keymaps/keymap_justin.c b/keyboard/jd45/keymaps/justin.c index f261b5463..f261b5463 100644 --- a/keyboard/jd45/keymaps/keymap_justin.c +++ b/keyboard/jd45/keymaps/justin.c |