diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-12-14 13:01:04 -0800 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-12-14 13:01:04 -0800 |
| commit | 4446f86bfd273512d473d33c46d99690db5fbc51 (patch) | |
| tree | ae1c593a326fdbfb5a8fa8b9d13540438029dc9a | |
| parent | 306f23dc5119d864eb29cfef99ededb81075368e (diff) | |
| download | qmk_firmware-4446f86bfd273512d473d33c46d99690db5fbc51.tar.gz qmk_firmware-4446f86bfd273512d473d33c46d99690db5fbc51.zip | |
Keyboard: Bpiphany Frosty Flake Refactor, Configurator support and readme cleanup (#4648)
* Frosty Flake: layout macro refactor
- frosty_flake.h updated to use #pragma once
- KEYMAP renamed to LAYOUT
- KEYMAP_TKL renamed to LAYOUT_tkl
* Frosty Flake: keymap refactor
- config.h files updated to #pragma once
- deleted deprecated build script rules from rules.mk
- keymap.c files:
- #include QMK_KEYBOARD_H
- updated layout macro name
- white space changes for readability
* Frosty Flake: Configurator support
* Frosty Flake: readme cleanup
- Fixed Hardware Availability link (old link was 404)
- tiny grammar fix (colon missing on compile-and-flash instructions)
13 files changed, 372 insertions, 114 deletions
diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.h b/keyboards/bpiphany/frosty_flake/frosty_flake.h index 953172a8b..824287396 100644 --- a/keyboards/bpiphany/frosty_flake/frosty_flake.h +++ b/keyboards/bpiphany/frosty_flake/frosty_flake.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #ifndef FROSTY_FLAKE_H | 1 | #pragma once |
| 2 | #define FROSTY_FLAKE_H | ||
| 3 | 2 | ||
| 4 | #include "quantum.h" | 3 | #include "quantum.h" |
| 5 | 4 | ||
| @@ -26,7 +25,7 @@ | |||
| 26 | | A4 | P2 | C6 | K6 | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6 | Q6 | | | 25 | | A4 | P2 | C6 | K6 | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6 | Q6 | | |
| 27 | `-------------------------------------------------------------------------' `--------------' `-------------------' | 26 | `-------------------------------------------------------------------------' `--------------' `-------------------' |
| 28 | */ | 27 | */ |
| 29 | #define KEYMAP( \ | 28 | #define LAYOUT( \ |
| 30 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 29 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ |
| 31 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, KK1, KL1, KQ1, KQ0, \ | 30 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, KK1, KL1, KQ1, KQ0, \ |
| 32 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, KK5, KL5, KQ5, KO5, \ | 31 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, KK5, KL5, KQ5, KO5, \ |
| @@ -66,7 +65,7 @@ | |||
| 66 | `-------------------------------------------------------------------------' `--------------' | 65 | `-------------------------------------------------------------------------' `--------------' |
| 67 | */ | 66 | */ |
| 68 | 67 | ||
| 69 | #define KEYMAP_TKL( \ | 68 | #define LAYOUT_tkl( \ |
| 70 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 69 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ |
| 71 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ | 70 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ |
| 72 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ | 71 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ |
| @@ -94,7 +93,7 @@ | |||
| 94 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ | 93 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ |
| 95 | KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 94 | KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ |
| 96 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 95 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ |
| 97 | ) KEYMAP_TKL( \ | 96 | ) LAYOUT_tkl( \ |
| 98 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 97 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ |
| 99 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ | 98 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ |
| 100 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ | 99 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ |
| @@ -103,4 +102,3 @@ | |||
| 103 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 102 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ |
| 104 | ) | 103 | ) |
| 105 | 104 | ||
| 106 | #endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json new file mode 100644 index 000000000..15fb23d73 --- /dev/null +++ b/keyboards/bpiphany/frosty_flake/info.json | |||
| @@ -0,0 +1,301 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Frosty Flake", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 22.5, | ||
| 6 | "height": 6.5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "layout": [ | ||
| 10 | {"label":"Esc", "x":0, "y":0}, | ||
| 11 | {"label":"F1", "x":2, "y":0}, | ||
| 12 | {"label":"F2", "x":3, "y":0}, | ||
| 13 | {"label":"F3", "x":4, "y":0}, | ||
| 14 | {"label":"F4", "x":5, "y":0}, | ||
| 15 | {"label":"F5", "x":6.5, "y":0}, | ||
| 16 | {"label":"F6", "x":7.5, "y":0}, | ||
| 17 | {"label":"F7", "x":8.5, "y":0}, | ||
| 18 | {"label":"F8", "x":9.5, "y":0}, | ||
| 19 | {"label":"F9", "x":11, "y":0}, | ||
| 20 | {"label":"F10", "x":12, "y":0}, | ||
| 21 | {"label":"F11", "x":13, "y":0}, | ||
| 22 | {"label":"F12", "x":14, "y":0}, | ||
| 23 | {"label":"Print Screen", "x":15.25, "y":0}, | ||
| 24 | {"label":"Scroll Lock", "x":16.25, "y":0}, | ||
| 25 | {"label":"Pause", "x":17.25, "y":0}, | ||
| 26 | {"label":"`", "x":0, "y":1.5}, | ||
| 27 | {"label":"1", "x":1, "y":1.5}, | ||
| 28 | {"label":"2", "x":2, "y":1.5}, | ||
| 29 | {"label":"3", "x":3, "y":1.5}, | ||
| 30 | {"label":"4", "x":4, "y":1.5}, | ||
| 31 | {"label":"5", "x":5, "y":1.5}, | ||
| 32 | {"label":"6", "x":6, "y":1.5}, | ||
| 33 | {"label":"7", "x":7, "y":1.5}, | ||
| 34 | {"label":"8", "x":8, "y":1.5}, | ||
| 35 | {"label":"9", "x":9, "y":1.5}, | ||
| 36 | {"label":"0", "x":10, "y":1.5}, | ||
| 37 | {"label":"-", "x":11, "y":1.5}, | ||
| 38 | {"label":"=", "x":12, "y":1.5}, | ||
| 39 | {"label":"Backspace", "x":13, "y":1.5, "w":2}, | ||
| 40 | {"label":"Insert", "x":15.25, "y":1.5}, | ||
| 41 | {"label":"Home", "x":16.25, "y":1.5}, | ||
| 42 | {"label":"Page Up", "x":17.25, "y":1.5}, | ||
| 43 | {"label":"Num Lock", "x":18.5, "y":1.5}, | ||
| 44 | {"label":"/", "x":19.5, "y":1.5}, | ||
| 45 | {"label":"*", "x":20.5, "y":1.5}, | ||
| 46 | {"label":"-", "x":21.5, "y":1.5}, | ||
| 47 | {"label":"Tab", "x":0, "y":2.5, "w":1.5}, | ||
| 48 | {"label":"Q", "x":1.5, "y":2.5}, | ||
| 49 | {"label":"W", "x":2.5, "y":2.5}, | ||
| 50 | {"label":"E", "x":3.5, "y":2.5}, | ||
| 51 | {"label":"R", "x":4.5, "y":2.5}, | ||
| 52 | {"label":"T", "x":5.5, "y":2.5}, | ||
| 53 | {"label":"Y", "x":6.5, "y":2.5}, | ||
| 54 | {"label":"U", "x":7.5, "y":2.5}, | ||
| 55 | {"label":"I", "x":8.5, "y":2.5}, | ||
| 56 | {"label":"O", "x":9.5, "y":2.5}, | ||
| 57 | {"label":"P", "x":10.5, "y":2.5}, | ||
| 58 | {"label":"[", "x":11.5, "y":2.5}, | ||
| 59 | {"label":"]", "x":12.5, "y":2.5}, | ||
| 60 | {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, | ||
| 61 | {"label":"Delete", "x":15.25, "y":2.5}, | ||
| 62 | {"label":"End", "x":16.25, "y":2.5}, | ||
| 63 | {"label":"Page Down", "x":17.25, "y":2.5}, | ||
| 64 | {"label":"7", "x":18.5, "y":2.5}, | ||
| 65 | {"label":"8", "x":19.5, "y":2.5}, | ||
| 66 | {"label":"9", "x":20.5, "y":2.5}, | ||
| 67 | {"label":"+", "x":21.5, "y":2.5, "h":2}, | ||
| 68 | {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, | ||
| 69 | {"label":"A", "x":1.75, "y":3.5}, | ||
| 70 | {"label":"S", "x":2.75, "y":3.5}, | ||
| 71 | {"label":"D", "x":3.75, "y":3.5}, | ||
| 72 | {"label":"F", "x":4.75, "y":3.5}, | ||
| 73 | {"label":"G", "x":5.75, "y":3.5}, | ||
| 74 | {"label":"H", "x":6.75, "y":3.5}, | ||
| 75 | {"label":"J", "x":7.75, "y":3.5}, | ||
| 76 | {"label":"K", "x":8.75, "y":3.5}, | ||
| 77 | {"label":"L", "x":9.75, "y":3.5}, | ||
| 78 | {"label":";", "x":10.75, "y":3.5}, | ||
| 79 | {"label":"'", "x":11.75, "y":3.5}, | ||
| 80 | {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, | ||
| 81 | {"label":"4", "x":18.5, "y":3.5}, | ||
| 82 | {"label":"5", "x":19.5, "y":3.5}, | ||
| 83 | {"label":"6", "x":20.5, "y":3.5}, | ||
| 84 | {"label":"Shift", "x":0, "y":4.5, "w":1.25}, | ||
| 85 | {"label":"ISO \\", "x":1.25, "y":4.5}, | ||
| 86 | {"label":"Z", "x":2.25, "y":4.5}, | ||
| 87 | {"label":"X", "x":3.25, "y":4.5}, | ||
| 88 | {"label":"C", "x":4.25, "y":4.5}, | ||
| 89 | {"label":"V", "x":5.25, "y":4.5}, | ||
| 90 | {"label":"B", "x":6.25, "y":4.5}, | ||
| 91 | {"label":"N", "x":7.25, "y":4.5}, | ||
| 92 | {"label":"M", "x":8.25, "y":4.5}, | ||
| 93 | {"label":",", "x":9.25, "y":4.5}, | ||
| 94 | {"label":".", "x":10.25, "y":4.5}, | ||
| 95 | {"label":"/", "x":11.25, "y":4.5}, | ||
| 96 | {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, | ||
| 97 | {"label":"Up", "x":16.25, "y":4.5}, | ||
| 98 | {"label":"1", "x":18.5, "y":4.5}, | ||
| 99 | {"label":"2", "x":19.5, "y":4.5}, | ||
| 100 | {"label":"3", "x":20.5, "y":4.5}, | ||
| 101 | {"label":"Enter", "x":21.5, "y":4.5, "h":2}, | ||
| 102 | {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, | ||
| 103 | {"label":"GUI", "x":1.25, "y":5.5, "w":1.25}, | ||
| 104 | {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, | ||
| 105 | {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, | ||
| 106 | {"label":"Alt", "x":10, "y":5.5, "w":1.25}, | ||
| 107 | {"label":"GUI", "x":11.25, "y":5.5, "w":1.25}, | ||
| 108 | {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, | ||
| 109 | {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, | ||
| 110 | {"label":"Left", "x":15.25, "y":5.5}, | ||
| 111 | {"label":"Down", "x":16.25, "y":5.5}, | ||
| 112 | {"label":"Right", "x":17.25, "y":5.5}, | ||
| 113 | {"label":"0", "x":18.5, "y":5.5, "w":2}, | ||
| 114 | {"label":".", "x":20.5, "y":5.5} | ||
| 115 | ] | ||
| 116 | }, | ||
| 117 | "LAYOUT_tkl": { | ||
| 118 | "layout": [ | ||
| 119 | {"label":"Esc", "x":0, "y":0}, | ||
| 120 | {"label":"F1", "x":2, "y":0}, | ||
| 121 | {"label":"F2", "x":3, "y":0}, | ||
| 122 | {"label":"F3", "x":4, "y":0}, | ||
| 123 | {"label":"F4", "x":5, "y":0}, | ||
| 124 | {"label":"F5", "x":6.5, "y":0}, | ||
| 125 | {"label":"F6", "x":7.5, "y":0}, | ||
| 126 | {"label":"F7", "x":8.5, "y":0}, | ||
| 127 | {"label":"F8", "x":9.5, "y":0}, | ||
| 128 | {"label":"F9", "x":11, "y":0}, | ||
| 129 | {"label":"F10", "x":12, "y":0}, | ||
| 130 | {"label":"F11", "x":13, "y":0}, | ||
| 131 | {"label":"F12", "x":14, "y":0}, | ||
| 132 | {"label":"Print Screen", "x":15.25, "y":0}, | ||
| 133 | {"label":"Scroll Lock", "x":16.25, "y":0}, | ||
| 134 | {"label":"Pause", "x":17.25, "y":0}, | ||
| 135 | {"label":"`", "x":0, "y":1.5}, | ||
| 136 | {"label":"1", "x":1, "y":1.5}, | ||
| 137 | {"label":"2", "x":2, "y":1.5}, | ||
| 138 | {"label":"3", "x":3, "y":1.5}, | ||
| 139 | {"label":"4", "x":4, "y":1.5}, | ||
| 140 | {"label":"5", "x":5, "y":1.5}, | ||
| 141 | {"label":"6", "x":6, "y":1.5}, | ||
| 142 | {"label":"7", "x":7, "y":1.5}, | ||
| 143 | {"label":"8", "x":8, "y":1.5}, | ||
| 144 | {"label":"9", "x":9, "y":1.5}, | ||
| 145 | {"label":"0", "x":10, "y":1.5}, | ||
| 146 | {"label":"-", "x":11, "y":1.5}, | ||
| 147 | {"label":"=", "x":12, "y":1.5}, | ||
| 148 | {"label":"Backspace", "x":13, "y":1.5, "w":2}, | ||
| 149 | {"label":"Insert", "x":15.25, "y":1.5}, | ||
| 150 | {"label":"Home", "x":16.25, "y":1.5}, | ||
| 151 | {"label":"Page Up", "x":17.25, "y":1.5}, | ||
| 152 | {"label":"Tab", "x":0, "y":2.5, "w":1.5}, | ||
| 153 | {"label":"Q", "x":1.5, "y":2.5}, | ||
| 154 | {"label":"W", "x":2.5, "y":2.5}, | ||
| 155 | {"label":"E", "x":3.5, "y":2.5}, | ||
| 156 | {"label":"R", "x":4.5, "y":2.5}, | ||
| 157 | {"label":"T", "x":5.5, "y":2.5}, | ||
| 158 | {"label":"Y", "x":6.5, "y":2.5}, | ||
| 159 | {"label":"U", "x":7.5, "y":2.5}, | ||
| 160 | {"label":"I", "x":8.5, "y":2.5}, | ||
| 161 | {"label":"O", "x":9.5, "y":2.5}, | ||
| 162 | {"label":"P", "x":10.5, "y":2.5}, | ||
| 163 | {"label":"[", "x":11.5, "y":2.5}, | ||
| 164 | {"label":"]", "x":12.5, "y":2.5}, | ||
| 165 | {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, | ||
| 166 | {"label":"Delete", "x":15.25, "y":2.5}, | ||
| 167 | {"label":"End", "x":16.25, "y":2.5}, | ||
| 168 | {"label":"Page Down", "x":17.25, "y":2.5}, | ||
| 169 | {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, | ||
| 170 | {"label":"A", "x":1.75, "y":3.5}, | ||
| 171 | {"label":"S", "x":2.75, "y":3.5}, | ||
| 172 | {"label":"D", "x":3.75, "y":3.5}, | ||
| 173 | {"label":"F", "x":4.75, "y":3.5}, | ||
| 174 | {"label":"G", "x":5.75, "y":3.5}, | ||
| 175 | {"label":"H", "x":6.75, "y":3.5}, | ||
| 176 | {"label":"J", "x":7.75, "y":3.5}, | ||
| 177 | {"label":"K", "x":8.75, "y":3.5}, | ||
| 178 | {"label":"L", "x":9.75, "y":3.5}, | ||
| 179 | {"label":";", "x":10.75, "y":3.5}, | ||
| 180 | {"label":"'", "x":11.75, "y":3.5}, | ||
| 181 | {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, | ||
| 182 | {"label":"Shift", "x":0, "y":4.5, "w":1.25}, | ||
| 183 | {"label":"ISO \\", "x":1.25, "y":4.5}, | ||
| 184 | {"label":"Z", "x":2.25, "y":4.5}, | ||
| 185 | {"label":"X", "x":3.25, "y":4.5}, | ||
| 186 | {"label":"C", "x":4.25, "y":4.5}, | ||
| 187 | {"label":"V", "x":5.25, "y":4.5}, | ||
| 188 | {"label":"B", "x":6.25, "y":4.5}, | ||
| 189 | {"label":"N", "x":7.25, "y":4.5}, | ||
| 190 | {"label":"M", "x":8.25, "y":4.5}, | ||
| 191 | {"label":",", "x":9.25, "y":4.5}, | ||
| 192 | {"label":".", "x":10.25, "y":4.5}, | ||
| 193 | {"label":"/", "x":11.25, "y":4.5}, | ||
| 194 | {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, | ||
| 195 | {"label":"Up", "x":16.25, "y":4.5}, | ||
| 196 | {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, | ||
| 197 | {"label":"GUI", "x":1.25, "y":5.5, "w":1.25}, | ||
| 198 | {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, | ||
| 199 | {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, | ||
| 200 | {"label":"Alt", "x":10, "y":5.5, "w":1.25}, | ||
| 201 | {"label":"GUI", "x":11.25, "y":5.5, "w":1.25}, | ||
| 202 | {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, | ||
| 203 | {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, | ||
| 204 | {"label":"Left", "x":15.25, "y":5.5}, | ||
| 205 | {"label":"Down", "x":16.25, "y":5.5}, | ||
| 206 | {"label":"Right", "x":17.25, "y":5.5} | ||
| 207 | ] | ||
| 208 | }, | ||
| 209 | "LAYOUT_tkl_ansi": { | ||
| 210 | "layout": [ | ||
| 211 | {"label":"Esc", "x":0, "y":0}, | ||
| 212 | {"label":"F1", "x":2, "y":0}, | ||
| 213 | {"label":"F2", "x":3, "y":0}, | ||
| 214 | {"label":"F3", "x":4, "y":0}, | ||
| 215 | {"label":"F4", "x":5, "y":0}, | ||
| 216 | {"label":"F5", "x":6.5, "y":0}, | ||
| 217 | {"label":"F6", "x":7.5, "y":0}, | ||
| 218 | {"label":"F7", "x":8.5, "y":0}, | ||
| 219 | {"label":"F8", "x":9.5, "y":0}, | ||
| 220 | {"label":"F9", "x":11, "y":0}, | ||
| 221 | {"label":"F10", "x":12, "y":0}, | ||
| 222 | {"label":"F11", "x":13, "y":0}, | ||
| 223 | {"label":"F12", "x":14, "y":0}, | ||
| 224 | {"label":"Print Screen", "x":15.25, "y":0}, | ||
| 225 | {"label":"Scroll Lock", "x":16.25, "y":0}, | ||
| 226 | {"label":"Pause", "x":17.25, "y":0}, | ||
| 227 | {"label":"`", "x":0, "y":1.5}, | ||
| 228 | {"label":"1", "x":1, "y":1.5}, | ||
| 229 | {"label":"2", "x":2, "y":1.5}, | ||
| 230 | {"label":"3", "x":3, "y":1.5}, | ||
| 231 | {"label":"4", "x":4, "y":1.5}, | ||
| 232 | {"label":"5", "x":5, "y":1.5}, | ||
| 233 | {"label":"6", "x":6, "y":1.5}, | ||
| 234 | {"label":"7", "x":7, "y":1.5}, | ||
| 235 | {"label":"8", "x":8, "y":1.5}, | ||
| 236 | {"label":"9", "x":9, "y":1.5}, | ||
| 237 | {"label":"0", "x":10, "y":1.5}, | ||
| 238 | {"label":"-", "x":11, "y":1.5}, | ||
| 239 | {"label":"=", "x":12, "y":1.5}, | ||
| 240 | {"label":"Backspace", "x":13, "y":1.5, "w":2}, | ||
| 241 | {"label":"Insert", "x":15.25, "y":1.5}, | ||
| 242 | {"label":"Home", "x":16.25, "y":1.5}, | ||
| 243 | {"label":"Page Up", "x":17.25, "y":1.5}, | ||
| 244 | {"label":"Tab", "x":0, "y":2.5, "w":1.5}, | ||
| 245 | {"label":"Q", "x":1.5, "y":2.5}, | ||
| 246 | {"label":"W", "x":2.5, "y":2.5}, | ||
| 247 | {"label":"E", "x":3.5, "y":2.5}, | ||
| 248 | {"label":"R", "x":4.5, "y":2.5}, | ||
| 249 | {"label":"T", "x":5.5, "y":2.5}, | ||
| 250 | {"label":"Y", "x":6.5, "y":2.5}, | ||
| 251 | {"label":"U", "x":7.5, "y":2.5}, | ||
| 252 | {"label":"I", "x":8.5, "y":2.5}, | ||
| 253 | {"label":"O", "x":9.5, "y":2.5}, | ||
| 254 | {"label":"P", "x":10.5, "y":2.5}, | ||
| 255 | {"label":"[", "x":11.5, "y":2.5}, | ||
| 256 | {"label":"]", "x":12.5, "y":2.5}, | ||
| 257 | {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, | ||
| 258 | {"label":"Delete", "x":15.25, "y":2.5}, | ||
| 259 | {"label":"End", "x":16.25, "y":2.5}, | ||
| 260 | {"label":"Page Down", "x":17.25, "y":2.5}, | ||
| 261 | {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, | ||
| 262 | {"label":"A", "x":1.75, "y":3.5}, | ||
| 263 | {"label":"S", "x":2.75, "y":3.5}, | ||
| 264 | {"label":"D", "x":3.75, "y":3.5}, | ||
| 265 | {"label":"F", "x":4.75, "y":3.5}, | ||
| 266 | {"label":"G", "x":5.75, "y":3.5}, | ||
| 267 | {"label":"H", "x":6.75, "y":3.5}, | ||
| 268 | {"label":"J", "x":7.75, "y":3.5}, | ||
| 269 | {"label":"K", "x":8.75, "y":3.5}, | ||
| 270 | {"label":"L", "x":9.75, "y":3.5}, | ||
| 271 | {"label":";", "x":10.75, "y":3.5}, | ||
| 272 | {"label":"'", "x":11.75, "y":3.5}, | ||
| 273 | {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, | ||
| 274 | {"label":"Shift", "x":0, "y":4.5, "w":2.25}, | ||
| 275 | {"label":"Z", "x":2.25, "y":4.5}, | ||
| 276 | {"label":"X", "x":3.25, "y":4.5}, | ||
| 277 | {"label":"C", "x":4.25, "y":4.5}, | ||
| 278 | {"label":"V", "x":5.25, "y":4.5}, | ||
| 279 | {"label":"B", "x":6.25, "y":4.5}, | ||
| 280 | {"label":"N", "x":7.25, "y":4.5}, | ||
| 281 | {"label":"M", "x":8.25, "y":4.5}, | ||
| 282 | {"label":",", "x":9.25, "y":4.5}, | ||
| 283 | {"label":".", "x":10.25, "y":4.5}, | ||
| 284 | {"label":"/", "x":11.25, "y":4.5}, | ||
| 285 | {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, | ||
| 286 | {"label":"Up", "x":16.25, "y":4.5}, | ||
| 287 | {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, | ||
| 288 | {"label":"GUI", "x":1.25, "y":5.5, "w":1.25}, | ||
| 289 | {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, | ||
| 290 | {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, | ||
| 291 | {"label":"Alt", "x":10, "y":5.5, "w":1.25}, | ||
| 292 | {"label":"GUI", "x":11.25, "y":5.5, "w":1.25}, | ||
| 293 | {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, | ||
| 294 | {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, | ||
| 295 | {"label":"Left", "x":15.25, "y":5.5}, | ||
| 296 | {"label":"Down", "x":16.25, "y":5.5}, | ||
| 297 | {"label":"Right", "x":17.25, "y":5.5} | ||
| 298 | ] | ||
| 299 | } | ||
| 300 | } | ||
| 301 | } \ No newline at end of file | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h index b25194014..017ead425 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h +++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h | |||
| @@ -1,11 +1,4 @@ | |||
| 1 | 1 | #pragma once | |
| 2 | #define TAPPING_TERM 150 //reduce time required to register a held key | ||
| 3 | |||
| 4 | #ifndef CONFIG_USER_H | ||
| 5 | #define CONFIG_USER_H | ||
| 6 | |||
| 7 | #include "../../config.h" | ||
| 8 | 2 | ||
| 9 | // place overrides here | 3 | // place overrides here |
| 10 | 4 | #define TAPPING_TERM 150 //reduce time required to register a held key | |
| 11 | #endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c index 81899396a..684987e36 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c +++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c | |||
| @@ -1,9 +1,4 @@ | |||
| 1 | #include "frosty_flake.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #ifdef AUDIO_ENABLE | ||
| 4 | #include "audio.h" | ||
| 5 | #endif | ||
| 6 | #include "eeconfig.h" | ||
| 7 | 2 | ||
| 8 | enum QFR_layers { | 3 | enum QFR_layers { |
| 9 | _COLEMAK, | 4 | _COLEMAK, |
| @@ -27,7 +22,7 @@ enum custom_macros { | |||
| 27 | }; | 22 | }; |
| 28 | 23 | ||
| 29 | const uint16_t PROGMEM fn_actions[] = { //ACTION_LAYER_TAP_TOGGLE requires that number of taps be defined in *config.h* - default set to 5 | 24 | const uint16_t PROGMEM fn_actions[] = { //ACTION_LAYER_TAP_TOGGLE requires that number of taps be defined in *config.h* - default set to 5 |
| 30 | [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), //Hold for momentary Lower layer, Tap for Space, | 25 | [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), //Hold for momentary Lower layer, Tap for Space, |
| 31 | [1] = ACTION_LAYER_MOMENTARY(_MOUSE) //Hold for momentary MOUSE | 26 | [1] = ACTION_LAYER_MOMENTARY(_MOUSE) //Hold for momentary MOUSE |
| 32 | 27 | ||
| 33 | }; | 28 | }; |
| @@ -37,12 +32,8 @@ enum custom_macros { | |||
| 37 | #define PIPE M(R_PIPE) | 32 | #define PIPE M(R_PIPE) |
| 38 | #define POINT M(R_POINT) | 33 | #define POINT M(R_POINT) |
| 39 | 34 | ||
| 40 | // Fillers to make layering more clear | ||
| 41 | #define _______ KC_TRNS | ||
| 42 | #define XXXXXXX KC_NO | ||
| 43 | |||
| 44 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 35 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 45 | [_COLEMAK] = KEYMAP_TKL(\ | 36 | [_COLEMAK] = LAYOUT_tkl(\ |
| 46 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ | 37 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ |
| 47 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, \ | 38 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, \ |
| 48 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC,KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ | 39 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC,KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ |
| @@ -51,25 +42,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 51 | KC_LCTL,KC_LGUI, KC_LALT, SPC_LW, MSE, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT | 42 | KC_LCTL,KC_LGUI, KC_LALT, SPC_LW, MSE, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT |
| 52 | ), | 43 | ), |
| 53 | 44 | ||
| 54 | [_QWERTY] = KEYMAP_TKL(\ | 45 | [_QWERTY] = LAYOUT_tkl(\ |
| 55 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ | 46 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 56 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ | 47 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ |
| 57 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ | 48 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ |
| 58 | KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \ | 49 | KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \ |
| 59 | KC_LSFT,KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ | 50 | KC_LSFT,KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ |
| 60 | KC_LCTL,KC_LGUI,KC_LALT, SPC_LW, MSE, KC_RGUI , KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 51 | KC_LCTL,KC_LGUI,KC_LALT, SPC_LW, MSE, KC_RGUI , KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 61 | ), | 52 | ), |
| 62 | 53 | ||
| 63 | [_DVORAK] = KEYMAP_TKL(\ | 54 | [_DVORAK] = LAYOUT_tkl(\ |
| 64 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ | 55 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 65 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ | 56 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ |
| 66 | KC_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ | 57 | KC_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ |
| 67 | KC_BSPC,KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT, KC_ENT, \ | 58 | KC_BSPC,KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT, KC_ENT, \ |
| 68 | KC_LSFT,KC_NUBS,KC_SCLN,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, \ | 59 | KC_LSFT,KC_NUBS,KC_SCLN,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, \ |
| 69 | KC_LCTL,KC_LGUI,KC_LALT, SPC_LW, MSE, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 60 | KC_LCTL,KC_LGUI,KC_LALT, SPC_LW, MSE, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 70 | ), | 61 | ), |
| 71 | 62 | ||
| 72 | [_LOWER] = KEYMAP_TKL(\ | 63 | [_LOWER] = LAYOUT_tkl(\ |
| 73 | RESET, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, _______, KC_MUTE, KC_VOLD, KC_VOLU, QWERTY, COLEMAK,DVORAK, \ | 64 | RESET, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, _______, KC_MUTE, KC_VOLD, KC_VOLU, QWERTY, COLEMAK,DVORAK, \ |
| 74 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_UNDS, KC_PLUS, KC_BSPC, _______,_______,_______, \ | 65 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_UNDS, KC_PLUS, KC_BSPC, _______,_______,_______, \ |
| 75 | KC_TAB, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PIPE, _______,_______,_______, \ | 66 | KC_TAB, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PIPE, _______,_______,_______, \ |
| @@ -78,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 78 | _______, _______, _______, _______, KC_RALT, _______, _______, _______, _______,_______,_______ \ | 69 | _______, _______, _______, _______, KC_RALT, _______, _______, _______, _______,_______,_______ \ |
| 79 | ), | 70 | ), |
| 80 | 71 | ||
| 81 | [_MOUSE] = KEYMAP_TKL(\ | 72 | [_MOUSE] = LAYOUT_tkl(\ |
| 82 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, \ | 73 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, \ |
| 83 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, _______,_______,_______, \ | 74 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, _______,_______,_______, \ |
| 84 | KC_TAB, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______,_______,_______, \ | 75 | KC_TAB, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______,_______,_______, \ |
| @@ -106,7 +97,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 106 | } | 97 | } |
| 107 | return MACRO_NONE; | 98 | return MACRO_NONE; |
| 108 | } | 99 | } |
| 109 | 100 | ||
| 110 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 101 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 111 | switch (keycode) { | 102 | switch (keycode) { |
| 112 | case QWERTY: | 103 | case QWERTY: |
| @@ -126,7 +117,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 126 | set_single_persistent_default_layer(_DVORAK); | 117 | set_single_persistent_default_layer(_DVORAK); |
| 127 | } | 118 | } |
| 128 | return false; | 119 | return false; |
| 129 | break; | 120 | break; |
| 130 | } | 121 | } |
| 131 | return true; | 122 | return true; |
| 132 | } \ No newline at end of file | 123 | } \ No newline at end of file |
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/default/config.h b/keyboards/bpiphany/frosty_flake/keymaps/default/config.h index 8893d122e..271f48d00 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/default/config.h +++ b/keyboards/bpiphany/frosty_flake/keymaps/default/config.h | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #pragma once |
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | 2 | ||
| 6 | // place overrides here | 3 | // place overrides here |
| 7 | |||
| 8 | #endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c index 4dc7ed655..9d40d4c9c 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c +++ b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | #include "frosty_flake.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | [0] = KEYMAP(\ | 4 | [0] = LAYOUT(\ |
| 5 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ | 5 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 6 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ | 6 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ |
| 7 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ | 7 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, \ |
| 8 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ | 8 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ |
| 9 | KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ | 9 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ |
| 10 | KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT) | 10 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ |
| 11 | }; \ No newline at end of file | 11 | ) |
| 12 | }; | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk index 93f927c7d..5dcea8467 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk +++ b/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Build Options | 1 | # Build Options |
| 2 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 3 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| 4 | # | 4 | # |
| 5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) |
| @@ -13,9 +13,5 @@ MIDI_ENABLE = no # MIDI controls | |||
| 13 | AUDIO_ENABLE = no # Audio output on port C6 | 13 | AUDIO_ENABLE = no # Audio output on port C6 |
| 14 | UNICODE_ENABLE = no # Unicode | 14 | UNICODE_ENABLE = no # Unicode |
| 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 17 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 17 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 18 | |||
| 19 | ifndef QUANTUM_DIR | ||
| 20 | include ../../../../Makefile | ||
| 21 | endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h index 3f7852643..4bc6d2c3c 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h +++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #pragma once |
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | 2 | ||
| 3 | // place overrides here | ||
| 6 | #define TAPPING_TERM 200 | 4 | #define TAPPING_TERM 200 |
| 7 | #define LEADER_TIMEOUT 800 | 5 | #define LEADER_TIMEOUT 800 |
| 8 | 6 | ||
| @@ -17,7 +15,4 @@ | |||
| 17 | #define MOUSEKEY_DELAY 0 | 15 | #define MOUSEKEY_DELAY 0 |
| 18 | #define MOUSEKEY_TIME_TO_MAX 60 | 16 | #define MOUSEKEY_TIME_TO_MAX 60 |
| 19 | #define MOUSEKEY_MAX_SPEED 7 | 17 | #define MOUSEKEY_MAX_SPEED 7 |
| 20 | #define MOUSEKEY_WHEEL_DELAY 0 | 18 | #define MOUSEKEY_WHEEL_DELAY 0 |
| 21 | // place overrides here | ||
| 22 | |||
| 23 | #endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c index bf7c5e588..dd2098d94 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c | |||
| @@ -1,11 +1,5 @@ | |||
| 1 | #include "frosty_flake.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | 2 | |
| 3 | #include "eeconfig.h" | ||
| 4 | #include "process_unicode.h" | ||
| 5 | #include "process_unicodemap.h" | ||
| 6 | #include "quantum.h" | ||
| 7 | |||
| 8 | #define _______ KC_TRNS | ||
| 9 | #define MAXEMOJITAPS 80 | 3 | #define MAXEMOJITAPS 80 |
| 10 | 4 | ||
| 11 | 5 | ||
| @@ -33,16 +27,16 @@ enum taps{ | |||
| 33 | ALLS | 27 | ALLS |
| 34 | }; | 28 | }; |
| 35 | 29 | ||
| 36 | enum unicode_name { | 30 | enum unicode_name { |
| 37 | EMOTIS = 1,//80, //1F60x - 1F64x | 31 | EMOTIS = 1,//80, //1F60x - 1F64x |
| 38 | ANIMALS, //64, //1F40x - 1F43x | 32 | ANIMALS, //64, //1F40x - 1F43x |
| 39 | SYMBOLS,// = 45, //1F300 - 1F32C | 33 | SYMBOLS,// = 45, //1F300 - 1F32C |
| 40 | FOODS,// = 87 , //1F32D - | 34 | FOODS,// = 87 , //1F32D - |
| 41 | ETC,// = 192, //1F44x -1F4Fx | 35 | ETC,// = 192, //1F44x -1F4Fx |
| 42 | VEHICLES,// = 83, //1F68x - 1F6Dx | 36 | VEHICLES,// = 83, //1F68x - 1F6Dx |
| 43 | SUPPLEMENT,// = 32, //1F91x-1F92x | 37 | SUPPLEMENT,// = 32, //1F91x-1F92x |
| 44 | ALCHEMY,// = 116 //1F70x - 1F773 | 38 | ALCHEMY,// = 116 //1F70x - 1F773 |
| 45 | 39 | ||
| 46 | }; | 40 | }; |
| 47 | 41 | ||
| 48 | enum my_macros { | 42 | enum my_macros { |
| @@ -102,7 +96,7 @@ const uint32_t PROGMEM unicode_map[] = { | |||
| 102 | [EMOTIS] = 0x1F600, | 96 | [EMOTIS] = 0x1F600, |
| 103 | [ANIMALS] = 0x1F400, | 97 | [ANIMALS] = 0x1F400, |
| 104 | [SYMBOLS] = 0x1F300, | 98 | [SYMBOLS] = 0x1F300, |
| 105 | [FOODS] = 0x1F32D, | 99 | [FOODS] = 0x1F32D, |
| 106 | [ETC] = 0x1F440, | 100 | [ETC] = 0x1F440, |
| 107 | [VEHICLES] = 0x1F680, | 101 | [VEHICLES] = 0x1F680, |
| 108 | [SUPPLEMENT] = 0x1F910, | 102 | [SUPPLEMENT] = 0x1F910, |
| @@ -110,27 +104,30 @@ const uint32_t PROGMEM unicode_map[] = { | |||
| 110 | }; | 104 | }; |
| 111 | // Layouts | 105 | // Layouts |
| 112 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 106 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 113 | [0] = KEYMAP(\ | 107 | [0] = LAYOUT(\ |
| 114 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ | 108 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 115 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ | 109 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ |
| 116 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ | 110 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, \ |
| 117 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ | 111 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ |
| 118 | KC_LSPO,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSPC, KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ | 112 | KC_LSPO, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ |
| 119 | TD(TD_CTCPS),KC_LGUI,KC_LALT, KC_SPC, KC_LEAD,KC_RGUI, KC_APP,MO(1) , KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT), | 113 | TD(TD_CTCPS), KC_LGUI, KC_LALT, KC_SPC, KC_LEAD, KC_RGUI, KC_APP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ |
| 120 | [1] = KEYMAP(\ | 114 | ), |
| 121 | TD(ALLS), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ | 115 | [1] = LAYOUT(\ |
| 122 | KC_GRV, TD(EMOJIS),TD(ANIMAL),TD(ETC),TD(FOODS), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_MPRV,KC_MPLY,KC_MNXT, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ | 116 | TD(ALLS), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 123 | KC_TAB, KC_Q, M(0), KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_UP ,KC_RBRC,KC_BSLS, KC_MUTE,KC_VOLD,KC_VOLU, KC_P7, KC_P8, KC_P9,KC_PPLS, \ | 117 | KC_GRV, TD(EMOJIS), TD(ANIMAL), TD(ETC), TD(FOODS), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MPRV, KC_MPLY, KC_MNXT, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ |
| 124 | KC_LCTL, M(1), M(3), M(2), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_LEFT,KC_RGHT, KC_ENT, KC_P4, KC_P5, KC_P6, \ | 118 | KC_TAB, KC_Q, M(0), KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_UP, KC_RBRC, KC_BSLS, KC_MUTE, KC_VOLD, KC_VOLU, KC_P7, KC_P8, KC_P9, KC_PPLS, \ |
| 125 | KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_DOWN, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ | 119 | KC_LCTL, M(1), M(3), M(2), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_LEFT, KC_RGHT, KC_ENT, KC_P4, KC_P5, KC_P6, \ |
| 126 | KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, TG(2),_______ , KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), | 120 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_DOWN, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3, KC_PENT, \ |
| 127 | [2] = KEYMAP(\ | 121 | KC_BTN1, KC_BTN3, KC_BTN2, KC_SPC, KC_RALT, KC_RGUI, TG(2), _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_P0, KC_PDOT \ |
| 128 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ | 122 | ), |
| 129 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_MPRV,KC_MPLY,KC_MNXT, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ | 123 | [2] = LAYOUT(\ |
| 130 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_MUTE,KC_VOLD,KC_VOLU, KC_P7, KC_P8, KC_P9,KC_PPLS, \ | 124 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 131 | KC_LCTL, KC_D, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ | 125 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MPRV, KC_MPLY, KC_MNXT, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ |
| 132 | KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ | 126 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_MUTE, KC_VOLD, KC_VOLU, KC_P7, KC_P8, KC_P9, KC_PPLS, \ |
| 133 | KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, TG(2) , KC_NO , KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), | 127 | KC_LCTL, KC_D, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ |
| 128 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3, KC_PENT, \ | ||
| 129 | KC_BTN1, KC_BTN3, KC_BTN2, KC_SPC, KC_RALT, KC_RGUI, TG(2), KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_P0, KC_PDOT \ | ||
| 130 | ), | ||
| 134 | }; | 131 | }; |
| 135 | 132 | ||
| 136 | LEADER_EXTERNS(); | 133 | LEADER_EXTERNS(); |
| @@ -183,7 +180,7 @@ void cycleEmojis(qk_tap_dance_state_t *state, void *user_data) { | |||
| 183 | } | 180 | } |
| 184 | }; | 181 | }; |
| 185 | 182 | ||
| 186 | void cycleAnimals(qk_tap_dance_state_t *state, void *user_data) { | 183 | void cycleAnimals(qk_tap_dance_state_t *state, void *user_data) { |
| 187 | if(state->count == 1) { | 184 | if(state->count == 1) { |
| 188 | unicode_input_start(); | 185 | unicode_input_start(); |
| 189 | register_hex32(pgm_read_dword(&unicode_map[ANIMALS])); | 186 | register_hex32(pgm_read_dword(&unicode_map[ANIMALS])); |
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk index fc5761c05..de0f30e48 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk +++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk | |||
| @@ -12,13 +12,9 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | |||
| 12 | MIDI_ENABLE = no # MIDI controls | 12 | MIDI_ENABLE = no # MIDI controls |
| 13 | AUDIO_ENABLE = no # Audio output on port C6 | 13 | AUDIO_ENABLE = no # Audio output on port C6 |
| 14 | UNICODE_ENABLE = no # Unicode | 14 | UNICODE_ENABLE = no # Unicode |
| 15 | UNICODEMAP_ENABLE = yes # unicodemap | 15 | UNICODEMAP_ENABLE = yes # unicodemap |
| 16 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 16 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 17 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 17 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 18 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 18 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 19 | TAP_DANCE_ENABLE = yes | 19 | TAP_DANCE_ENABLE = yes |
| 20 | LEADER_ENABLE = yes | 20 | LEADER_ENABLE = yes |
| 21 | |||
| 22 | ifndef QUANTUM_DIR | ||
| 23 | include ../../../../Makefile | ||
| 24 | endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h b/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h index 8893d122e..271f48d00 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h +++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #pragma once |
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | 2 | ||
| 6 | // place overrides here | 3 | // place overrides here |
| 7 | |||
| 8 | #endif | ||
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c index 99dc95627..8e8723971 100644 --- a/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c +++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include "frosty_flake.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | [0] = KEYMAP_TKL(\ | 4 | [0] = LAYOUT_tkl(\ |
| 5 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ | 5 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 6 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ | 6 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ |
| 7 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ | 7 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ |
diff --git a/keyboards/bpiphany/frosty_flake/readme.md b/keyboards/bpiphany/frosty_flake/readme.md index 0d6a4779f..5917022a8 100644 --- a/keyboards/bpiphany/frosty_flake/readme.md +++ b/keyboards/bpiphany/frosty_flake/readme.md | |||
| @@ -18,7 +18,7 @@ keymaps `default` (104) and `tkl` (87) for example layouts. | |||
| 18 | 18 | ||
| 19 | Keyboard Maintainer: QMK Community | 19 | Keyboard Maintainer: QMK Community |
| 20 | Hardware Supported: Frosty Flake | 20 | Hardware Supported: Frosty Flake |
| 21 | Hardware Availability: https://1upkeyboards.com/qfr-frosty-flake-controller.html | 21 | Hardware Availability: [1upkeyboards](https://www.1upkeyboards.com/shop/controllers/qfr-frosty-flake-controller/) |
| 22 | 22 | ||
| 23 | Make example for this keyboard (after setting up your build environment): | 23 | Make example for this keyboard (after setting up your build environment): |
| 24 | 24 | ||
| @@ -28,7 +28,7 @@ Make example for this keyboard (after setting up your build environment): | |||
| 28 | make bpiphany/frosty_flake:default | 28 | make bpiphany/frosty_flake:default |
| 29 | ``` | 29 | ``` |
| 30 | 30 | ||
| 31 | To directly flash the frosty_flake after compiling use | 31 | To directly flash the frosty_flake after compiling use: |
| 32 | 32 | ||
| 33 | ``` | 33 | ``` |
| 34 | make bpiphany/frosty_flake:default:dfu | 34 | make bpiphany/frosty_flake:default:dfu |
