aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
diff options
context:
space:
mode:
authorStick <nstickney@gmail.com>2017-06-02 19:50:54 -0500
committerStick <nstickney@gmail.com>2017-06-02 19:50:54 -0500
commit4ba9917f829885b13ea1b3610a2f988e539c9e01 (patch)
tree612da1c6de929e6e0a5b0847d7b594cb3becdf27 /keyboards/preonic/keymaps/CMD-Preonic/keymap.c
parent8665ed3efc62e649d0eac5b88761d7b3f8f30cd7 (diff)
parentaaa67f69305c5c78e15a1090ba7058adea59ff36 (diff)
downloadfirmware-4ba9917f829885b13ea1b3610a2f988e539c9e01.tar.gz
firmware-4ba9917f829885b13ea1b3610a2f988e539c9e01.tar.bz2
firmware-4ba9917f829885b13ea1b3610a2f988e539c9e01.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/preonic/keymaps/CMD-Preonic/keymap.c')
-rw-r--r--keyboards/preonic/keymaps/CMD-Preonic/keymap.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
index a500a3649..7b5be0734 100644
--- a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
+++ b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
@@ -225,7 +225,7 @@ float tone_colemak[][2] = SONG(COLEMAK_SOUND);
float goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
-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);
}
@@ -238,7 +238,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
#endif
- persistant_default_layer_set(1UL<<_QWERTY);
+ persistent_default_layer_set(1UL<<_QWERTY);
}
break;
case _COLEMAK:
@@ -246,7 +246,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0);
#endif
- persistant_default_layer_set(1UL<<_COLEMAK);
+ persistent_default_layer_set(1UL<<_COLEMAK);
}
break;
case _DVORAK:
@@ -254,7 +254,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
#endif
- persistant_default_layer_set(1UL<<_DVORAK);
+ persistent_default_layer_set(1UL<<_DVORAK);
}
break;
case _GAME:
@@ -262,7 +262,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0);
#endif
- persistant_default_layer_set(1UL<<_GAME);
+ persistent_default_layer_set(1UL<<_GAME);
}
break;
case _NUMPAD:
@@ -270,7 +270,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
#endif
- persistant_default_layer_set(1UL<<_NUMPAD);
+ persistent_default_layer_set(1UL<<_NUMPAD);
}
break;
case _ARROW:
@@ -278,7 +278,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0);
#endif
- persistant_default_layer_set(1UL<<_LOWER);
+ persistent_default_layer_set(1UL<<_LOWER);
}
break;
case _LOWER: