aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-05-02 23:15:56 -0500
committerIBNobody <ibnobody@gmail.com>2016-05-02 23:15:56 -0500
commit35d7081899df3a486b9b5785c7e8ec9481195848 (patch)
tree682a322ce2c3e2004abb4fbd00fc00316277b935 /quantum/keymap_common.c
parent499e3096e9021b88a6a705ad7034ccbacb97b975 (diff)
parent2c070163ffffffde546fb00acaa2fbb96b93da64 (diff)
downloadfirmware-35d7081899df3a486b9b5785c7e8ec9481195848.tar.gz
firmware-35d7081899df3a486b9b5785c7e8ec9481195848.tar.bz2
firmware-35d7081899df3a486b9b5785c7e8ec9481195848.zip
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 4ee290ad0..4b4bd6210 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -184,6 +184,7 @@ static action_t keycode_to_action(uint16_t keycode)
case RESET: ; // RESET is 0x5000, which is why this is here
clear_keyboard();
#ifdef AUDIO_ENABLE
+ stop_all_notes();
play_goodbye_tone();
#endif
_delay_ms(250);
@@ -244,7 +245,7 @@ static action_t keycode_to_action(uint16_t keycode)
keymap_config.swap_lalt_lgui = 0;
keymap_config.swap_ralt_rgui = 0;
}
- eeconfig_write_keymap(keymap_config.raw);
+ eeconfig_update_keymap(keymap_config.raw);
break;
case 0x5100 ... 0x5FFF: ;
// Layer movement shortcuts