From 7c4f273cb4b3809e4f399578fdd8b5e0498bc684 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Wed, 8 Feb 2023 21:35:05 +0100 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 50f165420c39935bbc7d6345dbffebcacb87b5db Author: 4pplet Date: Wed Feb 8 21:34:20 2023 +0100 Update keymap.c commit eac1e66318c830a0fa2b128e5798c35376b78b84 Author: 4pplet Date: Wed Feb 8 21:33:50 2023 +0100 fixed canon keymap commit f2514831e22251e1e3787ab1977156d71820d0d1 Author: 4pplet Date: Wed Feb 8 16:20:57 2023 +0100 adding default layouts and a dedicated canon typewriter layout adding default layouts and a dedicated canon typewriter layout commit 4d1b113dd63e81585b846ba056c8d0b2ea119d80 Merge: 8cc98c7ffe 17409dad54 Author: 4pplet Date: Fri Feb 3 22:58:24 2023 +0100 Merge remote-tracking branch 'upstream/master' into steezy60_rev_b_adding_layouts commit 17409dad542fa0dfd0ea966769264e718f950630 Author: QMK Bot Date: Thu Feb 2 18:14:26 2023 -0800 Format code according to conventions (#19739) commit 4d09bfa076e5850ab311852cc51db624a9bd7183 Author: nendezkombet <82454371+nendezkombet@users.noreply.github.com> Date: Fri Feb 3 09:04:47 2023 +0700 [Keyboard] Add keebformom ortho 4x10 (#18104) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan Co-authored-by: jack <0x6a73@protonmail.com> commit c3406eb8d71399f6232a07cb5354c343f23805dd Author: zhol0777 <97376918+zhol0777@users.noreply.github.com> Date: Thu Feb 2 17:00:38 2023 -0800 [Keyboard] Add mkh studio bully (#19696) commit 87c41527388fc3da129fe404366bbd12faf626b5 Author: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Fri Feb 3 08:17:05 2023 +0800 Update handedness by define examples (#19687) commit 8e9d109b8c9b1caeea38dbafdfda20e1e79b2d58 Author: Kassandra Karan <87594618+SpaceyKasey@users.noreply.github.com> Date: Thu Feb 2 19:14:54 2023 -0500 Added MacOS Support for BigKnob (#19693) commit de6a6f963b5e459e8853d83723651bc01774501d Author: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri Feb 3 05:34:39 2023 +0800 [Keyboard] Add Keychron V6 (#19498) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan commit 10c3b9737f27b67b3a5ddabb7411a840f7cd6ee7 Author: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri Feb 3 05:34:18 2023 +0800 [Keyboard] Add Keychron V10 (#19504) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan commit a76e70cffff69d5ba30a39f844df490fcddd93c7 Author: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri Feb 3 05:33:56 2023 +0800 [Keyboard] Add rev_0131 for Keychron Q0 (#19547) Co-authored-by: Ryan commit d3b00d959421c183acb4ebc5c1a8882d39264b17 Author: TommyZ <60314626+tommyamoszhao@users.noreply.github.com> Date: Fri Feb 3 05:33:31 2023 +0800 [Keyboard] Add Quarkeys Z67 with solder and hotswap versions (#19465) Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre Co-authored-by: Ryan commit 3115cdf6639909cedabaaccabad959653359f359 Author: Andrew Kannan Date: Thu Feb 2 16:32:22 2023 -0500 [Keyboard] Add Crin (#18065) Co-authored-by: Joel Challis Co-authored-by: Nick Brassel commit eeadbd217661c07852b8906ce038415f36961f4e Author: Nick Brassel Date: Fri Feb 3 07:14:26 2023 +1100 Politely ask people not to submit issues to add support for unknown keyboards. (#19737) commit f7e69639b5bb3333d58b6da5df28ffcc59931bb8 Author: ziptyze Date: Thu Feb 2 13:17:10 2023 -0500 adding pi60 (#19431) * updates to 1up product line Co-authored-by: Joel Challis Co-authored-by: Ryan Co-authored-by: jack <0x6a73@protonmail.com> commit 8dc66867e25493c8bffc1bea2c4de1334f4ca475 Author: adiabatic Date: Wed Feb 1 10:55:12 2023 -0800 zweihander-macos: Update keys, add capslock (#19730) * Update to current Scroll Lock/Power names * Replace `'` with `⇪` commit ca8b4b8e305444039a10755e280be7f0e19aaf85 Author: a_marmot <90110685+a-marmot@users.noreply.github.com> Date: Wed Feb 1 09:26:37 2023 -0800 [Keyboard] Add modded Razer Orbweaver with RP2040 (#19711) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Sergey Vlasov commit 252b041b97c03374e8f10570a54992f7f91f5f26 Author: Patryk <61631089+patrykf03@users.noreply.github.com> Date: Wed Feb 1 14:13:18 2023 +0000 add Mecx Labs mp1 macropad (#19064) * add mecxlabs mp1 macropad Co-authored-by: Joel Challis commit e296d671463f38a78c75ee0727016939634ef985 Author: Nick Brassel Date: Mon Jan 30 19:47:46 2023 +1100 Accumulate version.h generator flags. (#19716) commit 2c878b1b161ae10332fdc4d69f3d1f86d2726c5c Author: Ryan Date: Mon Jan 30 14:37:02 2023 +1100 Clean up `qmk generate-autocorrect-data` (#19710) commit 328279ac592bcb61fcc12097287a75bfaa5e7a3d Author: Wolf Van Herreweghe Date: Sun Jan 29 23:58:07 2023 +0100 Add base firmware for the Frog Numpad (#19698) Co-authored-by: Wolf Van Herreweghe Co-authored-by: Drashna Jaelre Co-authored-by: jack <0x6a73@protonmail.com> commit d322b4c041d4b600fee00ba7f94966ac9a9e2dfa Author: yiancar Date: Sun Jan 29 16:59:13 2023 +0000 [Keyboard] Baion 808 (#19690) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis Co-authored-by: yiancar commit 981f3c316cb1619aef554fbb2913c8d1b03b0d08 Author: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Sun Jan 29 00:41:50 2023 +0800 Additional handedness by EEPROM examples (#19686) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> commit ce7bb639998f97536c562c2cde5afbd3e3a0950e Author: azhizhinov Date: Sat Jan 28 01:52:05 2023 +0300 VIA keymap for Reviung 34. (#19694) VIA keymap for Reviung 34. commit acea06b4f5d7dbbe3a65ea512a367b8fb202b5e2 Author: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Fri Jan 27 13:39:38 2023 -0800 [Keyboard] Update effects for Keychron Q2 (#19685) commit 9aaf1c26f028d22bae8fdf9d63e21d1b9951a3bd Author: Patrick Muldoon Date: Fri Jan 27 08:35:26 2023 -0800 Swap LED_PIN_ON_STATE to 0. (#19692) User reported that CAPS lock Led state was inverted after soldering a LED to their board. LED_PIN_ON_STATE defaults to 1, so just swap to low. Flashed board and now CAPS LED reflects the actual state commit b3dca4bb36d0c08e8145f6f25649aaf61b513fdd Author: Jay Greco Date: Fri Jan 27 00:03:57 2023 -0800 Add RP2040 SCRAMBLE v2 (#19489) commit 6e42b5854902963469a4016abeca48a9df5c1c46 Author: AnotherStranger Date: Thu Jan 26 22:14:34 2023 +0100 VIA keymap for the dactyl manuform 4x6 (#19668) Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Drashna Jaelre commit 19ecd697570784bff8803edc2f18a8ee75d3d4ce Author: Charly Delay <0xcharly@users.noreply.github.com> Date: Fri Jan 27 03:43:08 2023 +0900 Rename `LAYOUT` macros identifier that contained the keyboard name (#19657) commit 3823046712c3c28c14a219b78d7d3bc30f76493f Author: schwarzer-geiger Date: Thu Jan 26 11:34:27 2023 -0500 new keyboard: edinburgh41 (#19569) * added edinburgh41 Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: Drashna Jaelre commit fa132baa43a69ce7245e977916280eac5f8a0485 Author: Darkhan Date: Wed Jan 25 00:19:32 2023 +0000 Decrease LED animation frequency to improve performance (#19677) commit 8af872056afd3b448c5203f4cd773d8c5cee15eb Author: Christian Brauner Date: Tue Jan 24 21:03:05 2023 +0100 [Keymap] Update brauner preonic layout (#19665) commit 419a7944a461c78e985cf975a5a4e6bacbbeebd2 Author: arrowj <172841+arrowj@users.noreply.github.com> Date: Tue Jan 24 09:17:24 2023 -0600 Update understanding_qmk.md (#19664) Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46. commit b24fa2f9db91bb5425f2346adda53cfbdc741710 Author: Natan-P Date: Tue Jan 24 15:19:34 2023 +0100 escaped stray backslash in bux.py (#19667) commit 1c6968260568e5efba9e4d01cd656e3a15b870b8 Author: MJM <89230047+MATTMCCA@users.noreply.github.com> Date: Tue Jan 24 04:19:42 2023 -0500 [Keyboard] Add the Black Hellebore (#19655) commit 695c4c603005469704cd678a1d3ffb093d7e1231 Author: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Tue Jan 24 00:51:45 2023 -0800 [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (#19674) commit 4d180c935adc2a5335e03b1f9936a32f6c1d2d06 Author: jack <0x6A73@pm.me> Date: Tue Jan 24 01:04:56 2023 -0700 fixup splitkb/kyria VIA keymap (#19676) commit 4c6415d7682700327af262bfab04dbe61049bd6f Author: cole smith <38364556+daysgobye@users.noreply.github.com> Date: Mon Jan 23 21:42:38 2023 -0800 [Keyboard] Fix boardsource/lulu/avr encoder pins (#19672) commit 4e658d47f8dfbb303e574bbd07c0d6568152175d Author: youturn45 Date: Mon Jan 23 05:23:00 2023 -0500 [Keymap] Add youturn/yt keymap for think65 (#19300) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre Co-authored-by: Jue Liu commit 9c7490d7cb1bdb2232687153e542d813bfa53db3 Author: Joe Scotto Date: Mon Jan 23 04:38:22 2023 -0500 [Keyboard] Add Scotto40 Keyboard (#18453) Co-authored-by: Drashna Jaelre Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> commit 300a0def4e20507f20b61507ed3dc3c65f3bf6a0 Author: era <73109780+eerraa@users.noreply.github.com> Date: Sat Jan 21 04:43:11 2023 +0900 Change era65 keymap&debounce_type (#19627) commit 64c399ba3832cb4240cd25e25d382856492346d0 Author: leah-splitkb <103112489+leah-splitkb@users.noreply.github.com> Date: Fri Jan 20 12:22:53 2023 +0100 [Keyboard] Add Kyria rev3 (#19423) commit 53cc6170ae2687b0c894f05738181a2f16ad0d6c Author: Joel Challis Date: Fri Jan 20 05:44:05 2023 +0000 Refactor some layouts which contain keyboard name (#19645) * Refactor some layouts which contain keyboard name * use planck_mit commit 18d107b29bc2b84b13a19f3fc4ef08724247b1bb Author: dztech Date: Fri Jan 20 12:29:48 2023 +0800 Og60 fix indicator (#19631) commit 255e138ee18e65e63000b64f019096ed4dbe3b5f Author: Leo Deng Date: Fri Jan 20 12:24:06 2023 +0800 djam add rgb matrix (#19621) commit f2ad3ba7c3ccff20560010ebe57c76d381771499 Author: Joel Challis Date: Fri Jan 20 02:36:30 2023 +0000 Refactor some layouts which contain keyboard name (#19643) commit 5e502c3265c7616674af7ab929d4a964670c7b69 Author: Joel Challis Date: Fri Jan 20 02:35:18 2023 +0000 Remove stray UNUSED_PINS (#19639) commit 891780b17f0dcf86624cadc18fb0fbeb2ee418d8 Author: Joel Challis Date: Fri Jan 20 01:59:46 2023 +0000 Refactor some layouts which contain keyboard name (#19642) commit e5b36e2c3f5c269386357c2b4eebdf011bf26dc2 Author: leviport Date: Thu Jan 19 16:09:11 2023 -0700 Docs: typo fixes in platformdev_blackpill_f4x1.md (#19635) commit 22be5190ab57f91249d1a3b8cab50bbe768370f9 Author: Nick Brassel Date: Thu Jan 19 22:30:16 2023 +1100 Minor cleanup to breaking/checklist docs. (#19596) Co-authored-by: Ryan commit 327f7ee9a74f1740106d46e65e909208a1372ad3 Author: Nick Brassel Date: Thu Jan 19 12:05:29 2023 +1100 Fixup ChibiOS header inclusion search ordering. (#19623) * Add STM32F446-Nucleo onekey. * Fixup onekey build for F446, all keymaps. * Fixup board inclusion search ordering. commit 17c9388af5432f8e6d97828f6772eaf8031a786b Author: Nick Brassel Date: Thu Jan 19 09:36:32 2023 +1100 Allow for wildcard filtering in `qmk mass-compile` (#19625) commit d73ad5204049648a912fe3b384b36d211570b544 Author: Shandon Anderson Date: Wed Jan 18 03:55:34 2023 -0500 [Keyboard] Add Mino Plus Keyboard (#19535) Co-authored-by: Shandon Anderson commit e6ec2bde07368e7d69b424fde7c6804307ac02f2 Author: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Wed Jan 18 11:54:20 2023 +0300 [Keyboard] Add tata80 (#19445) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan commit f5a31fdda62bef7883020acca2263f03700bf2eb Author: lukeski14 <73951271+lukeski14@users.noreply.github.com> Date: Tue Jan 17 20:38:53 2023 -0500 updating productId for via compat (#19611) commit 204ba02765629eae6e7431932243949a5cbc08ba Author: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Wed Jan 18 09:22:34 2023 +0800 Use consistent highlight format (#19619) commit eb7a8d994af9befe7ff7742d19b03c297f5e6351 Author: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Wed Jan 18 09:22:19 2023 +0800 Reduce RGB maximum brightness (#19618) commit 737e6bf027e43235c8db31a727b4c8bc9f44e6de Author: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Wed Jan 18 08:26:16 2023 +0800 Highlight inclusion of extern macro (#19614) commit d907f104aa4776659ae29b6ec227cf9419103fc6 Author: Anton Date: Tue Jan 17 20:46:33 2023 +0300 [Keymap] Add saph1s keymap for KPrepublic BM80v2 (#19608) Co-authored-by: jack <0x6A73@pm.me> commit 625e57480f47b261a3d116c7b20bb1aae1d8a911 Author: QMK Bot Date: Mon Jan 16 23:39:09 2023 -0800 Format code according to conventions (#19615) commit 9f84b9ac095f31d65ab0cb9310bf5130cc9775aa Author: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Tue Jan 17 09:57:18 2023 +0400 [Keyboard] Add kt3700 (#19432) Co-authored-by: Sergey Vlasov Co-authored-by: Joel Challis Co-authored-by: Ryan commit c6cc104810633c687a5c563befa44e3a7282b9e4 Author: JW2586 <70282382+JW2586@users.noreply.github.com> Date: Tue Jan 17 05:56:37 2023 +0000 [Keyboard] Waterfowl - Updated default keymap (#19438) Co-authored-by: jack <0x6a73@protonmail.com> commit 7b795b2921dc03ec77f91fc7c9c030a59e5525a0 Author: Alabahuy Date: Tue Jan 17 12:48:44 2023 +0700 [Keyboard] add kamigakushi (#19514) commit 49f3ffa2640c6f84dd29a7f90b22ce22d0bcbea6 Author: d-floe <31980883+d-floe@users.noreply.github.com> Date: Mon Jan 16 22:33:49 2023 -0600 [Keyboard] Add Bubble 75 (#18863) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan commit 4098ff5574ab8129b83239ed9de6f1820b31b686 Author: era <73109780+eerraa@users.noreply.github.com> Date: Tue Jan 17 10:55:13 2023 +0900 [Keyboard] Add ERA65 (#19591) Co-authored-by: Ryan commit 465b6a14e3624d0da98c220a7b4e0e2e5ef9c1d9 Author: Tom Barnes Date: Mon Jan 16 22:41:52 2023 +0000 Docs/space b cleanup (#19612) * Clean up remaining mentions of the deprecated Space B reset method * cleanup auto_tag.yml that got sucked in commit 2bff00e1bad09a57b3a5af214f0d1f8243deaea5 Author: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> Date: Mon Jan 16 10:32:43 2023 +0100 Small doc changes (#19601) commit 917d93e968f8a6d99ba7f24bbc6a1f97237dfe56 Author: Sergey Vlasov Date: Mon Jan 16 11:52:18 2023 +0300 [Docs] Fix `JOYSTICK_AXIS_COUNT` name in docs (#19605) commit 4f83b673bdfd9d8a282255f8939d3a93657fe282 Author: adiabatic Date: Mon Jan 16 00:48:41 2023 -0800 [Keymap] Improve Zweihander layout for the Ergodox EZ (#18737) commit fe27e46e6da0ffb58b58578ba96646fdeb0742a7 Author: Ryan Baker <76887060+ryanbaekr@users.noreply.github.com> Date: Sun Jan 15 19:55:30 2023 -0500 [Keyboard] Add rb87 (#19546) commit 44bcde102d7db3ff80ab01e5377cb3ff8f574afa Author: Christian Brauner Date: Sun Jan 15 09:03:27 2023 +0100 [Keymap] Update brauner preonic layout (#19595) commit 2c98e795f7a857596ef550708bf0baf8b9d92154 Author: jack <0x6A73@pm.me> Date: Sun Jan 15 01:03:16 2023 -0700 [Keyboard] Fixup gingko65 matrix pins (#19589) commit e7d1b210ba89ad174f1011488f9f6a0cbab28f89 Author: jurassic73 <50930136+jurassic73@users.noreply.github.com> Date: Sat Jan 14 19:58:09 2023 -0800 [Keyboard] Update handwired/split89 to new standard. (#19540) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> commit 4a53d9c4318ebc97655699d98e5bc0967d003f28 Author: Bastien BALOUP <35816948+Bastien-Baloup@users.noreply.github.com> Date: Sun Jan 15 04:46:13 2023 +0100 [Keymap] Add Bastian-Baloup sofle keymap (#18836) Co-authored-by: Ryan commit 3f2cbc9e68fa026ac14471e4ef15c9c349d78f38 Author: Renegade-Master Date: Sat Jan 14 02:25:07 2023 +0000 Pr/reorder docker podman check (#19561) commit 9c02b2990acfcbd628c38edb3d70dec691390d9c Author: gitdrik <58667795+gitdrik@users.noreply.github.com> Date: Fri Jan 13 23:19:57 2023 +0100 Updates to gitdrik Planck keymap (#19585) commit d196ab56d3ceb74d8bee9d373fd4eaaf3cc855a3 Author: Duccio Date: Fri Jan 13 12:08:12 2023 +0100 [bluebell/Swoop] Enable RGB underlight by default (#19501) commit 0de7ccedac4fba00f0e39cfa37f59ef0cd6059c3 Author: Jens Peter Secher Date: Fri Jan 13 12:04:16 2023 +0100 [Keyboard] Acacia keyboard (#19532) commit e1feab3167e859fd2b269176808f1e4789bb1f5d Author: Rucker Machine <98196480+RuckerMachine@users.noreply.github.com> Date: Fri Jan 13 03:03:37 2023 -0800 [Keyboard] Add additional layout to RM_Numpad (#19534) Co-authored-by: jason commit b756c53c7b7fb314136571bc1dabe4947554e702 Author: jack <0x6A73@pm.me> Date: Fri Jan 13 03:58:38 2023 -0700 [Docs] Touch up documentation templates & porting keyboard docs (#19573) commit c965243bb70c2f3eb53bbd808bf99ea7c0ebce2d Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri Jan 13 02:57:35 2023 -0800 Synth Labs 060 Layout Additions and Fixes (#19575) commit aba04411179cdec97982d85652f8ef6cc2ab7cf9 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri Jan 13 02:55:37 2023 -0800 Teleport Native Layout Implementation Rework (#19576) commit 9a4c7a48ba32ea1421a4f74d5c1f55576357f6ee Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu Jan 12 22:48:50 2023 -0800 Quarkeys Z60 Layout Addtions (#19568) * quarkeys/z60/hotswap: rename LAYOUT to LAYOUT_60_ansi_tsangan_split_rshift * quarkeys/z60/solder: add matrix diagram * quarkeys/z60/solder: rename LAYOUT to LAYOUT_all * quarkeys/z60/solder: add LAYOUT_60_ansi * quarkeys/z60/solder: add LAYOUT_60_ansi_split_bs_rshift * quarkeys/z60/solder: add LAYOUT_60_iso * quarkeys/z60/solder: add LAYOUT_60_iso_split_bs_rshift * quarkeys/z60/solder: add LAYOUT_60_ansi_tsangan * quarkeys/z60/solder: add LAYOUT_60_tsangan_hhkb * quarkeys/z60/solder: add LAYOUT_60_iso_tsangan * quarkeys/z60/solder: enable Community Layout support commit c1aef03e98a9998e176da5be56f198d440ca5051 Author: Jonathan Moallem Date: Fri Jan 13 16:38:50 2023 +1000 Rectified ins/del layout macro ordering of Keychron Q1 ANSI (#19560) commit 0cff6367397f4da681458894a997961e528e5239 Author: Tom Barnes Date: Thu Jan 12 11:29:25 2023 +0000 weact docs patch re "security vulnerability" (#19572) commit 2b5e5d90470ae261619cf22448dbcbbdde870fce Author: Christian Brauner Date: Thu Jan 12 10:56:12 2023 +0100 [Keymap] Add brauner preonic layout (#19444) commit 62eba54092f5d56f0b7cba011fc5567a2917a52e Author: Ramon Imbao Date: Thu Jan 12 15:45:08 2023 +0800 [Keyboard] Add Plywrks Ji-Eun (#18276) commit 74d8f16c1d4754e79e9b022305e0f2468bb89243 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed Jan 11 14:33:30 2023 -0800 Keychron V3: correct layout data (#19567) * keychron/v3/ansi_encoder: correct layout data * keychron/v3/iso_encoder: correct layout data commit 377f87cb7e12f100101debffee8c788dbac13b38 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed Jan 11 12:50:11 2023 -0800 Keychron V1: correct layout data for ANSI versions (#19558) * keychron/v1/ansi: correct layout data * keychron/v1/ansi_encoder: correct layout data --- .../4pplet/steezy60/keymaps/canon/keymap.c | 39 +++++ .../4pplet/steezy60/keymaps/default/keymap.c | 22 +-- .../4pplet/steezy60/keymaps/via/keymap.c | 30 ++-- keyboards/4pplet/steezy60/rev_a/info.json | 88 ++---------- keyboards/4pplet/steezy60/rev_a/rev_a.h | 116 ++++++++++++++- keyboards/4pplet/steezy60/rev_b/info.json | 82 +---------- keyboards/4pplet/steezy60/rev_b/rev_b.h | 133 +++++++++++++++++- keyboards/kamigakushi/info.json | 4 +- keyboards/keychron/v10/ansi_encoder/info.json | 2 +- 9 files changed, 329 insertions(+), 187 deletions(-) create mode 100644 keyboards/4pplet/steezy60/keymaps/canon/keymap.c diff --git a/keyboards/4pplet/steezy60/keymaps/canon/keymap.c b/keyboards/4pplet/steezy60/keymaps/canon/keymap.c new file mode 100644 index 000000000000..92cfe047e9aa --- /dev/null +++ b/keyboards/4pplet/steezy60/keymaps/canon/keymap.c @@ -0,0 +1,39 @@ +/* +Copyright 2023 Stefan Sundin "4pplet" + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* +* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ +* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ +* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ +* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ +* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ | Ent│ +* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───| er │ +* │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift│ │ +* ├────┬───|───┴┬──┴┬──┴───┴───┴───┴───┴┬──┴┬──┴┬──┴─┬───|────┤ +* │Ctrl│GUI│None│Alt│ Space │Alt│GUI│None│App│Ctrl│ +* └────┴───┴────┴───┴───────────────────┴───┴───┴────┴───┴────┘ +*/ +[0] = LAYOUT_canon( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_NO, KC_APP, KC_RCTL) +}; diff --git a/keyboards/4pplet/steezy60/keymaps/default/keymap.c b/keyboards/4pplet/steezy60/keymaps/default/keymap.c index fa1fcafdd19c..b4a30ba749a2 100644 --- a/keyboards/4pplet/steezy60/keymaps/default/keymap.c +++ b/keyboards/4pplet/steezy60/keymaps/default/keymap.c @@ -18,17 +18,17 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( - 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_NO, KC_BSPC, +[0] = LAYOUT_all( + 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_BSLS, KC_BSPC, 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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, - KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), + 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_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), -[1] = LAYOUT( - QK_BOOT, 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, - _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, - KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, - _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ) +[1] = LAYOUT_all( + QK_BOOT, 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, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/4pplet/steezy60/keymaps/via/keymap.c b/keyboards/4pplet/steezy60/keymaps/via/keymap.c index 3245d647f115..d6a1151fcfda 100644 --- a/keyboards/4pplet/steezy60/keymaps/via/keymap.c +++ b/keyboards/4pplet/steezy60/keymaps/via/keymap.c @@ -18,28 +18,28 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( - 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_NO, KC_BSPC, +[0] = LAYOUT_all( + 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_BSLS, KC_BSPC, 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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, - KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), - -[1] = LAYOUT( - QK_BOOT, 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, - _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, - KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, - _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ), - -[2] = LAYOUT( + 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_NUBS, KC_ENT, + KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), + +[1] = LAYOUT_all( + QK_BOOT, 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, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + +[2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -[3] = LAYOUT( +[3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index 6e538678d991..356eb50f39bd 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -1,91 +1,21 @@ { "keyboard_name": "Steezy60 Rev A", "manufacturer": "4pplet", - "url": "", + "url": "https://github.com/4pplet/steezy60", "maintainer": "4pplet", "usb": { "vid": "0x4444", "pid": "0x0002", - "device_version": "0.0.1" + "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2, "w":1.25}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4, "w":2.25}, - {"x":6.25, "y":4, "w":1.5}, - {"x":7.75, "y":4, "w":2.25}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} - ] + "LAYOUT_all": { + "layout": [{"label":"Esc", "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "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":"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":"NUHS", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3}, {"label":"NUBS", "x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"Up", "x":13, "y":3}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Win", "x":1, "y":4}, {"x":2, "y":4}, {"label":"Alt", "x":3, "y":4}, {"x":4, "y":4, "w":2.5}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Fn", "x":14, "y":4}] + }, + "LAYOUT_canon": { + "layout": [{"label":"Esc", "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "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":"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":"nuhs", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":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.5}, {"label":"Fn", "x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Win", "x":2, "y":4}, {"label":"Alt", "x":3, "y":4}, {"x":4, "y":4, "w":6}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"label":"Menu", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"label":"Fn", "x":14, "y":4}] } } } diff --git a/keyboards/4pplet/steezy60/rev_a/rev_a.h b/keyboards/4pplet/steezy60/rev_a/rev_a.h index 8c9a9f58475e..ee6002f05401 100644 --- a/keyboards/4pplet/steezy60/rev_a/rev_a.h +++ b/keyboards/4pplet/steezy60/rev_a/rev_a.h @@ -18,7 +18,9 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT( \ +#define XXX KC_NO + +#define LAYOUT_all( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ @@ -32,3 +34,115 @@ along with this program. If not, see . {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d} \ } +#define LAYOUT_60_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_ansi_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k4c, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, k4c, k4d} \ +} +#define LAYOUT_60_ansi_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d,k4c, \ + k40, k43, k45, k48, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, XXX, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, XXX, k4b, k4c, k4d} \ +} +#define LAYOUT_60_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_iso_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k4c, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, k4c, k4d} \ +} +#define LAYOUT_60_iso_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_tsangan_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k4c, \ + k40, k41, k43, k45, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d} \ +} diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json index 190e5eb384fb..2f7a4422a157 100644 --- a/keyboards/4pplet/steezy60/rev_b/info.json +++ b/keyboards/4pplet/steezy60/rev_b/info.json @@ -11,83 +11,11 @@ "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2, "w":1.25}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4, "w":2.25}, - {"x":6.25, "y":4, "w":1.5}, - {"x":7.75, "y":4, "w":2.25}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} - ] + "LAYOUT_all": { + "layout": [{"label":"Esc", "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "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":"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":"NUHS", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3}, {"label":"NUBS", "x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"Up", "x":13, "y":3}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Win", "x":1, "y":4}, {"x":2, "y":4}, {"label":"Alt", "x":3, "y":4}, {"x":4, "y":4, "w":2.5}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Fn", "x":14, "y":4}] + }, + "LAYOUT_canon": { + "layout": [{"label":"Esc", "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "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":"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":"nuhs", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":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.5}, {"label":"Fn", "x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Win", "x":2, "y":4}, {"label":"Alt", "x":3, "y":4}, {"x":4, "y":4, "w":6}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"label":"Menu", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"label":"Fn", "x":14, "y":4}] } } } diff --git a/keyboards/4pplet/steezy60/rev_b/rev_b.h b/keyboards/4pplet/steezy60/rev_b/rev_b.h index 8c9a9f58475e..8a436dd9f9ff 100644 --- a/keyboards/4pplet/steezy60/rev_b/rev_b.h +++ b/keyboards/4pplet/steezy60/rev_b/rev_b.h @@ -18,7 +18,9 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT( \ +#define XXX KC_NO + +#define LAYOUT_all( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ @@ -32,3 +34,132 @@ along with this program. If not, see . {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d} \ } + +// canon enter är samma som FN knappen +#define LAYOUT_canon( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k4c, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k43, k45, k47, k48, k49, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, k42, k43, XXX, k45, XXX, k47, k48, k49, k4a, k4b, k4c, k4d} \ +} + +#define LAYOUT_60_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_ansi_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k4c, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, k4c, k4d} \ +} +#define LAYOUT_60_ansi_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d,k4c, \ + k40, k43, k45, k48, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, XXX, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, XXX, k4b, k4c, k4d} \ +} +#define LAYOUT_60_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_iso_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k4c, \ + k40, k41, k43, k45, k47, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, k47, k48, XXX, k4a, k4b, k4c, k4d} \ +} +#define LAYOUT_60_iso_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k43, k45, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, k4a, k4b, XXX, k4d} \ +} +#define LAYOUT_60_tsangan_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k4c, \ + k40, k41, k43, k45, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d}, \ + {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d}, \ + {k40, k41, XXX, k43, XXX, k45, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d} \ +} diff --git a/keyboards/kamigakushi/info.json b/keyboards/kamigakushi/info.json index 9358b0a79aec..fc8de7bdca10 100644 --- a/keyboards/kamigakushi/info.json +++ b/keyboards/kamigakushi/info.json @@ -112,8 +112,8 @@ { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, { "matrix": [4, 1], "x": 1.5, "y": 4 }, { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, - { "matrix": [4, 7], "w": 7, "x": 4, "y": 4 }, - { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, + { "matrix": [4, 3], "w": 7, "x": 4, "y": 4 }, + { "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 }, { "matrix": [4, 12], "x": 13, "y": 4 }, { "matrix": [4, 13], "x": 14, "y": 4 }, { "matrix": [4, 14], "x": 15, "y": 4 } diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json index 9507fe6d322f..5f08fa007280 100644 --- a/keyboards/keychron/v10/ansi_encoder/info.json +++ b/keyboards/keychron/v10/ansi_encoder/info.json @@ -5,7 +5,7 @@ "maintainer": "lalalademaxiya1", "usb": { "vid": "0x3434", - "pid": "0x03A1", + "pid": "0x01A1", "device_version": "1.0.0" }, "processor": "STM32L432",