aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-01-15 23:10:30 -0500
committerJack Humbert <jack.humb@gmail.com>2016-01-15 23:10:30 -0500
commit6e3c36360ed291b9ca2bd014571236308a933d0c (patch)
tree56aac412390dcb72fc1424f0bc7528198d103a76
parent4c100dbbef5b97290cbe6d4846575a940649c958 (diff)
downloadqmk_firmware-6e3c36360ed291b9ca2bd014571236308a933d0c.tar.gz
qmk_firmware-6e3c36360ed291b9ca2bd014571236308a933d0c.zip
sounds
-rw-r--r--keyboard/planck/keymaps/keymap_lock.c4
-rw-r--r--quantum/keymap_unicode.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboard/planck/keymaps/keymap_lock.c b/keyboard/planck/keymaps/keymap_lock.c
index 5e5390b03..7a99b57c9 100644
--- a/keyboard/planck/keymaps/keymap_lock.c
+++ b/keyboard/planck/keymaps/keymap_lock.c
@@ -67,13 +67,13 @@ uint16_t hextokeycode(int hex) {
67float walk_up[][2] = { 67float walk_up[][2] = {
68 {440.0*pow(2.0,(60)/12.0), 400}, 68 {440.0*pow(2.0,(60)/12.0), 400},
69 {0, 50}, 69 {0, 50},
70 {440.0*pow(2.0,(67)/12.0), 400}, 70 {440.0*pow(2.0,(67)/12.0), 600},
71}; 71};
72 72
73float walk_dn[][2] = { 73float walk_dn[][2] = {
74 {440.0*pow(2.0,(67)/12.0), 400}, 74 {440.0*pow(2.0,(67)/12.0), 400},
75 {0, 50}, 75 {0, 50},
76 {440.0*pow(2.0,(60)/12.0), 400}, 76 {440.0*pow(2.0,(60)/12.0), 600},
77}; 77};
78 78
79const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 79const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/quantum/keymap_unicode.c b/quantum/keymap_unicode.c
index a9357edec..a44965e61 100644
--- a/quantum/keymap_unicode.c
+++ b/quantum/keymap_unicode.c
@@ -30,6 +30,8 @@ uint16_t hextokeycode(int hex) {
30void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) 30void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
31{ 31{
32 32
33 // For more info on how this works per OS, see here: https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input
34
33 if (record->event.pressed) { 35 if (record->event.pressed) {
34 uint16_t unicode = (opt << 8) | id; 36 uint16_t unicode = (opt << 8) | id;
35 register_code(KC_LALT); 37 register_code(KC_LALT);