diff options
author | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
---|---|---|
committer | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
commit | 4ba9917f829885b13ea1b3610a2f988e539c9e01 (patch) | |
tree | 612da1c6de929e6e0a5b0847d7b594cb3becdf27 /keyboards/roadkit | |
parent | 8665ed3efc62e649d0eac5b88761d7b3f8f30cd7 (diff) | |
parent | aaa67f69305c5c78e15a1090ba7058adea59ff36 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/roadkit')
-rw-r--r-- | keyboards/roadkit/keymaps/default/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/roadkit/keymaps/singles/keymap.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/roadkit/keymaps/default/keymap.c b/keyboards/roadkit/keymaps/default/keymap.c index 3fc18915a8..048e807481 100644 --- a/keyboards/roadkit/keymaps/default/keymap.c +++ b/keyboards/roadkit/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM fn_actions[] = { }; -void persistant_default_layer_set(uint16_t default_layer) { +void persistent_default_layer_set(uint16_t default_layer) { eeconfig_update_default_layer(default_layer); default_layer_set(default_layer); } @@ -41,7 +41,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) switch(id) { case _NP: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_NP); + persistent_default_layer_set(1UL<<_NP); } break; } diff --git a/keyboards/roadkit/keymaps/singles/keymap.c b/keyboards/roadkit/keymaps/singles/keymap.c index 5ee7a752b8..1c6aa7883f 100644 --- a/keyboards/roadkit/keymaps/singles/keymap.c +++ b/keyboards/roadkit/keymaps/singles/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM fn_actions[] = { }; -void persistant_default_layer_set(uint16_t default_layer) { +void persistent_default_layer_set(uint16_t default_layer) { eeconfig_update_default_layer(default_layer); default_layer_set(default_layer); } @@ -48,12 +48,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) switch(id) { case _L1: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_L1); + persistent_default_layer_set(1UL<<_L1); } break; case _NP: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_NP); + persistent_default_layer_set(1UL<<_NP); } break; } |