diff options
author | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
---|---|---|
committer | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
commit | 2d9037491271677f6642ec162b6a8be3ebb47e78 (patch) | |
tree | d3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/atreus | |
parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) |
Merge pull request #3 from jackhumbert/master
Pull upstream
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 |