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/ergodox_ez/keymaps/software_neo2/keymap.c | |
| parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
| parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
| download | firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.bz2 firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.zip | |
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/software_neo2/keymap.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/software_neo2/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c index 684ecf5e3..a734062f1 100644 --- a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c +++ b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c @@ -114,12 +114,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) }; // Runs just one time when the keyboard initializes. -void * matrix_init_user(void) { +void matrix_init_user(void) { }; // Runs constantly in the background, in a loop. -void * matrix_scan_user(void) { +void matrix_scan_user(void) { uint8_t layer = biton32(layer_state); |