diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
commit | e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748 (patch) | |
tree | 7774668076bb8c8d2331028bb540510c078e60be /keyboard/ergodox_ez/ergodox_ez.c | |
parent | b8ac5095708b5023f5e3e375b22534f8b395741f (diff) | |
parent | 4a676746a6d8c9b47956f863ead335e995677c53 (diff) |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
Diffstat (limited to 'keyboard/ergodox_ez/ergodox_ez.c')
-rw-r--r-- | keyboard/ergodox_ez/ergodox_ez.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/keyboard/ergodox_ez/ergodox_ez.c b/keyboard/ergodox_ez/ergodox_ez.c index d0eaf33923..97e6de1ee3 100644 --- a/keyboard/ergodox_ez/ergodox_ez.c +++ b/keyboard/ergodox_ez/ergodox_ez.c @@ -5,16 +5,16 @@ bool i2c_initialized = 0; uint8_t mcp23018_status = 0x20; __attribute__ ((weak)) -void * matrix_init_user(void) { - return NULL; -}; +void matrix_init_user(void) { + +} __attribute__ ((weak)) -void * matrix_scan_user(void) { - return NULL; -}; +void matrix_scan_user(void) { + +} -void * matrix_init_kb(void) { +void matrix_init_kb(void) { // keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md") TCCR1A = 0b10101001; // set and configure fast PWM TCCR1B = 0b00001001; // set and configure fast PWM @@ -34,21 +34,12 @@ void * matrix_init_kb(void) { ergodox_blink_all_leds(); - if (matrix_init_user) { - (*matrix_init_user)(); - } - - return NULL; -}; - -void * matrix_scan_kb(void) { - - if (matrix_scan_user) { - (*matrix_scan_user)(); - } + matrix_init_user(); +} - return NULL; -}; +void matrix_scan_kb(void) { + matrix_scan_user(); +} void ergodox_blink_all_leds(void) |