summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
diff options
context:
space:
mode:
authorAlex Johnstone <alexjj@gmail.com>2016-03-25 11:16:33 -0700
committerAlex Johnstone <alexjj@gmail.com>2016-03-25 11:16:33 -0700
commit2d9037491271677f6642ec162b6a8be3ebb47e78 (patch)
treed3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
parentfb6dc7499f51688ec245826842300780273203c6 (diff)
parentc9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff)
downloadqmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz
qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.zip
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c')
-rw-r--r--keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
index 9f90c639aa..0c4f85a3da 100644
--- a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
@@ -248,12 +248,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) {
- return NULL;
+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);