diff options
author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
---|---|---|
committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
commit | a4ff9f256738cf637553e7840d53f778d791fb6f (patch) | |
tree | 91d327587401e69843eecb353e97a3119aa9939b /keyboard/atreus | |
parent | e36a441274e9e494e1d8e38df1901f3acf9def27 (diff) | |
parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/atreus')
-rw-r--r-- | keyboard/atreus/atreus.c | 8 | ||||
-rw-r--r-- | keyboard/atreus/atreus.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboard/atreus/atreus.c b/keyboard/atreus/atreus.c index bfc893084f..9d1de631bb 100644 --- a/keyboard/atreus/atreus.c +++ b/keyboard/atreus/atreus.c @@ -1,16 +1,16 @@ #include "atreus.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 @@ -19,7 +19,7 @@ void * matrix_init_kb(void) { } }; -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) diff --git a/keyboard/atreus/atreus.h b/keyboard/atreus/atreus.h index 9dd77859f9..8d5989e442 100644 --- a/keyboard/atreus/atreus.h +++ b/keyboard/atreus/atreus.h @@ -22,7 +22,7 @@ { k2a, k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a } \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); #endif |