fced377ac007d27f2650ccffbe0b18abcdcfe23d
- Author
- James Young <18669334+noroadsleft@users.noreply.github.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
2020 May 30 Breaking Changes Update (#9215) * Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968) * Convert V-USB usbdrv to a submodule (#8321) * Unify Tap Hold functions and documentation (#8348) * Changing board names to prevent confusion (#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (#8499) * Move spaceman keyboards (#8830) * Migrate miscellaneous `fn_actions` entries (#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (#8537) * Refactor Lily58 to use split_common (#6260) * Refactor zinc to use split_common (#7114) * Add a message if bin/qmk doesn't work (#9000) * Fix conflicting types for 'tfp_printf' (#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480) * Refactor and updates to TKC1800 code (#8472) * Switch to qmk forks for everything (#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484) * Audio enable corrections (2/3) (#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582) * Audio enable corrections (Part 4) (#8974) * Fix typo from PR7114 (#9171) * Augment future branch Changelogs (#8978) * Revert "Branch point for 2020 May 30 Breaking Change"
Diff
This diff is truncated to protect this page.
1diff --git a/.gitmodules b/.gitmodules
2index 6d8ab8b946336f66ae319e4604916f41a7f61ddd..324ef790d34c58abd065f23a0c2533e5c36f2281 100644
3--- a/.gitmodules
4+++ b/.gitmodules
5@@ -12,7 +12,13 @@
6 branch = master
7 [submodule "lib/googletest"]
8 path = lib/googletest
9- url = https://github.com/google/googletest
10+ url = https://github.com/qmk/googletest
11 [submodule "lib/lufa"]
12 path = lib/lufa
13 url = https://github.com/qmk/lufa
14+[submodule "lib/vusb"]
15+ path = lib/vusb
16+ url = https://github.com/qmk/v-usb
17+[submodule "lib/printf"]
18+ path = lib/printf
19+ url = https://github.com/qmk/printf
20diff --git a/Makefile b/Makefile
21index 0e57a72a0bd2df848fc3bd5204bfde4ae0f149e0..c851e01e73145b64ef2d10a6963280dfc9461d9b 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -562,14 +562,16 @@ endef
25 %:
26 # Check if we have the CMP tool installed
27 cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
28- # Ensure that python3 is installed. This check can be removed after python is used in more places.
29- if ! python3 --version 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; fi
30+ # Ensure that bin/qmk works. This will be a failing check after the next develop merge on 2020 Aug 29.
31+ if ! bin/qmk hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; fi
32 # Check if the submodules are dirty, and display a warning if they are
33 ifndef SKIP_GIT
34 if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi
35 if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --depth 50 --init lib/chibios-contrib; fi
36 if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --depth 50 --init lib/ugfx; fi
37 if [ ! -e lib/lufa ]; then git submodule sync lib/lufa && git submodule update --depth 50 --init lib/lufa; fi
38+ if [ ! -e lib/vusb ]; then git submodule sync lib/vusb && git submodule update --depth 50 --init lib/vusb; fi
39+ if [ ! -e lib/printf ]; then git submodule sync lib/printf && git submodule update --depth 50 --init lib/printf; fi
40 git submodule status --recursive 2>/dev/null | \
41 while IFS= read -r x; do \
42 case "$$x" in \
43diff --git a/docs/ChangeLog/20200530.md b/docs/ChangeLog/20200530.md
44new file mode 100644
45index 0000000000000000000000000000000000000000..9def9ae12350918d2fda7ceab94fadb4609c8992
46--- /dev/null
47+++ b/docs/ChangeLog/20200530.md
48@@ -0,0 +1,239 @@
49+# QMK Breaking Change - 2020 May 30 Changelog
50+
51diff --git a/docs/_summary.md b/docs/_summary.md
52index b3553b428501d18ea825d2c447ef5ba2050d5d91..1b6ddc67ca87374fdbba76108eb9adb7d8130645 100644
53--- a/docs/_summary.md
54+++ b/docs/_summary.md
55@@ -115,6 +115,7 @@
56 * [Overview](breaking_changes.md)
57 * [My Pull Request Was Flagged](breaking_changes_instructions.md)
58 * History
59+ * [2020 May 30](ChangeLog/20200530.md)
60 * [2020 Feb 29](ChangeLog/20200229.md)
61 * [2019 Aug 30](ChangeLog/20190830.md)
62
63diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
64index 6c684970d8299120c2404e3da64a326717f81ee1..154695ddacb60b1de82e4889469b5dafe600e90d 100644
65--- a/docs/breaking_changes.md
66+++ b/docs/breaking_changes.md
67@@ -6,27 +6,28 @@ The breaking change period is when we will merge PR's that change QMK in dangero
68
69 ## What has been included in past Breaking Changes?
70
71+* [2020 May 30](ChangeLog/20200530.md)
72 * [2020 Feb 29](ChangeLog/20200229.md)
73 * [2019 Aug 30](ChangeLog/20190830.md)
74
75 ## When is the next Breaking Change?
76
77-The next Breaking Change is scheduled for May 30, 2020.
78+The next Breaking Change is scheduled for Aug 29, 2020.
79
80 ### Important Dates
81
82-* [x] 2020 Feb 29 - `future` is created. It will be rebased weekly.
83-* [ ] 2020 May 2 - `future` closed to new PR's.
84-* [ ] 2020 May 2 - Call for testers.
85-* [ ] 2020 May 28 - `master` is locked, no PR's merged.
86-* [ ] 2020 May 30 - Merge `future` to `master`.
87-* [ ] 2020 May 30 - `master` is unlocked. PR's can be merged again.
88+* [x] 2020 May 30 - `develop` is created. It will be rebased weekly.
89+* [ ] 2020 Aug 1 - `develop` closed to new PR's.
90+* [ ] 2020 Aug 1 - Call for testers.
91+* [ ] 2020 Aug 27 - `master` is locked, no PR's merged.
92+* [ ] 2020 Aug 29 - Merge `develop` to `master`.
93+* [ ] 2020 Aug 29 - `master` is unlocked. PR's can be merged again.
94
95 ## What changes will be included?
96
97diff --git a/docs/breaking_changes_instructions.md b/docs/breaking_changes_instructions.md
98index 3f2f93834f6cbf9220ba85ca839ead97181a4e05..d835671556d3767506db1ce5572d7645278c9496 100644
99--- a/docs/breaking_changes_instructions.md
100+++ b/docs/breaking_changes_instructions.md
101@@ -27,7 +27,7 @@ If you are contributing core code, and the only reason it needs to go through br
102
103diff --git a/docs/custom_quantum_functions.md b/docs/custom_quantum_functions.md
104index 84ae589ed6c3447f7fbac8dcc4056a982afeefa5..6eb144af76b5311569d8eca085cda4a9515f1ce8 100644
105--- a/docs/custom_quantum_functions.md
106+++ b/docs/custom_quantum_functions.md
107@@ -57,7 +57,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
108 case KC_ENTER:
109 // Play a tone when enter is pressed
110 if (record->event.pressed) {
111- PLAY_NOTE_ARRAY(tone_qwerty);
112+ PLAY_SONG(tone_qwerty);
113 }
114 return true; // Let QMK send the enter press/release events
115 default:
116@@ -438,7 +438,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
117 case KC_ENTER:
118 // Play a tone when enter is pressed
119 if (record->event.pressed) {
120- PLAY_NOTE_ARRAY(tone_qwerty);
121+ PLAY_SONG(tone_qwerty);
122 }
123 return true; // Let QMK send the enter press/release events
124 case RGB_LYR: // This allows me to use underglow as layer indication, or as normal
125@@ -486,56 +486,3 @@ And you're done. The RGB layer indication will only work if you want it to. And
126 * Keymap: `void eeconfig_init_user(void)`, `uint32_t eeconfig_read_user(void)` and `void eeconfig_update_user(uint32_t val)`
127
128 The `val` is the value of the data that you want to write to EEPROM. And the `eeconfig_read_*` function return a 32 bit (DWORD) value from the EEPROM.
129-
130-# Custom Tapping Term
131-
132diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
133index 15057827c84d9bdada4aa5168ffeb4c8bb97c2ce..a4f434cbd925ff91c00ffd26d88e41369e850e34 100644
134--- a/docs/feature_rgb_matrix.md
135+++ b/docs/feature_rgb_matrix.md
136@@ -374,7 +374,8 @@ These are defined in [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blo
137 ```c
138 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
139 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
140-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
141+#define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
142+#define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
143 #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
144 #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
145 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
146diff --git a/docs/ja/custom_quantum_functions.md b/docs/ja/custom_quantum_functions.md
147index 7e4fbd897eeac3dd5660010beb603267318cb838..1524717c8e3234507d735fdff4cbbf9395d0800b 100644
148--- a/docs/ja/custom_quantum_functions.md
149+++ b/docs/ja/custom_quantum_functions.md
150@@ -62,7 +62,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
151 case KC_ENTER:
152 // enter が押された時に音を再生します
153 if (record->event.pressed) {
154- PLAY_NOTE_ARRAY(tone_qwerty);
155+ PLAY_SONG(tone_qwerty);
156 }
157 return true; // QMK に enter のプレスまたはリリースイベントを送信させます
158 default:
159@@ -440,7 +440,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
160 case KC_ENTER:
161 // enter が押された時に音を再生します
162 if (record->event.pressed) {
163- PLAY_NOTE_ARRAY(tone_qwerty);
164+ PLAY_SONG(tone_qwerty);
165 }
166 return true; // QMK に enter のプレスまたはリリースイベントを送信させます
167 case RGB_LYR: // これにより、アンダーグローをレイヤー表示として、あるいは通常通りに使うことができます。
168@@ -511,7 +511,7 @@ void eeconfig_init_user(void) { // EEPROM がリセットされます！
169 キーコードに基づいて `TAPPING_TERM` を変更するには、次のようなものを `keymap.c` ファイルに追加します:
170
171 ```c
172-uint16_t get_tapping_term(uint16_t keycode) {
173+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
174 switch (keycode) {
175 case SFT_T(KC_SPC):
176 return TAPPING_TERM + 1250;
177@@ -528,7 +528,7 @@ uint16_t get_tapping_term(uint16_t keycode) {
178 キーコードに基づいて `IGNORE_MOD_TAP_INTERRUPT` の値を変更するには、次のようなものを `keymap.c` ファイルに追加します:
179
180 ```c
181-bool get_ignore_mod_tap_interrupt(uint16_t keycode) {
182+bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
183 switch (keycode) {
184 case SFT_T(KC_SPC):
185 return true;
186diff --git a/docs/tap_hold.md b/docs/tap_hold.md
187index a0b648694b9a3000fcd6945e49627da082a70edc..2dc57f03c2d4707cb8b394f21831c57892fe5611 100644
188--- a/docs/tap_hold.md
189+++ b/docs/tap_hold.md
190@@ -4,6 +4,38 @@ While Tap-Hold options are fantastic, they are not without their issues. We hav
191
192 These options let you modify the behavior of the Tap-Hold keys.
193
194+## Tapping Term
195+
196diff --git a/docs/zh-cn/custom_quantum_functions.md b/docs/zh-cn/custom_quantum_functions.md
197index f2c6098dcb700611fa57c1a99a2037e37d7b619d..95b2084dbf427b5ce35ba5b36007386e3b0428f2 100644
198--- a/docs/zh-cn/custom_quantum_functions.md
199+++ b/docs/zh-cn/custom_quantum_functions.md
200@@ -57,7 +57,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
201 case KC_ENTER:
202 // 当按下回车时播放音符
203 if (record->event.pressed) {
204- PLAY_NOTE_ARRAY(tone_qwerty);
205+ PLAY_SONG(tone_qwerty);
206 }
207 return true; // 让QMK触发回车按下/释放事件
208 default:
209@@ -413,7 +413,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
210 case KC_ENTER:
211 // 在按下回车时播放音符
212 if (record->event.pressed) {
213- PLAY_NOTE_ARRAY(tone_qwerty);
214+ PLAY_SONG(tone_qwerty);
215 }
216 return true; // 让QMK产生回车按下/释放事件
217 case RGB_LYR: // 本句让underglow作为层指示，或正常使用。
218@@ -473,7 +473,7 @@ void eeconfig_init_user(void) { // EEPROM正被重置
219 想要修改基于键码的`TAPPING TERM`,你要向`keymap.c`文件添加如下代码:
220
221 ```c
222-uint16_t get_tapping_term(uint16_t keycode) {
223+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
224 switch (keycode) {
225 case SFT_T(KC_SPC):
226 return TAPPING_TERM + 1250;
227diff --git a/keyboards/at101_bh/at101_bh.c b/keyboards/at101_bh/at101_bh.c
228new file mode 100644
229index 0000000000000000000000000000000000000000..3b519373b0708f8476185f533673c32c15feecf3
230--- /dev/null
231+++ b/keyboards/at101_bh/at101_bh.c
232@@ -0,0 +1 @@
233+#include "at101_bh.h"
234diff --git a/keyboards/at101_blackheart/at101_blackheart.h b/keyboards/at101_bh/at101_bh.h
235rename from keyboards/at101_blackheart/at101_blackheart.h
236rename to keyboards/at101_bh/at101_bh.h
237index 24ac1b7c541bf4f3855d5bfccf71b223cc50185e..54655cf60e8daa700159f9626b4e65c2f355f7b3 100644
238--- a/keyboards/at101_blackheart/at101_blackheart.h
239+++ b/keyboards/at101_bh/at101_bh.h
240@@ -1,5 +1,4 @@
241-#ifndef at101_blackheart_H
242-#define at101_blackheart_H
243+#pragma once
244
245 #include "quantum.h"
246
247@@ -24,5 +23,3 @@
248 { K1000, K1001, KC_NO, KC_NO, KC_NO, K1005, K1006, K1007, K1008, K1009 }, \
249 { K1100, K1101, K1102, KC_NO, KC_NO, K1105, K1106, K1107, K1108, KC_NO } \
250 }
251-
252-#endif
253diff --git a/keyboards/at101_blackheart/config.h b/keyboards/at101_bh/config.h
254rename from keyboards/at101_blackheart/config.h
255rename to keyboards/at101_bh/config.h
256index 83814c6486c5784615d0f1b7bf39b6ca84eda962..6928118b79668de88dcdf1fa4e5d48fcc1e3bb75 100644
257--- a/keyboards/at101_blackheart/config.h
258+++ b/keyboards/at101_bh/config.h
259@@ -7,7 +7,7 @@
260 #define PRODUCT_ID 0x6060
261 #define DEVICE_VER 0x0001
262 #define MANUFACTURER blindassassin111
263-#define PRODUCT AT101_Blackheart PCB
264+#define PRODUCT AT101_BH PCB
265 #define DESCRIPTION Replacement AT101 PCB
266
267 /* key matrix size */
268diff --git a/keyboards/at101_blackheart/info.json b/keyboards/at101_bh/info.json
269rename from keyboards/at101_blackheart/info.json
270rename to keyboards/at101_bh/info.json
271index 4bef46712d17fb35d863dafbd0dfb427fef10755..1d28dc230bd33c327fcad6a7f08da0f9e5995a60 100644
272--- a/keyboards/at101_blackheart/info.json
273+++ b/keyboards/at101_bh/info.json
274@@ -1,6 +1,6 @@
275 {
276- "keyboard_name": "AT101 Blackheart PCB",
277- "keyboard_folder": "at101_blackheart",
278+ "keyboard_name": "AT101 BH PCB",
279+ "keyboard_folder": "at101_bh",
280 "url": "https://deskthority.net/group-buys-f50/programmable-vintage-board-pcbs-omnikey-at101-and-z-150-t19325.html",
281 "maintainer": "qmk, blindassassin111",
282 "width": 22.5,
283diff --git a/keyboards/at101_blackheart/keymaps/default/keymap.c b/keyboards/at101_bh/keymaps/default/keymap.c
284rename from keyboards/at101_blackheart/keymaps/default/keymap.c
285rename to keyboards/at101_bh/keymaps/default/keymap.c
286diff --git a/keyboards/at101_blackheart/readme.md b/keyboards/at101_bh/readme.md
287rename from keyboards/at101_blackheart/readme.md
288rename to keyboards/at101_bh/readme.md
289index d435d6955aa661b5280af28025144c00d4506dd1..8a9ce2496ff2ced855f807d3f85c3585e8dbe499 100644
290--- a/keyboards/at101_blackheart/readme.md
291+++ b/keyboards/at101_bh/readme.md
292@@ -1,15 +1,15 @@
293-# AT101 Blackheart PCB
294+# AT101 BH PCB
295
296-
297+
298
299 A replacement PCB for AT101 keyboards.
300
301 Keyboard Maintainer: QMK Community and blindassassin111
302-Hardware Supported: AT101 blackheart PCB
303+Hardware Supported: AT101 BH PCB
304 Hardware Availability: https://deskthority.net/group-buys-f50/programmable-vintage-board-pcbs-omnikey-at101-and-z-150-t19325.html
305
306 Make example for this keyboard (after setting up your build environment):
307
308- make at101_blackheart:default
309+ make at101_bh:default
310
311diff --git a/keyboards/at101_blackheart/rules.mk b/keyboards/at101_bh/rules.mk
312rename from keyboards/at101_blackheart/rules.mk
313rename to keyboards/at101_bh/rules.mk
314diff --git a/keyboards/at101_blackheart/at101_blackheart.c b/keyboards/at101_blackheart/at101_blackheart.c
315deleted file mode 100644
316index aa07a78643685ae2a086f9f799c96ecbde7a1af7..0000000000000000000000000000000000000000
317--- a/keyboards/at101_blackheart/at101_blackheart.c
318+++ /dev/null
319@@ -1 +0,0 @@
320-#include "at101_blackheart.h"
321diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
322index 33b3a9d824b8271b649b2fee487e415d7d196b9f..361d702c5bc39ff6dcb9a298d1a26200daa8d35a 100644
323--- a/keyboards/atomic/keymaps/pvc/keymap.c
324+++ b/keyboards/atomic/keymaps/pvc/keymap.c
325@@ -102,7 +102,7 @@ enum keyboard_macros {
326 #define SC_CCLS LCTL(KC_F4)
327
328 #define TG_NKRO MAGIC_TOGGLE_NKRO
329-#define OS_SHFT KC_FN0
330+#define OS_SHFT OSM(MOD_LSFT)
331
332 #define ________________ _______, _______
333 #define XXXXXXXXXXXXXXXX XXXXXXX, XXXXXXX
334@@ -258,10 +258,6 @@ void persistent_default_layer_set(uint16_t default_layer) {
335 default_layer_set(default_layer);
336 }
337
338-const uint16_t PROGMEM fn_actions[] = {
339- [0] = ACTION_MODS_ONESHOT(MOD_LSFT),
340-};
341-
342 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
343
344 // MACRODOWN only works in this function
345diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c
346index c7dcb67653cd76e75b3397c5ca0ba5fa9913f644..31a01ccd879f656a603e5e08ea5c935884d550f7 100644
347--- a/keyboards/atreus62/keymaps/atreus52/keymap.c
348+++ b/keyboards/atreus62/keymaps/atreus52/keymap.c
349@@ -10,6 +10,8 @@
350
351 #define KC_RAIS MO(RAISE)
352 #define KC_LOWR MO(LOWER)
353+#define KC_TGBD TG(BDO)
354+#define KC_TGRS TG(RESETL)
355
356 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
357 [DVORAK] = LAYOUT_kc(
358@@ -17,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
359 NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \
360 NO, A, O, E, U, I, D, H, T, N, S, NO, \
361 NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \
362- NO, FN2, LALT, LCTL, LOWR, LSFT, BSPC, ENT, SPC, RAIS, LGUI, LEFT, RGHT, NO
363+ NO, TGBD, LALT, LCTL, LOWR, LSFT, BSPC, ENT, SPC, RAIS, LGUI, LEFT, RGHT, NO
364 ),
365
366 [QWERTY] = LAYOUT_kc(
367@@ -25,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
368 NO, Q, W, E, R, T, Y, U, I, O, P, NO, \
369 NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \
370 NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \
371- NO, FN2, LALT, LCTL, LOWR, LSFT, BSPC, ENT, SPC, RAIS, LGUI, LEFT, RGHT, NO
372+ NO, TGBD, LALT, LCTL, LOWR, LSFT, BSPC, ENT, SPC, RAIS, LGUI, LEFT, RGHT, NO
373 ),
374
375 [RAISE] = LAYOUT_kc(
376@@ -33,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
377 NO, TILD, GRV, LCBR, RCBR, DQUO, QUOT, EQL, PLUS, MINS, QUES, NO, \
378 NO, ESC, TAB, LPRN, RPRN, BSLS, SLSH, LEFT, DOWN, UP, RGHT, NO, \
379 NO, TRNS, TRNS, LBRC, RBRC, TRNS, INS, PIPE, UNDS, TRNS, TRNS, NO, \
380- NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN3, NO
381+ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TGRS, NO
382 ),
383
384 [LOWER] = LAYOUT_kc(
385@@ -49,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
386 NO, TAB, Q, W, E, R, 6, Y, I, O, P, NO, \
387 NO, LSFT, A, S, D, F, 7, G, H, J, K, NO, \
388 NO, T, Z, X, C, V, 8, B, N, M, L, NO, \
389- NO, LCTL, SPC, SPC, SPC, SPC, COMM, ENT, 9, NO, NO, NO, FN2, NO
390+ NO, LCTL, SPC, SPC, SPC, SPC, COMM, ENT, 9, NO, NO, NO, TGBD, NO
391 ),
392
393 [RESETL] = LAYOUT(
394@@ -57,15 +59,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
395 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
396 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
397 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
398- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_FN3,KC_NO
399+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(RESETL),KC_NO
400 )
401 };
402
403-const uint16_t PROGMEM fn_actions[] = {
404- [2] = ACTION_LAYER_TOGGLE(BDO), // BDO layer
405- [3] = ACTION_LAYER_TOGGLE(RESETL) // RESET layer
406-};
407-
408 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
409 // MACRODOWN only works in this function
410 switch (id) {
411diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
412index aad2d643cd932828980567bfe45e8c2195f5f2f0..f9234a7b2f9dc867df75bdc5bce395e3dce4b62f 100644
413--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
414+++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
415@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
416 KC_TAB, SE_AO, SE_AE, SE_OE, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_COMM,SE_CIRC,SE_QUOT, KC_DEL, KC_END, KC_PGDN, \
417 KC_LCTRL,KC_A, KC_O, KC_E, KC_U, KC_I, KC_H, KC_D, KC_T, KC_N, KC_S, SE_MINS, KC_ENT, \
418 KC_LSFT, SE_LTGT,KC_DOT, KC_Q, KC_J, KC_K, KC_B, KC_X, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, \
419- MO(KM_MEDIA),KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_MENU,KC_FN1, KC_LEFT,KC_DOWN,KC_RGHT),
420+ MO(KM_MEDIA),KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
421 /* Layer 1: Standard ISO layer */
422 [KM_QWERTY] = LAYOUT( \
423 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, \
424@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
425 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, SE_AO, SE_CIRC,SE_QUOT, KC_DEL, KC_END, KC_PGDN, \
426 KC_LCTRL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SE_OE, SE_AE, KC_ENT, \
427 KC_LSFT, SE_LTGT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, SE_MINS, KC_RSFT, KC_UP, \
428- MO(KM_MEDIA),KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_MENU,KC_FN1, KC_LEFT,KC_DOWN,KC_RGHT),
429+ MO(KM_MEDIA),KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
430 /* Layer 2: Media layer */
431 [KM_MEDIA] = LAYOUT( \
432 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_WAKE,KC_PWR, KC_SLEP, \
433@@ -75,10 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
434 _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______),
435 };
436
437-const uint16_t PROGMEM fn_actions[] = {
438- [1] = ACTION_LAYER_TOGGLE(KM_QWERTY)
439-};
440-
441 void matrix_scan_user(void)
442 {
443 uint8_t layer = biton32(layer_state);
444diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h
445index 3dc99319ed0816773c4438887cd47d92096b462c..849f4f6077d79fee773283bc955ae920d5e413a3 100755
446--- a/keyboards/ckeys/handwire_101/config.h
447+++ b/keyboards/ckeys/handwire_101/config.h
448@@ -158,12 +158,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
449 //#define MAGIC_KEY_SLEEP_LED Z
450
451 // Audio Click
452-#define AUDIO_CLICKY
453+//#define AUDIO_CLICKY
454
455 // Music Mode Polyphony
456 // NOTE: Must change polyphony_rate to a number higher than 0 in voices.c
457-#define AUDIO_VOICES
458-#define PITCH_STANDARD_A 880.0f
459+//#define AUDIO_VOICES
460+//#define PITCH_STANDARD_A 880.0f
461
462 // Mouse keys
463 #define MOUSEKEY_DELAY 0
464diff --git a/keyboards/ckeys/handwire_101/rules.mk b/keyboards/ckeys/handwire_101/rules.mk
465index 41a29b35373fd61ed2ed261294b32b54ac98b4cf..83d55e0f706156379583db5b90e0b3439c933e72 100755
466--- a/keyboards/ckeys/handwire_101/rules.mk
467+++ b/keyboards/ckeys/handwire_101/rules.mk
468@@ -28,5 +28,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by d
469 #MIDI_ENABLE = yes # MIDI controls
470 UNICODE_ENABLE = no # Unicode
471 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
472-AUDIO_ENABLE = yes # Audio output on port C6
473+AUDIO_ENABLE = no # Audio output
474 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
475diff --git a/keyboards/clueboard/card/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
476index 0fa1d9d98911d7f9a363f8b248603deb28ea15cb..0d94eb46c92aac24efbcdc373dbc917748f08dc6 100644
477--- a/keyboards/clueboard/card/keymaps/default/keymap.c
478+++ b/keyboards/clueboard/card/keymaps/default/keymap.c
479@@ -38,6 +38,7 @@ void matrix_scan_user(void) {
480
481 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
482 switch (keycode) {
483+#ifdef AUDIO_ENABLE
484 case SONG_SU:
485 if (record->event.pressed) {
486 PLAY_SONG(tone_startup);
487@@ -58,7 +59,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
488 }
489
490 return false;
491-
492+#endif
493 default:
494 return true;
495 }
496diff --git a/keyboards/clueboard/card/keymaps/default/rules.mk b/keyboards/clueboard/card/keymaps/default/rules.mk
497index 998bb5e0eb1c815360bfa829f63fbe98ed6eb24c..82ee482bed11f49a6066e42db8db5641a65de6b7 100644
498--- a/keyboards/clueboard/card/keymaps/default/rules.mk
499+++ b/keyboards/clueboard/card/keymaps/default/rules.mk
500@@ -10,7 +10,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
501 NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
502 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
503 MIDI_ENABLE = no # MIDI controls
504-AUDIO_ENABLE = yes # Audio output on port C6
505+AUDIO_ENABLE = no # Audio output
506 UNICODE_ENABLE = no # Unicode
507 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
508 RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
509diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
510index c472f78b7de2b15ce13dd7bfd8fe61cbdebf0dc8..716ff19abdd335fc9cc3b11e5267f13812610450 100644
511--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
512+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
513@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
514 // clang-format on
515
516 // Configure ignore mod tap interrupt per key
517-bool get_ignore_mod_tap_interrupt(uint16_t keycode) {
518+bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
519 switch (keycode) {
520 // I don't like how mod tap interrupt feels with these keys specifically when I'm typing
521 case LCTL_T(KC_ESC):
522diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
523index 7e399081951da64d69b732d8cddbefa2d2b9bf39..ce4876536f83622fe60c4ade336d3a512071dac3 100644
524--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
525+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
526@@ -283,13 +283,9 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
527 GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
528 CAPS,TRNS,TRNS,ESC, TRNS,TRNS,TRNS,HOME,UP, END, PSCR,SLCK,PAUS, INS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
529 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PGUP,LEFT,DOWN,RGHT,TRNS,TRNS, TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
530- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,SPC, PGDN,GRV, FN1, TRNS,APP, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
531+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,SPC, PGDN,GRV, TILD, TRNS,APP, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
532 TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS, TRNS,TRNS, TRNS,TRNS
533 ),
534 };
535
536-const action_t PROGMEM fn_actions[] = {
537- [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde
538-};
539-
540 #endif
541diff --git a/keyboards/crkbd/keymaps/drashna/keymap.c b/keyboards/crkbd/keymaps/drashna/keymap.c
542index 55d51eb08ac7f346702fab324e7fb5603b0d4b1d..0769edf3b94d45c34f5c5b6f208e453df188b63f 100644
543--- a/keyboards/crkbd/keymaps/drashna/keymap.c
544+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
545@@ -124,7 +124,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
546 oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
547 #endif
548
549-uint16_t get_tapping_term(uint16_t keycode) {
550+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
551 switch (keycode) {
552 case ALT_T(KC_A):
553 return TAPPING_TERM + 100;
554diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c
555index 6dc2898454573d5a2be8a3b8fd1d2abda5008ab0..60c92b708a6a1dbe21e4d7a84f42741d10c97f8e 100644
556--- a/keyboards/cu75/cu75.c
557+++ b/keyboards/cu75/cu75.c
558@@ -26,7 +26,7 @@ void matrix_init_kb(void)
559
560 #ifdef AUDIO_ENABLE
561 audio_init();
562- PLAY_NOTE_ARRAY(test_sound, false, STACCATO);
563+ PLAY_SONG(test_sound);
564 // Fix port B5
565 cbi(DDRB, 5);
566 sbi(PORTB, 5);
567diff --git a/keyboards/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
568rename from keyboards/ergoinu/config.h
569rename to keyboards/dm9records/ergoinu/config.h
570diff --git a/keyboards/ergoinu/ergoinu.c b/keyboards/dm9records/ergoinu/ergoinu.c
571rename from keyboards/ergoinu/ergoinu.c
572rename to keyboards/dm9records/ergoinu/ergoinu.c
573diff --git a/keyboards/ergoinu/ergoinu.h b/keyboards/dm9records/ergoinu/ergoinu.h
574rename from keyboards/ergoinu/ergoinu.h
575rename to keyboards/dm9records/ergoinu/ergoinu.h
576diff --git a/keyboards/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
577rename from keyboards/ergoinu/info.json
578rename to keyboards/dm9records/ergoinu/info.json
579index 81f53fd25577fac386492aa44c737fb39b6aeaf0..3627049a5ed78118784d51a83202a51554f96b6f 100644
580--- a/keyboards/ergoinu/info.json
581+++ b/keyboards/dm9records/ergoinu/info.json
582@@ -1,7 +1,7 @@
583 {
584 "keyboard_name": "Ergoinu",
585 "url": "",
586- "maintainer": "hsgw",
587+ "maintainer": "hsgw(Takuya Urakawa)",
588 "width": 18,
589 "height": 5.4,
590 "layouts": {
591diff --git a/keyboards/ergoinu/keymaps/default/config.h b/keyboards/dm9records/ergoinu/keymaps/default/config.h
592rename from keyboards/ergoinu/keymaps/default/config.h
593rename to keyboards/dm9records/ergoinu/keymaps/default/config.h
594diff --git a/keyboards/ergoinu/keymaps/default/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
595rename from keyboards/ergoinu/keymaps/default/keymap.c
596rename to keyboards/dm9records/ergoinu/keymaps/default/keymap.c
597diff --git a/keyboards/ergoinu/keymaps/default/rules.mk b/keyboards/dm9records/ergoinu/keymaps/default/rules.mk
598rename from keyboards/ergoinu/keymaps/default/rules.mk
599rename to keyboards/dm9records/ergoinu/keymaps/default/rules.mk
600diff --git a/keyboards/ergoinu/keymaps/default_jis/config.h b/keyboards/dm9records/ergoinu/keymaps/default_jis/config.h
601rename from keyboards/ergoinu/keymaps/default_jis/config.h
602rename to keyboards/dm9records/ergoinu/keymaps/default_jis/config.h
603diff --git a/keyboards/ergoinu/keymaps/default_jis/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
604rename from keyboards/ergoinu/keymaps/default_jis/keymap.c
605rename to keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
606diff --git a/keyboards/ergoinu/keymaps/default_jis/rules.mk b/keyboards/dm9records/ergoinu/keymaps/default_jis/rules.mk
607rename from keyboards/ergoinu/keymaps/default_jis/rules.mk
608rename to keyboards/dm9records/ergoinu/keymaps/default_jis/rules.mk
609diff --git a/keyboards/ergoinu/matrix.c b/keyboards/dm9records/ergoinu/matrix.c
610rename from keyboards/ergoinu/matrix.c
611rename to keyboards/dm9records/ergoinu/matrix.c
612diff --git a/keyboards/ergoinu/readme.md b/keyboards/dm9records/ergoinu/readme.md
613rename from keyboards/ergoinu/readme.md
614rename to keyboards/dm9records/ergoinu/readme.md
615index 06e0cf352ebf67471d88937b7cc344d5a9d66226..de0a1c6c97068e7f652a447318e0aed475f452c9 100644
616--- a/keyboards/ergoinu/readme.md
617+++ b/keyboards/dm9records/ergoinu/readme.md
618@@ -11,11 +11,11 @@ Hardware Availability & Repository: [https://github.com/hsgw/ergoinu](https://gi
619
620 Make example for this keyboard (after setting up your build environment):
621
622- make ergoinu:default
623+ make dm9records/ergoinu:default
624
625 (or)
626
627- make ergoinu:default_jis
628+ make dm9records/ergoinu:default_jis
629
630
631 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.
632diff --git a/keyboards/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk
633rename from keyboards/ergoinu/rules.mk
634rename to keyboards/dm9records/ergoinu/rules.mk
635index 6f5debe00c35209a6f0904f0b64edaf1ee011084..493046ffa4de1ff48e2e3e235ea65ee23e9dacaf 100644
636--- a/keyboards/ergoinu/rules.mk
637+++ b/keyboards/dm9records/ergoinu/rules.mk
638@@ -26,7 +26,7 @@ MIDI_ENABLE = no # MIDI controls
639 AUDIO_ENABLE = no # Audio output on port C6
640 UNICODE_ENABLE = no # Unicode
641 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
642-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
643+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
644 SUBPROJECT_rev1 = no
645 USE_I2C = no # i2c is not supported
646 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
647@@ -35,8 +35,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
648 CUSTOM_MATRIX = yes
649 SRC += matrix.c serial.c split_util.c
650
651-DEFAULT_FOLDER = ergoinu
652-
653 # ergoinu configs
654 DISABLE_PROMICRO_LEDs = yes
655
656diff --git a/keyboards/ergoinu/serial.c b/keyboards/dm9records/ergoinu/serial.c
657rename from keyboards/ergoinu/serial.c
658rename to keyboards/dm9records/ergoinu/serial.c
659diff --git a/keyboards/ergoinu/serial.h b/keyboards/dm9records/ergoinu/serial.h
660rename from keyboards/ergoinu/serial.h
661rename to keyboards/dm9records/ergoinu/serial.h
662diff --git a/keyboards/ergoinu/serial_config.h b/keyboards/dm9records/ergoinu/serial_config.h
663rename from keyboards/ergoinu/serial_config.h
664rename to keyboards/dm9records/ergoinu/serial_config.h
665diff --git a/keyboards/ergoinu/split_util.c b/keyboards/dm9records/ergoinu/split_util.c
666rename from keyboards/ergoinu/split_util.c
667rename to keyboards/dm9records/ergoinu/split_util.c
668diff --git a/keyboards/ergoinu/split_util.h b/keyboards/dm9records/ergoinu/split_util.h
669rename from keyboards/ergoinu/split_util.h
670rename to keyboards/dm9records/ergoinu/split_util.h
671diff --git a/keyboards/plaid/config.h b/keyboards/dm9records/plaid/config.h
672rename from keyboards/plaid/config.h
673rename to keyboards/dm9records/plaid/config.h
674diff --git a/keyboards/plaid/info.json b/keyboards/dm9records/plaid/info.json
675rename from keyboards/plaid/info.json
676rename to keyboards/dm9records/plaid/info.json
677index 13bd05c149e43296f5f05d0c8b441fc3f4fede4f..318154d7de1c0b64014b9fe770f2ff95737fac79 100644
678--- a/keyboards/plaid/info.json
679+++ b/keyboards/dm9records/plaid/info.json
680@@ -1,8 +1,8 @@
681 {
682 "keyboard_name": "Plaid // Through Hole",
683- "keyboard_folder": "planid",
684+ "keyboard_folder": "dm9records/plaid",
685 "url": "https://github.com/hsgw/plaid",
686- "maintainer": "hsgw",
687+ "maintainer": "hsgw(Takuya Urakawa)",
688 "width": 12,
689 "height": 4,
690 "layouts": {