diff options
author | fauxpark <fauxpark@gmail.com> | 2021-08-15 15:27:25 +1000 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2021-08-15 15:27:25 +1000 |
commit | 4b3691e72da69290f63e859bb6ecb55dc561ece5 (patch) | |
tree | 8607e061ebbda9282099906df54fbcda67377893 | |
parent | 8a5412778278ec197c58b5bb8baed85e913e3ccd (diff) | |
parent | 4c93c350a6f399e261a1d2ada2bfe97a838d7dcb (diff) | |
download | qmk_firmware-4b3691e72da69290f63e859bb6ecb55dc561ece5.tar.gz qmk_firmware-4b3691e72da69290f63e859bb6ecb55dc561ece5.zip |
Merge remote-tracking branch 'upstream/master' into develop
20 files changed, 434 insertions, 457 deletions
diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c index 460a7620c..a7d3980ec 100644 --- a/keyboards/al1/al1.c +++ b/keyboards/al1/al1.c | |||
@@ -13,4 +13,5 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | |||
16 | #include "al1.h" | 17 | #include "al1.h" |
diff --git a/keyboards/al1/al1.h b/keyboards/al1/al1.h index c313a898d..6b585cc18 100644 --- a/keyboards/al1/al1.h +++ b/keyboards/al1/al1.h | |||
@@ -13,41 +13,39 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | #ifndef AL1_H | 16 | |
17 | #define AL1_H | 17 | #pragma once |
18 | 18 | ||
19 | #include "quantum.h" | 19 | #include "quantum.h" |
20 | 20 | ||
21 | #define XXX KC_NO | ||
22 | |||
21 | #define LAYOUT( \ | 23 | #define LAYOUT( \ |
22 | K500, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K415, K414,\ | 24 | k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k4F, k4E, \ |
23 | K501, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K215, K413,\ | 25 | k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F, k4D, \ |
24 | K502, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ | 26 | k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ |
25 | K503, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K412,\ | 27 | k53, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k4C, \ |
26 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 \ | 28 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \ |
27 | ) \ | 29 | ) { \ |
28 | { \ | 30 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ |
29 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \ | 31 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ |
30 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \ | 32 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ |
31 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215}, \ | 33 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ |
32 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315}, \ | 34 | { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ |
33 | { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415}, \ | 35 | { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ |
34 | { K500, K501, K502, K503, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \ | ||
35 | } | 36 | } |
36 | 37 | ||
37 | #define LAYOUT_split_bs( \ | 38 | #define LAYOUT_split_bs( \ |
38 | K500, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K512, K012, K013, K014, K015, K415, K414, \ | 39 | k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k5C, k0C, k0D, k0E, k0F, k4F, k4E, \ |
39 | K501, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K215, K413,\ | 40 | k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F, k4D, \ |
40 | K502, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ | 41 | k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ |
41 | K503, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K412,\ | 42 | k53, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k4C, \ |
42 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 \ | 43 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \ |
43 | ) \ | 44 | ) { \ |
44 | { \ | 45 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ |
45 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \ | 46 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ |
46 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \ | 47 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ |
47 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215}, \ | 48 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ |
48 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315}, \ | 49 | { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ |
49 | { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415}, \ | 50 | { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k5C, XXX, XXX, XXX } \ |
50 | { K500, K501, K502, K503, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K512, KC_NO, KC_NO, KC_NO} \ | ||
51 | } | 51 | } |
52 | |||
53 | #endif | ||
diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h index 6f6157c2d..b003a9cd6 100644 --- a/keyboards/al1/config.h +++ b/keyboards/al1/config.h | |||
@@ -15,62 +15,42 @@ You should have received a copy of the GNU General Public License | |||
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #ifndef CONFIG_H | 18 | #pragma once |
19 | #define CONFIG_H | ||
20 | 19 | ||
21 | #include "config_common.h" | 20 | #include "config_common.h" |
22 | 21 | ||
23 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
24 | #define VENDOR_ID 0xFEED | 23 | #define VENDOR_ID 0xFEED |
25 | #define PRODUCT_ID 0x6050 | 24 | #define PRODUCT_ID 0x6050 |
26 | #define DEVICE_VER 0x0104 | 25 | #define DEVICE_VER 0x0104 |
27 | #define MANUFACTURER Alsoran | 26 | #define MANUFACTURER Alsoran |
28 | #define PRODUCT AL1 | 27 | #define PRODUCT AL1 |
29 | 28 | ||
30 | /* key matrix size */ | 29 | /* key matrix size */ |
31 | #define MATRIX_ROWS 7 | 30 | #define MATRIX_ROWS 7 |
32 | #define MATRIX_COLS 20 | 31 | #define MATRIX_COLS 20 |
33 | 32 | ||
34 | /* | ||
35 | * Keyboard Matrix Assignments | ||
36 | * | ||
37 | * Change this to how you wired your keyboard | ||
38 | * COLS: AVR pins used for columns, left to right | ||
39 | * ROWS: AVR pins used for rows, top to bottom | ||
40 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
41 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
42 | * | ||
43 | */ | ||
44 | |||
45 | /* COL2ROW, ROW2COL*/ | ||
46 | #define DIODE_DIRECTION COL2ROW | ||
47 | |||
48 | #define LED_NUM_LOCK_PIN D0 | 33 | #define LED_NUM_LOCK_PIN D0 |
49 | #define LED_CAPS_LOCK_PIN B7 | 34 | #define LED_CAPS_LOCK_PIN B7 |
50 | #define LED_SCROLL_LOCK_PIN D1 | 35 | #define LED_SCROLL_LOCK_PIN D1 |
51 | #define LED_PIN_ON_STATE 0 | 36 | #define LED_PIN_ON_STATE 0 |
52 | 37 | ||
53 | #define BACKLIGHT_PIN B6 | 38 | #define BACKLIGHT_PIN B6 |
54 | #define BACKLIGHT_BREATHING | ||
55 | #define BACKLIGHT_LEVELS 3 | 39 | #define BACKLIGHT_LEVELS 3 |
40 | #define BACKLIGHT_BREATHING | ||
56 | 41 | ||
57 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 42 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
58 | #define DEBOUNCE 5 | 43 | #define DEBOUNCE 5 |
59 | 44 | ||
60 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ | ||
61 | //#define MATRIX_HAS_GHOST | ||
62 | |||
63 | /* number of backlight levels */ | ||
64 | |||
65 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 45 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
66 | #define LOCKING_SUPPORT_ENABLE | 46 | #define LOCKING_SUPPORT_ENABLE |
67 | /* Locking resynchronize hack */ | 47 | /* Locking resynchronize hack */ |
68 | #define LOCKING_RESYNC_ENABLE | 48 | #define LOCKING_RESYNC_ENABLE |
69 | 49 | ||
70 | /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. | 50 | /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. |
71 | * This is userful for the Windows task manager shortcut (ctrl+shift+esc). | 51 | * This is useful for the Windows task manager shortcut (ctrl+shift+esc). |
72 | */ | 52 | */ |
73 | // #define GRAVE_ESC_CTRL_OVERRIDE | 53 | //#define GRAVE_ESC_CTRL_OVERRIDE |
74 | 54 | ||
75 | /* | 55 | /* |
76 | * Force NKRO | 56 | * Force NKRO |
@@ -94,54 +74,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
94 | //#define FORCE_NKRO | 74 | //#define FORCE_NKRO |
95 | 75 | ||
96 | /* | 76 | /* |
97 | * Magic Key Options | ||
98 | * | ||
99 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
100 | * the keyboard. They are best used in combination with the HID Listen program, | ||
101 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
102 | * | ||
103 | * The options below allow the magic key functionality to be changed. This is | ||
104 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
105 | * | ||
106 | */ | ||
107 | |||
108 | /* control how magic key switches layers */ | ||
109 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
110 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
111 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
112 | |||
113 | /* override magic key keymap */ | ||
114 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
115 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
116 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
117 | //#define MAGIC_KEY_HELP1 H | ||
118 | //#define MAGIC_KEY_HELP2 SLASH | ||
119 | //#define MAGIC_KEY_DEBUG D | ||
120 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
121 | //#define MAGIC_KEY_DEBUG_KBD K | ||
122 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
123 | //#define MAGIC_KEY_VERSION V | ||
124 | //#define MAGIC_KEY_STATUS S | ||
125 | //#define MAGIC_KEY_CONSOLE C | ||
126 | //#define MAGIC_KEY_LAYER0_ALT1 ESC | ||
127 | //#define MAGIC_KEY_LAYER0_ALT2 GRAVE | ||
128 | //#define MAGIC_KEY_LAYER0 0 | ||
129 | //#define MAGIC_KEY_LAYER1 1 | ||
130 | //#define MAGIC_KEY_LAYER2 2 | ||
131 | //#define MAGIC_KEY_LAYER3 3 | ||
132 | //#define MAGIC_KEY_LAYER4 4 | ||
133 | //#define MAGIC_KEY_LAYER5 5 | ||
134 | //#define MAGIC_KEY_LAYER6 6 | ||
135 | //#define MAGIC_KEY_LAYER7 7 | ||
136 | //#define MAGIC_KEY_LAYER8 8 | ||
137 | //#define MAGIC_KEY_LAYER9 9 | ||
138 | //#define MAGIC_KEY_BOOTLOADER PAUSE | ||
139 | //#define MAGIC_KEY_LOCK CAPS | ||
140 | //#define MAGIC_KEY_EEPROM E | ||
141 | //#define MAGIC_KEY_NKRO N | ||
142 | //#define MAGIC_KEY_SLEEP_LED Z | ||
143 | |||
144 | /* | ||
145 | * Feature disable options | 77 | * Feature disable options |
146 | * These options are also useful to firmware size reduction. | 78 | * These options are also useful to firmware size reduction. |
147 | */ | 79 | */ |
@@ -156,27 +88,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
156 | //#define NO_ACTION_LAYER | 88 | //#define NO_ACTION_LAYER |
157 | //#define NO_ACTION_TAPPING | 89 | //#define NO_ACTION_TAPPING |
158 | //#define NO_ACTION_ONESHOT | 90 | //#define NO_ACTION_ONESHOT |
159 | //#define NO_ACTION_MACRO | ||
160 | //#define NO_ACTION_FUNCTION | ||
161 | |||
162 | /* | ||
163 | * MIDI options | ||
164 | */ | ||
165 | |||
166 | /* enable basic MIDI features: | ||
167 | - MIDI notes can be sent when in Music mode is on | ||
168 | */ | ||
169 | //#define MIDI_BASIC | ||
170 | |||
171 | /* enable advanced MIDI features: | ||
172 | - MIDI notes can be added to the keymap | ||
173 | - Octave shift and transpose | ||
174 | - Virtual sustain, portamento, and modulation wheel | ||
175 | - etc. | ||
176 | */ | ||
177 | //#define MIDI_ADVANCED | ||
178 | |||
179 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
180 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
181 | 91 | ||
182 | #endif | 92 | /* disable these deprecated features by default */ |
93 | #define NO_ACTION_MACRO | ||
94 | #define NO_ACTION_FUNCTION | ||
diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index f5ab64399..4cb5bba7f 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json | |||
@@ -1,15 +1,212 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "AL1", | 2 | "keyboard_name": "AL1", |
3 | "url": "", | 3 | "url": "", |
4 | "maintainer": "qmk", | 4 | "maintainer": "qmk", |
5 | "width": 20.5, | 5 | "width": 20.5, |
6 | "height": 5.25, | 6 | "height": 5.25, |
7 | "layouts": { | 7 | "layouts": { |
8 | "LAYOUT": { | 8 | "LAYOUT": { |
9 | "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Num Lock", "x":16.5, "y":0}, {"label":"/", "x":17.5, "y":0}, {"label":"*", "x":18.5, "y":0}, {"label":"-", "x":19.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"7", "x":16.5, "y":1}, {"label":"8", "x":17.5, "y":1}, {"label":"9", "x":18.5, "y":1}, {"label":"+", "x":19.5, "y":1, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":16.5, "y":2}, {"label":"5", "x":17.5, "y":2}, {"label":"6", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"↑", "x":15.25, "y":3.25}, {"label":"1", "x":16.5, "y":3}, {"label":"2", "x":17.5, "y":3}, {"label":"3", "x":18.5, "y":3}, {"label":"Enter", "x":19.5, "y":3, "h":2}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":7}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":11.75, "y":4}, {"label":"Menu", "x":12.75, "y":4, "w":1.25}, {"label":"←", "x":14.25, "y":4.25}, {"label":"↓", "x":15.25, "y":4.25}, {"label":"→", "x":16.25, "y":4.25}, {"label":"0", "x":17.5, "y":4}, {"label":".", "x":18.5, "y":4}] | 9 | "layout": [ |
10 | }, | 10 | {"x": 0, "y": 0}, |
11 | "LAYOUT_split_bs": { | 11 | {"x": 1, "y": 0}, |
12 | "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Num Lock", "x":16.5, "y":0}, {"label":"/", "x":17.5, "y":0}, {"label":"*", "x":18.5, "y":0}, {"label":"-", "x":19.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"7", "x":16.5, "y":1}, {"label":"8", "x":17.5, "y":1}, {"label":"9", "x":18.5, "y":1}, {"label":"+", "x":19.5, "y":1, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":16.5, "y":2}, {"label":"5", "x":17.5, "y":2}, {"label":"6", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"↑", "x":15.25, "y":3.25}, {"label":"1", "x":16.5, "y":3}, {"label":"2", "x":17.5, "y":3}, {"label":"3", "x":18.5, "y":3}, {"label":"Enter", "x":19.5, "y":3, "h":2}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":7}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":11.75, "y":4}, {"label":"Menu", "x":12.75, "y":4, "w":1.25}, {"label":"←", "x":14.25, "y":4.25}, {"label":"↓", "x":15.25, "y":4.25}, {"label":"→", "x":16.25, "y":4.25}, {"label":"0", "x":17.5, "y":4}, {"label":".", "x":18.5, "y":4}] | 12 | {"x": 2, "y": 0}, |
13 | {"x": 3, "y": 0}, | ||
14 | {"x": 4, "y": 0}, | ||
15 | {"x": 5, "y": 0}, | ||
16 | {"x": 6, "y": 0}, | ||
17 | {"x": 7, "y": 0}, | ||
18 | {"x": 8, "y": 0}, | ||
19 | {"x": 9, "y": 0}, | ||
20 | {"x": 10, "y": 0}, | ||
21 | {"x": 11, "y": 0}, | ||
22 | {"x": 12, "y": 0}, | ||
23 | {"x": 13, "y": 0, "w": 2}, | ||
24 | |||
25 | {"x": 15.25, "y": 0}, | ||
26 | |||
27 | {"x": 16.5, "y": 0}, | ||
28 | {"x": 17.5, "y": 0}, | ||
29 | {"x": 18.5, "y": 0}, | ||
30 | {"x": 19.5, "y": 0}, | ||
31 | |||
32 | {"x": 0, "y": 1, "w": 1.5}, | ||
33 | {"x": 1.5, "y": 1}, | ||
34 | {"x": 2.5, "y": 1}, | ||
35 | {"x": 3.5, "y": 1}, | ||
36 | {"x": 4.5, "y": 1}, | ||
37 | {"x": 5.5, "y": 1}, | ||
38 | {"x": 6.5, "y": 1}, | ||
39 | {"x": 7.5, "y": 1}, | ||
40 | {"x": 8.5, "y": 1}, | ||
41 | {"x": 9.5, "y": 1}, | ||
42 | {"x": 10.5, "y": 1}, | ||
43 | {"x": 11.5, "y": 1}, | ||
44 | {"x": 12.5, "y": 1}, | ||
45 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
46 | |||
47 | {"x": 15.25, "y": 1}, | ||
48 | |||
49 | {"x": 16.5, "y": 1}, | ||
50 | {"x": 17.5, "y": 1}, | ||
51 | {"x": 18.5, "y": 1}, | ||
52 | {"x": 19.5, "y": 1, "h": 2}, | ||
53 | |||
54 | {"x": 0, "y": 2, "w": 1.75}, | ||
55 | {"x": 1.75, "y": 2}, | ||
56 | {"x": 2.75, "y": 2}, | ||
57 | {"x": 3.75, "y": 2}, | ||
58 | {"x": 4.75, "y": 2}, | ||
59 | {"x": 5.75, "y": 2}, | ||
60 | {"x": 6.75, "y": 2}, | ||
61 | {"x": 7.75, "y": 2}, | ||
62 | {"x": 8.75, "y": 2}, | ||
63 | {"x": 9.75, "y": 2}, | ||
64 | {"x": 10.75, "y": 2}, | ||
65 | {"x": 11.75, "y": 2}, | ||
66 | {"x": 12.75, "y": 2, "w": 2.25}, | ||
67 | |||
68 | {"x": 16.5, "y": 2}, | ||
69 | {"x": 17.5, "y": 2}, | ||
70 | {"x": 18.5, "y": 2}, | ||
71 | |||
72 | {"x": 0, "y": 3, "w": 2.25}, | ||
73 | {"x": 2.25, "y": 3}, | ||
74 | {"x": 3.25, "y": 3}, | ||
75 | {"x": 4.25, "y": 3}, | ||
76 | {"x": 5.25, "y": 3}, | ||
77 | {"x": 6.25, "y": 3}, | ||
78 | {"x": 7.25, "y": 3}, | ||
79 | {"x": 8.25, "y": 3}, | ||
80 | {"x": 9.25, "y": 3}, | ||
81 | {"x": 10.25, "y": 3}, | ||
82 | {"x": 11.25, "y": 3}, | ||
83 | {"x": 12.25, "y": 3, "w": 1.75}, | ||
84 | {"x": 14, "y": 3}, | ||
85 | |||
86 | {"x": 15.25, "y": 3.25}, | ||
87 | |||
88 | {"x": 16.5, "y": 3}, | ||
89 | {"x": 17.5, "y": 3}, | ||
90 | {"x": 18.5, "y": 3}, | ||
91 | {"x": 19.5, "y": 3, "h": 2}, | ||
92 | |||
93 | {"x": 0, "y": 4, "w": 1.25}, | ||
94 | {"x": 1.25, "y": 4}, | ||
95 | {"x": 2.25, "y": 4, "w": 1.25}, | ||
96 | {"x": 3.5, "y": 4, "w": 7}, | ||
97 | {"x": 10.5, "y": 4, "w": 1.25}, | ||
98 | {"x": 11.75, "y": 4}, | ||
99 | {"x": 12.75, "y": 4, "w": 1.25}, | ||
100 | |||
101 | {"x": 14.25, "y": 4.25}, | ||
102 | {"x": 15.25, "y": 4.25}, | ||
103 | {"x": 16.25, "y": 4.25}, | ||
104 | |||
105 | {"x": 17.5, "y": 4}, | ||
106 | {"x": 18.5, "y": 4} | ||
107 | ] | ||
108 | }, | ||
109 | "LAYOUT_split_bs": { | ||
110 | "layout": [ | ||
111 | {"x": 0, "y": 0}, | ||
112 | {"x": 1, "y": 0}, | ||
113 | {"x": 2, "y": 0}, | ||
114 | {"x": 3, "y": 0}, | ||
115 | {"x": 4, "y": 0}, | ||
116 | {"x": 5, "y": 0}, | ||
117 | {"x": 6, "y": 0}, | ||
118 | {"x": 7, "y": 0}, | ||
119 | {"x": 8, "y": 0}, | ||
120 | {"x": 9, "y": 0}, | ||
121 | {"x": 10, "y": 0}, | ||
122 | {"x": 11, "y": 0}, | ||
123 | {"x": 12, "y": 0}, | ||
124 | {"x": 13, "y": 0}, | ||
125 | {"x": 14, "y": 0}, | ||
126 | |||
127 | {"x": 15.25, "y": 0}, | ||
128 | |||
129 | {"x": 16.5, "y": 0}, | ||
130 | {"x": 17.5, "y": 0}, | ||
131 | {"x": 18.5, "y": 0}, | ||
132 | {"x": 19.5, "y": 0}, | ||
133 | |||
134 | {"x": 0, "y": 1, "w": 1.5}, | ||
135 | {"x": 1.5, "y": 1}, | ||
136 | {"x": 2.5, "y": 1}, | ||
137 | {"x": 3.5, "y": 1}, | ||
138 | {"x": 4.5, "y": 1}, | ||
139 | {"x": 5.5, "y": 1}, | ||
140 | {"x": 6.5, "y": 1}, | ||
141 | {"x": 7.5, "y": 1}, | ||
142 | {"x": 8.5, "y": 1}, | ||
143 | {"x": 9.5, "y": 1}, | ||
144 | {"x": 10.5, "y": 1}, | ||
145 | {"x": 11.5, "y": 1}, | ||
146 | {"x": 12.5, "y": 1}, | ||
147 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
148 | |||
149 | {"x": 15.25, "y": 1}, | ||
150 | |||
151 | {"x": 16.5, "y": 1}, | ||
152 | {"x": 17.5, "y": 1}, | ||
153 | {"x": 18.5, "y": 1}, | ||
154 | {"x": 19.5, "y": 1, "h": 2}, | ||
155 | |||
156 | {"x": 0, "y": 2, "w": 1.75}, | ||
157 | {"x": 1.75, "y": 2}, | ||
158 | {"x": 2.75, "y": 2}, | ||
159 | {"x": 3.75, "y": 2}, | ||
160 | {"x": 4.75, "y": 2}, | ||
161 | {"x": 5.75, "y": 2}, | ||
162 | {"x": 6.75, "y": 2}, | ||
163 | {"x": 7.75, "y": 2}, | ||
164 | {"x": 8.75, "y": 2}, | ||
165 | {"x": 9.75, "y": 2}, | ||
166 | {"x": 10.75, "y": 2}, | ||
167 | {"x": 11.75, "y": 2}, | ||
168 | {"x": 12.75, "y": 2, "w": 2.25}, | ||
169 | |||
170 | {"x": 16.5, "y": 2}, | ||
171 | {"x": 17.5, "y": 2}, | ||
172 | {"x": 18.5, "y": 2}, | ||
173 | |||
174 | {"x": 0, "y": 3, "w": 2.25}, | ||
175 | {"x": 2.25, "y": 3}, | ||
176 | {"x": 3.25, "y": 3}, | ||
177 | {"x": 4.25, "y": 3}, | ||
178 | {"x": 5.25, "y": 3}, | ||
179 | {"x": 6.25, "y": 3}, | ||
180 | {"x": 7.25, "y": 3}, | ||
181 | {"x": 8.25, "y": 3}, | ||
182 | {"x": 9.25, "y": 3}, | ||
183 | {"x": 10.25, "y": 3}, | ||
184 | {"x": 11.25, "y": 3}, | ||
185 | {"x": 12.25, "y": 3, "w": 1.75}, | ||
186 | {"x": 14, "y": 3}, | ||
187 | |||
188 | {"x": 15.25, "y": 3.25}, | ||
189 | |||
190 | {"x": 16.5, "y": 3}, | ||
191 | {"x": 17.5, "y": 3}, | ||
192 | {"x": 18.5, "y": 3}, | ||
193 | {"x": 19.5, "y": 3, "h": 2}, | ||
194 | |||
195 | {"x": 0, "y": 4, "w": 1.25}, | ||
196 | {"x": 1.25, "y": 4}, | ||
197 | {"x": 2.25, "y": 4, "w": 1.25}, | ||
198 | {"x": 3.5, "y": 4, "w": 7}, | ||
199 | {"x": 10.5, "y": 4, "w": 1.25}, | ||
200 | {"x": 11.75, "y": 4}, | ||
201 | {"x": 12.75, "y": 4, "w": 1.25}, | ||
202 | |||
203 | {"x": 14.25, "y": 4.25}, | ||
204 | {"x": 15.25, "y": 4.25}, | ||
205 | {"x": 16.25, "y": 4.25}, | ||
206 | |||
207 | {"x": 17.5, "y": 4}, | ||
208 | {"x": 18.5, "y": 4} | ||
209 | ] | ||
210 | } | ||
13 | } | 211 | } |
14 | } | ||
15 | } | 212 | } |
diff --git a/keyboards/al1/keymaps/default/keymap.c b/keyboards/al1/keymaps/default/keymap.c index d571c05ab..a3a9d63d3 100644 --- a/keyboards/al1/keymaps/default/keymap.c +++ b/keyboards/al1/keymaps/default/keymap.c | |||
@@ -13,36 +13,23 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | |||
16 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
17 | 18 | ||
18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
19 | [0] = LAYOUT(\ | 20 | LAYOUT( |
20 | KC_ESC, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,\ | 21 | KC_ESC, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, |
21 | 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_DELETE, KC_P7, KC_P8, KC_P9, KC_PPLS,\ | 22 | 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_P7, KC_P8, KC_P9, KC_PPLS, |
22 | 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, \ | 23 | 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, |
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ | 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, |
24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(1), KC_RGUI, KC_RCTRL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT ), | 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT |
25 | 26 | ), | |
26 | [1] = LAYOUT(\ | 27 | |
27 | 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_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,\ | 28 | LAYOUT( |
28 | KC_TAB, KC_Q, KC_W, KC_E, RESET, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DELETE, KC_P7, KC_P8, KC_P9, KC_PPLS,\ | 29 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, |
29 | 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, \ | 30 | _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
30 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
31 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_TRNS, KC_RGUI, KC_RCTRL, BL_TOGG, BL_DEC, BL_INC, KC_P0, KC_PDOT ), | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
33 | _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______ | ||
34 | ) | ||
32 | }; | 35 | }; |
33 | |||
34 | void matrix_init_user(void) { | ||
35 | |||
36 | } | ||
37 | |||
38 | void matrix_scan_user(void) { | ||
39 | |||
40 | } | ||
41 | |||
42 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
43 | return true; | ||
44 | } | ||
45 | |||
46 | void led_set_user(uint8_t usb_led) { | ||
47 | |||
48 | } | ||
diff --git a/keyboards/al1/keymaps/default/readme.md b/keyboards/al1/keymaps/default/readme.md deleted file mode 100644 index b89f4f674..000000000 --- a/keyboards/al1/keymaps/default/readme.md +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | # The default keymap for al1 | ||
diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c index 51f35d0cf..d896b10db 100644 --- a/keyboards/al1/keymaps/splitbs/keymap.c +++ b/keyboards/al1/keymaps/splitbs/keymap.c | |||
@@ -1,32 +1,35 @@ | |||
1 | /* Copyright 2018 MechMerlin | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
1 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
2 | 18 | ||
3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
4 | [0] = LAYOUT_split_bs(\ | 20 | LAYOUT_split_bs( |
5 | KC_ESC, 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_GRAVE, KC_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ | 21 | KC_ESC, 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_GRV, KC_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, |
6 | 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_DELETE, KC_P7, KC_P8, KC_P9, KC_PPLS,\ | 22 | 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_P7, KC_P8, KC_P9, KC_PPLS, |
7 | 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, \ | 23 | 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ | 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, |
9 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(1), KC_RGUI, KC_RCTRL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT ), | 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT |
10 | [1] = LAYOUT_split_bs(\ | 26 | ), |
11 | 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_GRAVE, KC_DELETE, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ | 27 | |
12 | KC_TAB, KC_Q, KC_W, KC_E, RESET, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DELETE, KC_P7, KC_P8, KC_P9, KC_PPLS,\ | 28 | LAYOUT_split_bs( |
13 | 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, \ | 29 | _______, 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_DEL, _______, _______, _______, _______, _______, |
14 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ | 30 | _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
15 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_TRNS, KC_RGUI, KC_RCTRL, BL_TOGG, BL_DEC, BL_INC, KC_P0, KC_PDOT ), | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
33 | _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______ | ||
34 | ) | ||
16 | }; | 35 | }; |
17 | |||
18 | void matrix_init_user(void) { | ||
19 | |||
20 | } | ||
21 | |||
22 | void matrix_scan_user(void) { | ||
23 | |||
24 | } | ||
25 | |||
26 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
27 | return true; | ||
28 | } | ||
29 | |||
30 | void led_set_user(uint8_t usb_led) { | ||
31 | |||
32 | } | ||
diff --git a/keyboards/al1/matrix.c b/keyboards/al1/matrix.c index f6e951087..1407cbc08 100644 --- a/keyboards/al1/matrix.c +++ b/keyboards/al1/matrix.c | |||
@@ -1,201 +1,92 @@ | |||
1 | #include <stdint.h> | ||
2 | #include <stdbool.h> | ||
3 | #include <avr/io.h> | ||
4 | #include <util/delay.h> | ||
5 | #include "print.h" | ||
6 | #include "debug.h" | ||
7 | #include "util.h" | ||
8 | #include "matrix.h" | 1 | #include "matrix.h" |
9 | 2 | ||
10 | #ifndef DEBOUNCE | 3 | #include "gpio.h" |
11 | # define DEBOUNCE 5 | ||
12 | #endif | ||
13 | static uint8_t debouncing = DEBOUNCE; | ||
14 | |||
15 | static matrix_row_t matrix[MATRIX_ROWS]; | ||
16 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | ||
17 | |||
18 | static uint8_t read_rows(void); | ||
19 | static void init_rows(void); | ||
20 | static void unselect_cols(void); | ||
21 | static void select_col(uint8_t col); | ||
22 | |||
23 | inline uint8_t matrix_rows(void) { | ||
24 | return MATRIX_ROWS; | ||
25 | } | ||
26 | |||
27 | inline uint8_t matrix_cols(void) { | ||
28 | return MATRIX_COLS; | ||
29 | } | ||
30 | |||
31 | __attribute__ ((weak)) | ||
32 | void matrix_init_kb(void) { | ||
33 | matrix_init_user(); | ||
34 | } | ||
35 | |||
36 | __attribute__ ((weak)) | ||
37 | void matrix_scan_kb(void) { | ||
38 | matrix_scan_user(); | ||
39 | } | ||
40 | |||
41 | __attribute__ ((weak)) | ||
42 | void matrix_init_user(void) { | ||
43 | } | ||
44 | |||
45 | __attribute__ ((weak)) | ||
46 | void matrix_scan_user(void) { | ||
47 | } | ||
48 | |||
49 | void matrix_init(void) { | ||
50 | // initialize row and col | ||
51 | unselect_cols(); | ||
52 | init_rows(); | ||
53 | |||
54 | // initialize matrix state: all keys off | ||
55 | for (uint8_t i=0; i < MATRIX_ROWS; i++) { | ||
56 | matrix[i] = 0; | ||
57 | matrix_debouncing[i] = 0; | ||
58 | } | ||
59 | matrix_init_quantum(); | ||
60 | } | ||
61 | |||
62 | uint8_t matrix_scan(void) { | ||
63 | for (uint8_t col = 0; col < MATRIX_COLS; col++) { | ||
64 | select_col(col); | ||
65 | _delay_us(3); | ||
66 | uint8_t rows = read_rows(); | ||
67 | for (uint8_t row = 0; row < MATRIX_ROWS; row++) { | ||
68 | bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); | ||
69 | bool curr_bit = rows & (1<<row); | ||
70 | if (prev_bit != curr_bit) { | ||
71 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); | ||
72 | debouncing = DEBOUNCE; | ||
73 | } | ||
74 | } | ||
75 | unselect_cols(); | ||
76 | } | ||
77 | |||
78 | if (debouncing) { | ||
79 | if (--debouncing) { | ||
80 | _delay_ms(1); | ||
81 | } else { | ||
82 | for (uint8_t i = 0; i < MATRIX_ROWS; i++) { | ||
83 | matrix[i] = matrix_debouncing[i]; | ||
84 | } | ||
85 | } | ||
86 | } | ||
87 | |||
88 | matrix_scan_quantum(); | ||
89 | return 1; | ||
90 | } | ||
91 | |||
92 | bool matrix_is_modified(void) { | ||
93 | if (debouncing) | ||
94 | return false; | ||
95 | else | ||
96 | return true; | ||
97 | } | ||
98 | |||
99 | inline bool matrix_is_on(uint8_t row, uint8_t col) { | ||
100 | return (matrix[row] & ((matrix_row_t)1<<col)); | ||
101 | } | ||
102 | |||
103 | inline matrix_row_t matrix_get_row(uint8_t row) { | ||
104 | return matrix[row]; | ||
105 | } | ||
106 | |||
107 | void matrix_print(void) { | ||
108 | print("\nr/c 0123456789ABCDEF\n"); | ||
109 | for (uint8_t row = 0; row < MATRIX_ROWS; row++) { | ||
110 | xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); | ||
111 | } | ||
112 | } | ||
113 | |||
114 | uint8_t matrix_key_count(void) { | ||
115 | uint8_t count = 0; | ||
116 | for (uint8_t i = 0; i < MATRIX_ROWS; i++) { | ||
117 | count += bitpop32(matrix[i]); | ||
118 | } | ||
119 | return count; | ||
120 | } | ||
121 | |||
122 | /* Row pin configuration | ||
123 | * | ||
124 | * row: 0 1 2 3 4 5 | ||
125 | * pin: C7 B1 B2 C6 B4 B5 | ||
126 | * | ||
127 | */ | ||
128 | static void init_rows(void) | ||
129 | { | ||
130 | DDRC &= ~0b11000000; | ||
131 | DDRB &= ~0b00110110; | ||
132 | PORTC |= 0b11000000; | ||
133 | PORTB |= 0b00110110; | ||
134 | } | ||
135 | 4 | ||
136 | static uint8_t read_rows(void) { | 5 | static uint8_t read_rows(void) { |
137 | return (PINC&(1<<PC7) ? 0 : (1<<0)) | | 6 | return (readPin(C7) ? 0 : 1) | |
138 | (PINB&(1<<PB1) ? 0 : (1<<1)) | | 7 | (readPin(B1) ? 0 : 2) | |
139 | (PINB&(1<<PB2) ? 0 : (1<<2)) | | 8 | (readPin(B2) ? 0 : 4) | |
140 | (PINC&(1<<PC6) ? 0 : (1<<3)) | | 9 | (readPin(C6) ? 0 : 8) | |
141 | (PINB&(1<<PB4) ? 0 : (1<<4)) | | 10 | (readPin(B4) ? 0 : 16) | |
142 | (PINB&(1<<PB5) ? 0 : (1<<5)); | 11 | (readPin(B5) ? 0 : 32); |
143 | } | ||
144 | |||
145 | /* Row pin configuration | ||
146 | * pin: D3 D7 D6 D5 D4 | ||
147 | * row: off 0 x x x x | ||
148 | * 0 1 0 0 0 0 | ||
149 | * 1 1 0 0 0 1 | ||
150 | * 2 1 0 0 1 0 | ||
151 | * 3 1 0 0 1 1 | ||
152 | * 4 1 0 1 0 0 | ||
153 | * 5 1 0 1 0 1 | ||
154 | * 6 1 0 1 1 0 | ||
155 | * 7 1 0 1 1 1 | ||
156 | * 8 1 1 0 0 0 | ||
157 | * 9 1 1 0 0 1 | ||
158 | * 10 1 1 0 1 0 | ||
159 | * 11 1 1 0 1 1 | ||
160 | * 12 1 1 1 0 0 | ||
161 | * 13 1 1 1 0 1 | ||
162 | * 14 1 1 1 1 0 | ||
163 | * 15 1 1 1 1 1 | ||
164 | */ | ||
165 | static void unselect_cols(void) | ||
166 | { | ||
167 | // output high(DDR:1, PORT:1) to unselect | ||
168 | DDRB |= (1 << PD3); | ||
169 | PORTB |= (1 << PD3); | ||
170 | } | 12 | } |
171 | 13 | ||
172 | static void select_col(uint8_t col) { | 14 | static void select_col(uint8_t col) { |
173 | DDRD |= (1<<PD3 | 1<<PD4 | 1<<PD5 | 1<<PD6 | 1<<PD7); | 15 | writePinLow(D3); |
174 | 16 | ||
175 | PORTD &= ~(1<<PD3); | 17 | writePin(D4, (col & 1)); |
18 | writePin(D5, (col & 2)); | ||
19 | writePin(D6, (col & 4)); | ||
20 | writePin(D7, (col & 8)); | ||
21 | } | ||
22 | |||
23 | static void unselect_cols(void) { | ||
24 | writePinHigh(D3); | ||
25 | } | ||
26 | |||
27 | void matrix_init_custom(void) { | ||
28 | /* 74HC154 col pin configuration | ||
29 | * pin: D3 D7 D6 D5 D4 | ||
30 | * row: off 0 x x x x | ||
31 | * 0 1 0 0 0 0 | ||
32 | * 1 1 0 0 0 1 | ||
33 | * 2 1 0 0 1 0 | ||
34 | * 3 1 0 0 1 1 | ||
35 | * 4 1 0 1 0 0 | ||
36 | * 5 1 0 1 0 1 | ||
37 | * 6 1 0 1 1 0 | ||
38 | * 7 1 0 1 1 1 | ||
39 | * 8 1 1 0 0 0 | ||
40 | * 9 1 1 0 0 1 | ||
41 | * 10 1 1 0 1 0 | ||
42 | * 11 1 1 0 1 1 | ||
43 | * 12 1 1 1 0 0 | ||
44 | * 13 1 1 1 0 1 | ||
45 | * 14 1 1 1 1 0 | ||
46 | * 15 1 1 1 1 1 | ||
47 | */ | ||
48 | setPinOutput(D3); | ||
49 | writePinHigh(D3); | ||
50 | |||
51 | setPinOutput(D4); | ||
52 | setPinOutput(D5); | ||
53 | setPinOutput(D6); | ||
54 | setPinOutput(D7); | ||
55 | |||
56 | |||
57 | /* Row pin configuration | ||
58 | * | ||
59 | * row: 0 1 2 3 4 5 | ||
60 | * pin: C7 B1 B2 C6 B4 B5 | ||
61 | * | ||
62 | */ | ||
63 | setPinInputHigh(C7); | ||
64 | setPinInputHigh(B1); | ||
65 | setPinInputHigh(B2); | ||
66 | setPinInputHigh(C6); | ||
67 | setPinInputHigh(B4); | ||
68 | setPinInputHigh(B5); | ||
69 | } | ||
70 | |||
71 | bool matrix_scan_custom(matrix_row_t current_matrix[]) { | ||
72 | bool changed = false; | ||
73 | |||
74 | for (uint8_t col = 0; col < MATRIX_COLS; col++) { | ||
75 | select_col(col); | ||
76 | matrix_io_delay(); | ||
77 | uint8_t rows = read_rows(); | ||
78 | |||
79 | for (uint8_t row = 0; row < MATRIX_ROWS; row++) { | ||
80 | bool prev_bit = current_matrix[row] & ((matrix_row_t)1 << col); | ||
81 | bool curr_bit = rows & (1 << row); | ||
82 | |||
83 | if (prev_bit != curr_bit) { | ||
84 | current_matrix[row] ^= ((matrix_row_t)1 << col); | ||
85 | changed = true; | ||
86 | } | ||
87 | } | ||
88 | unselect_cols(); | ||
89 | } | ||
176 | 90 | ||
177 | if (col & (1<<0)) { | 91 | return changed; |
178 | PORTD |= (1<<PD4); | ||
179 | } | ||
180 | else { | ||
181 | PORTD &= ~(1<<PD4); | ||
182 | } | ||
183 | if (col & (1<<1)) { | ||
184 | PORTD |= (1<<PD5); | ||
185 | } | ||
186 | else { | ||
187 | PORTD &= ~(1<<PD5); | ||
188 | } | ||
189 | if (col & (1<<2)) { | ||
190 | PORTD |= (1<<PD6); | ||
191 | } | ||
192 | else { | ||
193 | PORTD &= ~(1<<PD6); | ||
194 | } | ||
195 | if (col & (1<<3)) { | ||
196 | PORTD |= (1<<PD7); | ||
197 | } | ||
198 | else { | ||
199 | PORTD &= ~(1<<PD7); | ||
200 | } | ||
201 | } | 92 | } |
diff --git a/keyboards/al1/readme.md b/keyboards/al1/readme.md index bdb336a75..3531e2fdc 100644 --- a/keyboards/al1/readme.md +++ b/keyboards/al1/readme.md | |||
@@ -2,15 +2,12 @@ | |||
2 | 2 | ||
3 |  | 3 |  |
4 | 4 | ||
5 | Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin), [Olivia](https://github.com/olivia) | 5 | * Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin), [Olivia](https://github.com/olivia) |
6 | Hardware Supported: AL1 PCB | 6 | * Hardware Supported: AL1 PCB |
7 | Hardware Availability: [GroupBuy](https://geekhack.org/index.php?topic=93258.0) | 7 | * Hardware Availability: [GroupBuy](https://geekhack.org/index.php?topic=93258.0) |
8 | |||
9 | Ported from [TriangleLab](https://github.com/TriangleLab)'s repo: https://github.com/TriangleLab/AL1-Firmware/tree/master/keyboards/al1 | ||
10 | 8 | ||
11 | Make example for this keyboard (after setting up your build environment): | 9 | Make example for this keyboard (after setting up your build environment): |
12 | 10 | ||
13 | make al1:default | 11 | make al1:default |
14 | make al1:splitbs | ||
15 | 12 | ||
16 | See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. | 13 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |
diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk index 3cd3ba975..7972db4b4 100644 --- a/keyboards/al1/rules.mk +++ b/keyboards/al1/rules.mk | |||
@@ -2,13 +2,6 @@ | |||
2 | MCU = atmega32u4 | 2 | MCU = atmega32u4 |
3 | 3 | ||
4 | # Bootloader selection | 4 | # Bootloader selection |
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | 5 | BOOTLOADER = atmel-dfu |
13 | 6 | ||
14 | # Build Options | 7 | # Build Options |
@@ -23,11 +16,10 @@ COMMAND_ENABLE = yes # Commands for debug and configuration | |||
23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
25 | NKRO_ENABLE = no # USB Nkey Rollover | 18 | NKRO_ENABLE = no # USB Nkey Rollover |
26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 19 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
27 | RGBLIGHT_ENABLE = no | 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
28 | MIDI_ENABLE = no # MIDI support | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
29 | UNICODE_ENABLE = no # Unicode | 22 | AUDIO_ENABLE = no # Audio output |
30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 23 | |
31 | AUDIO_ENABLE = no # Audio output on port C6 | 24 | CUSTOM_MATRIX = lite |
32 | CUSTOM_MATRIX = yes | ||
33 | SRC += matrix.c | 25 | SRC += matrix.c |
diff --git a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c index 87c935862..02f2f98a9 100644 --- a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c | |||
@@ -48,8 +48,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
48 | */ | 48 | */ |
49 | KC_GRV,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_F13, KC_F14, | 49 | KC_GRV,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_F13, KC_F14, |
50 | MU_MOD, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, RGB_TOG, | 50 | MU_MOD, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, RGB_TOG, |
51 | AU_TOG, KC_FN1,KC_FN3, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, RESET, RGB_MOD, | 51 | AU_TOG, F(1),F(3), KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, RESET, RGB_MOD, |
52 | KC_FN5, KC_FN2,KC_FN4, KC_TR, KC_TR, KC_TR, KC_TR, MU_TOG, RGB_VAD, RGB_VAI, KC_TR, KC_TR, RGB_HUI, KC_TR, | 52 | F(5), F(2),F(4), KC_TR, KC_TR, KC_TR, KC_TR, MU_TOG, RGB_VAD, RGB_VAI, KC_TR, KC_TR, RGB_HUI, KC_TR, |
53 | KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, RGB_SAD, RGB_HUD, RGB_SAI), | 53 | KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, RGB_SAD, RGB_HUD, RGB_SAI), |
54 | }; | 54 | }; |
55 | 55 | ||
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c index 4e5e84722..9e79a7355 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c | |||
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
57 | ), | 57 | ), |
58 | 58 | ||
59 | [CS_GO] = LAYOUT_split_rshift( | 59 | [CS_GO] = LAYOUT_split_rshift( |
60 | _______, _______, KC_GESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_FN0, _______, \ | 60 | _______, _______, KC_GESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, F(0), _______, \ |
61 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 61 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
62 | _______, _______, KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 62 | _______, _______, KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
63 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 63 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
@@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
99 | * `---------' `------------------------------------------------------' `--------------' | 99 | * `---------' `------------------------------------------------------' `--------------' |
100 | */ | 100 | */ |
101 | [SETTINGS] = LAYOUT_split_rshift( | 101 | [SETTINGS] = LAYOUT_split_rshift( |
102 | XXXXXXX, XXXXXXX, KC_FN0, KC_FN3, KC_FN4, KC_FN5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, \ | 102 | XXXXXXX, XXXXXXX, F(0), F(3), F(4), F(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, \ |
103 | XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_VAD, \ | 103 | XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_VAD, \ |
104 | XXXXXXX, XXXXXXX, KC_FN0, KC_FN6, KC_FN8, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ | 104 | XXXXXXX, XXXXXXX, F(0), F(6), F(8), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ |
105 | XXXXXXX, XXXXXXX, KC_FN10, KC_FN7, KC_FN9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN0, XXXXXXX, RGB_HUI, \ | 105 | XXXXXXX, XXXXXXX, F(10), F(7), F(9), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(0), XXXXXXX, RGB_HUI, \ |
106 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, KC_FN0, RGB_SAD, RGB_HUD, RGB_SAI \ | 106 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(12), XXXXXXX, XXXXXXX, F(0), RGB_SAD, RGB_HUD, RGB_SAI \ |
107 | ), | 107 | ), |
108 | }; | 108 | }; |
109 | 109 | ||
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c index 7f5ae4a72..c6799ea53 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c | |||
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
101 | 101 | ||
102 | [CS_GO] = LAYOUT_tkl_ansi( | 102 | [CS_GO] = LAYOUT_tkl_ansi( |
103 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 103 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
104 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_FN0, _______, _______, \ | 104 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, F(0), _______, _______, \ |
105 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 105 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
106 | KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 106 | KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
107 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 107 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
@@ -148,12 +148,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
148 | * `------------------------------------------------------' `--------------' | 148 | * `------------------------------------------------------' `--------------' |
149 | */ | 149 | */ |
150 | [SETTINGS] = LAYOUT_tkl_ansi( | 150 | [SETTINGS] = LAYOUT_tkl_ansi( |
151 | KC_FN13, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ | 151 | F(13), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ |
152 | KC_FN0, KC_FN3, KC_FN4, KC_FN5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ | 152 | F(0), F(3), F(4), F(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ |
153 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, \ | 153 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2), RGB_MOD, RGB_VAD, XXXXXXX, \ |
154 | AU_TOG, KC_FN6, KC_FN8, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ | 154 | AU_TOG, F(6), F(8), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ |
155 | KC_FN10, KC_FN7, KC_FN9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN0, RGB_HUI, \ | 155 | F(10), F(7), F(9), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, F(0), RGB_HUI, \ |
156 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ | 156 | XXXXXXX, XXXXXXX, XXXXXXX, F(12), XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ |
157 | ), | 157 | ), |
158 | }; | 158 | }; |
159 | 159 | ||
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c index f35826880..8988870db 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c | |||
@@ -82,12 +82,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
82 | * `------------------------------------------------------------------------------' | 82 | * `------------------------------------------------------------------------------' |
83 | */ | 83 | */ |
84 | [SETTINGS] = LAYOUT_tkl_ansi( | 84 | [SETTINGS] = LAYOUT_tkl_ansi( |
85 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ | 85 | F(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ |
86 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ | 86 | F(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ |
87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, \ | 87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2), RGB_MOD, RGB_VAD, XXXXXXX, \ |
88 | AU_TOG, KC_FN1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ | 88 | AU_TOG, F(1), F(3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ |
89 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ | 89 | F(5), F(2), F(4), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ |
90 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ | 90 | XXXXXXX, XXXXXXX, XXXXXXX, F(12), XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ |
91 | ), | 91 | ), |
92 | }; | 92 | }; |
93 | 93 | ||
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c index 5c9dfb522..64f4acea8 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c | |||
@@ -82,12 +82,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
82 | * `----------------------------------------------------------------------------' | 82 | * `----------------------------------------------------------------------------' |
83 | */ | 83 | */ |
84 | [SETTINGS] = LAYOUT_tkl_ansi( | 84 | [SETTINGS] = LAYOUT_tkl_ansi( |
85 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ | 85 | F(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ |
86 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ | 86 | F(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ |
87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, \ | 87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2), RGB_MOD, RGB_VAD, XXXXXXX, \ |
88 | AU_TOG, KC_F1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ | 88 | AU_TOG, KC_F1, F(3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ |
89 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ | 89 | F(5), F(2), F(4), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ |
90 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ | 90 | XXXXXXX, XXXXXXX, XXXXXXX, F(12), XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ |
91 | ), | 91 | ), |
92 | }; | 92 | }; |
93 | 93 | ||
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c index b86c99a41..54ef1aadb 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c | |||
@@ -83,11 +83,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
83 | */ | 83 | */ |
84 | [SETTINGS] = LAYOUT_tkl_iso( | 84 | [SETTINGS] = LAYOUT_tkl_iso( |
85 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ | 85 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ |
86 | KC_FN0, KC_FN3, KC_FN4, KC_FN5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ | 86 | F(0), F(3), F(4), F(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ |
87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_VAD, XXXXXXX, \ | 87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_VAD, XXXXXXX, \ |
88 | AU_TOG, KC_FN3, KC_FN5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ | 88 | AU_TOG, F(3), F(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ |
89 | KC_FN7, XXXXXXX, KC_FN4, KC_FN6, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN0, RGB_HUI, \ | 89 | F(7), XXXXXXX, F(4), F(6), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, F(0), RGB_HUI, \ |
90 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN0, RGB_SAD, RGB_HUD, RGB_SAI \ | 90 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(0), RGB_SAD, RGB_HUD, RGB_SAI \ |
91 | ), | 91 | ), |
92 | }; | 92 | }; |
93 | 93 | ||
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c index 479862fe7..2a16bf4cc 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c +++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c | |||
@@ -86,11 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
86 | * `----------------------------------------------------------------------------' | 86 | * `----------------------------------------------------------------------------' |
87 | */ | 87 | */ |
88 | [SETTINGS] = LAYOUT( | 88 | [SETTINGS] = LAYOUT( |
89 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \ | 89 | F(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \ |
90 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \ | 90 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2), RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \ |
91 | AU_TOG, KC_F1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 91 | AU_TOG, KC_F1, F(3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ |
92 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 92 | F(5), F(2), F(4), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ |
93 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX \ | 93 | XXXXXXX, XXXXXXX, XXXXXXX, F(12), XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX \ |
94 | ), | 94 | ), |
95 | }; | 95 | }; |
96 | 96 | ||
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c index 303fa9bb4..ba3d95be2 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c | |||
@@ -83,11 +83,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
83 | * `----------------------------------------------------------------------------' | 83 | * `----------------------------------------------------------------------------' |
84 | */ | 84 | */ |
85 | [SETTINGS] = LAYOUT( | 85 | [SETTINGS] = LAYOUT( |
86 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \ | 86 | F(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \ |
87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \ | 87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2), RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \ |
88 | AU_TOG, KC_FN1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 88 | AU_TOG, F(1), F(3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ |
89 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 89 | F(5), F(2), F(4), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ |
90 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX \ | 90 | XXXXXXX, XXXXXXX, XXXXXXX, F(12), XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX \ |
91 | ), | 91 | ), |
92 | }; | 92 | }; |
93 | 93 | ||
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c index 996bee5f7..1470f9502 100644 --- a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c | |||
@@ -58,8 +58,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
58 | [_FN] = LAYOUT_65_ansi( | 58 | [_FN] = LAYOUT_65_ansi( |
59 | KC_GRV, 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_F13, KC_F14, | 59 | KC_GRV, 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_F13, KC_F14, |
60 | MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, | 60 | MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, |
61 | AU_TOG, KC_FN1, KC_FN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD, | 61 | AU_TOG, F(1), F(3), _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD, |
62 | KC_FN5, KC_FN2, KC_FN4, _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, | 62 | F(5), F(2), F(4), _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, |
63 | _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI | 63 | _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI |
64 | ) | 64 | ) |
65 | }; | 65 | }; |
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c index c93abfd34..3a1701ce8 100644 --- a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c | |||
@@ -58,8 +58,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
58 | [_FN] = LAYOUT_65_iso( | 58 | [_FN] = LAYOUT_65_iso( |
59 | KC_GRV, 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_F13, KC_F14, | 59 | KC_GRV, 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_F13, KC_F14, |
60 | MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, | 60 | MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, |
61 | AU_TOG, KC_FN1, KC_FN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD, | 61 | AU_TOG, F(1), F(3), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD, |
62 | KC_FN5, _______, KC_FN2, KC_FN4, _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, | 62 | F(5), _______, F(2), F(4), _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, |
63 | _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI | 63 | _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI |
64 | ), | 64 | ), |
65 | }; | 65 | }; |