diff options
747 files changed, 6980 insertions, 9459 deletions
diff --git a/.gitignore b/.gitignore index e36b9ae130..a2456aef1b 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ quantum/version.h .idea/ .project .settings/ -.vagrant/ # ? .dep diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 717f4ec98b..0000000000 --- a/Vagrantfile +++ /dev/null @@ -1,95 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure(2) do |config| - # define a name instead of just 'default' - config.vm.define "qmk_firmware" - - # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit - config.vm.box = "generic/debian10" - - config.vm.synced_folder '.', '/vagrant' - - # This section allows you to customize the Virtualbox VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "virtualbox" do |vb| - # Hide the VirtualBox GUI when booting the machine - vb.gui = false - # Uncomment the below lines if you want to program - # your Teensy via the VM rather than your host OS - #vb.customize ['modifyvm', :id, '--usb', 'on'] - #vb.customize ['usbfilter', 'add', '0', - # '--target', :id, - # '--name', 'teensy', - # '--vendorid', '0x16c0', - # '--productid','0x0478' - # ] - # Customize the amount of memory on the VM: - vb.memory = "512" - # Uncomment the below lines if you have time sync - # issues with make and incremental builds - #vb.customize [ "guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 1000 ] - end - - # This section allows you to customize the VMware VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "vmware_workstation" do |vmw| - # Hide the VMware GUI when booting the machine - vmw.gui = false - - # Customize the amount of memory on the VM: - vmw.memory = "512" - end - - config.vm.provider "vmware_fusion" do |vmf| - # Hide the vmfare GUI when booting the machine - vmf.gui = false - - # Customize the amount of memory on the VM: - vmf.memory = "512" - end - - # Docker provider pulls from hub.docker.com respecting docker.image if - # config.vm.box is nil. In this case, we adhoc build util/vagrant/Dockerfile. - # Note that this bind-mounts from the current dir to - # /vagrant in the guest, so unless your UID is 1000 to match vagrant in the - # image, you'll need to: chmod -R a+rw . - config.vm.provider "docker" do |docker, override| - override.vm.box = nil - docker.build_dir = "util/vagrant" - docker.has_ssh = true - end - - # Unless we are running the docker container directly - # 1. run container detached on vm - # 2. attach on 'vagrant ssh' - ["virtualbox", "vmware_workstation", "vmware_fusion"].each do |type| - config.vm.provider type do |virt, override| - override.vm.provision "docker" do |d| - d.run "qmkfm/qmk_cli", - cmd: "tail -f /dev/null", - args: "--privileged -v /dev:/dev -v '/vagrant:/vagrant'" - end - - override.vm.provision "shell", inline: <<-SHELL - echo 'docker restart qmkfm-qmk_cli && exec docker exec -it qmkfm-qmk_cli /bin/bash -l' >> ~vagrant/.bashrc - SHELL - end - end - - config.vm.post_up_message = <<-EOT - - Log into the environment using 'vagrant ssh'. QMK directory synchronized with - host is located at /vagrant - To compile the .hex files use make command inside this directory, e.g. - cd /vagrant - make <keyboard>:default - - Examples: - make planck/rev4:default:dfu - make planck/rev4:default - - EOT -end diff --git a/builddefs/converters.mk b/builddefs/converters.mk index 17b1c3b6ee..a3548afd60 100644 --- a/builddefs/converters.mk +++ b/builddefs/converters.mk @@ -7,7 +7,12 @@ endif # TODO: opt in rather than assume everything uses a pro micro PIN_COMPATIBLE ?= promicro + +# Remove whitespace from any rule.mk provided vars +# - env cannot be overwritten but cannot have whitespace anyway +CONVERT_TO:=$(strip $(CONVERT_TO)) ifneq ($(CONVERT_TO),) + # stash so we can overwrite env provided vars if needed ACTIVE_CONVERTER=$(CONVERT_TO) @@ -23,13 +28,13 @@ ifneq ($(CONVERT_TO),) TARGET := $(TARGET)_$(CONVERT_TO) # Configure any defaults - OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')) - OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\" + OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]') + OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\" OPT_DEFS += -DCONVERTER_ENABLED VPATH += $(CONVERTER) # Configure for "alias" - worst case it produces an idential define - OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')) + OPT_DEFS += -DCONVERT_TO_$(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]') # Finally run any converter specific logic include $(CONVERTER)/converter.mk diff --git a/docs/_summary.md b/docs/_summary.md index 01808bd675..ce579cb071 100644 --- a/docs/_summary.md +++ b/docs/_summary.md @@ -41,7 +41,6 @@ * [Keymap Overview](keymap.md) * Development Environments * [Docker Guide](getting_started_docker.md) - * [Vagrant Guide](getting_started_vagrant.md) * Flashing * [Flashing](flashing.md) * [Flashing ATmega32A (ps2avrgb)](flashing_bootloadhid.md) diff --git a/docs/getting_started_vagrant.md b/docs/getting_started_vagrant.md deleted file mode 100644 index b5b5ce1539..0000000000 --- a/docs/getting_started_vagrant.md +++ /dev/null @@ -1,56 +0,0 @@ -# Vagrant Quick Start - -This project includes a `Vagrantfile` that will allow you to build a new firmware for your keyboard very easily without major changes to your primary operating system. This also ensures that when you clone the project and perform a build, you have the exact same environment as anyone else using the Vagrantfile to build. This makes it much easier for people to help you troubleshoot any issues you encounter. - -## Requirements - -Using the `Vagrantfile` in this repository requires you have [Vagrant](https://www.vagrantup.com/) as well as a supported provider installed: - -* [VirtualBox](https://www.virtualbox.org/) (Version at least 5.0.12) - * Sold as 'the most accessible platform to use Vagrant' -* [VMware Workstation](https://www.vmware.com/products/workstation) and [Vagrant VMware plugin](https://www.vagrantup.com/vmware) - * The (paid) VMware plugin requires a licensed copy of VMware Workstation/Fusion -* [Docker](https://www.docker.com/) - -Other than having Vagrant, a suitable provider installed and possibly a restart of your computer afterwards, you can simple run a 'vagrant up' anywhere inside the folder where you checked out this project and it will start an environment (either a virtual machine or container) that contains all the tools required to build this project. There is a post Vagrant startup hint that will get you off on the right foot, otherwise you can also reference the build documentation below. - -## Flashing the Firmware - -The "easy" way to flash the firmware is using a tool from your host OS: - -* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (recommended) -* [Teensy Loader](https://www.pjrc.com/teensy/loader.html) - -If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version. - -## Vagrantfile Overview -The development environment is configured to run the QMK Docker image, `qmkfm/qmk_cli`. This not only ensures predictability between systems, it also mirrors the CI environment. - -## FAQ - -### Why am I seeing issues under Virtualbox? -Certain versions of Virtualbox 5 appear to have an incompatibility with the Virtualbox extensions installed in the boxes in this Vagrantfile. If you encounter any issues with the /vagrant mount not succeeding, please upgrade your version of Virtualbox to at least 5.0.12. **Alternately, you can try running the following command:** - -``` -vagrant plugin install vagrant-vbguest -``` - -### How do I remove an existing environment? -Finished with your environment? From anywhere inside the folder where you checked out this project, Execute: - -``` -vagrant destroy -``` - -### What if I want to use Docker directly? -Want to benefit from the Vagrant workflow without a virtual machine? The Vagrantfile is configured to bypass running a virtual machine, and run the container directly. Execute the following when bringing up the environment to force the use of Docker: -``` -vagrant up --provider=docker -``` - -### How do I access the virtual machine instead of the Docker container? -Execute the following to bypass the `vagrant` user booting directly to the official qmk builder image: - -``` -vagrant ssh -c 'sudo -i' -``` diff --git a/docs/ja/_summary.md b/docs/ja/_summary.md index 8516a5eaaa..e49853bfd4 100644 --- a/docs/ja/_summary.md +++ b/docs/ja/_summary.md @@ -38,7 +38,6 @@ * [キーマップの概要](ja/keymap.md) * 開発環境 * [Docker のガイド](ja/getting_started_docker.md) - * [Vagrant のガイド](ja/getting_started_vagrant.md) * 書き込み * [書き込み](ja/flashing.md) * [ATmega32A の書き込み (ps2avrgb)](ja/flashing_bootloadhid.md) diff --git a/docs/ja/getting_started_vagrant.md b/docs/ja/getting_started_vagrant.md deleted file mode 100644 index 0888b7f311..0000000000 --- a/docs/ja/getting_started_vagrant.md +++ /dev/null @@ -1,61 +0,0 @@ -# Vagrant クイックスタート - -<!--- - original document: 0.12.43:docs/getting_started_vagrant.md - git diff 0.12.43 HEAD -- docs/getting_started_vagrant.md | cat ---> - -このプロジェクトは、プライマリオペレーティングシステムに大きな変更を加えることなくキーボードの新しいファームウェアを非常に簡単に構築することができる `Vagrantfile` を含みます。これは、あなたがプロジェクトをクローンしビルドを実行した時に、ビルドのために Vagrantfile を使っている他のユーザと全く同じ環境を持つことも保証します。これにより、人々はあなたが遭遇した問題の解決をより簡単に行えるようになります。 - -## 必要事項 - -このリポジトリ内の `Vagrantfile` を使うには、[Vagrant](https://www.vagrantup.com/) およびサポートされるプロバイダがインストールされている必要があります: - -* [VirtualBox](https://www.virtualbox.org/) (バージョン 5.0.12 以降) - * 「Vagrant を使うために最もアクセスしやすいプラットフォーム」とうたわれています。 -* [VMware Workstation](https://www.vmware.com/products/workstation) および [Vagrant VMware プラグイン](https://www.vagrantup.com/vmware) - * (有料) VMware プラグインには、ライセンスされた VMware Workstation/Fusion のコピーが必要です。 -* [Docker](https://www.docker.com/) - -Vagrant 以外に、適切なプロバイダがインストールされ、その後におそらくコンピュータを再起動すると、このプロジェクトをチェックアウトしたフォルダ内の任意の場所で 'vagrant up' を単純に実行することができ、このプロジェクトをビルドするのに必要な全てのツールが含まれる環境(仮想マシンあるいはコンテナ)が開始されます。Vagrant 起動時にうまく始めるためのヒントが表示されますが、それ以外に、以下のビルドドキュメントを参照することもできます。 - -## ファームウェアの書き込み - -ファームウェアを書き込む「簡単な」方法は、ホスト OS からツールを使うことです: - -* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (推奨) -* [Teensy ローダー](https://www.pjrc.com/teensy/loader.html) - -コマンドラインでプログラムしたい場合は、Vagranfile の ['modifyvm'] 行のコメントを解除して Linux への USB パススルーを有効にし、dfu-util/dfu-programmer のようなコマンドラインツールを使ってプログラムすることができます。あるいは Teensy CLI バージョンをインストールすることができます。 - -## Vagrantfile の概要 -開発環境は QMK Docker イメージ、`qmkfm/qmk_cli` を実行するように設定されています。これはシステム間の予測可能性が保証されるだけでなく、CI 環境もミラーされます。 - -## FAQ - -### Virtualbox で問題が発生するのはなぜですか？ -Virtualbox 5 の特定のバージョンはこの Vagrantfile のボックスにインストールされている Virtualbox の拡張機能と互換性が無いようです。/vagrant のマウントで問題が発生した場合は、Virtualbox のバージョンを少なくとも 5.0.12 にアップグレードしてください。**または、以下のコマンドを実行してみることができます:** - -```console -vagrant plugin install vagrant-vbguest -``` - -### 既存の環境を削除するにはどうすればいいですか？ -あなたの環境での作業が完了しましたか？このプロジェクトをチェックアウトしたフォルダの中のどこからでも、以下を実行してください: - -```console -vagrant destroy -``` - -### Docker を直接使いたい場合はどうしますか？ -仮想マシン無しで Vagrant のワークフローを活用したいですか？Vagrantfile は仮想マシンの実行をバイパスし、コンテナを直接実行するように設定されています。Docker を強制的に使うように環境を立ち上げる場合は、以下を実行してください: -```console -vagrant up --provider=docker -``` - -### Docker コンテナではなく仮想マシンにアクセスするにはどうすればいいですか？ -以下を実行して、公式の QMK ビルダーイメージから直接起動する `vagrant` ユーザをバイパスするようにします: - -```console -vagrant ssh -c 'sudo -i' -``` diff --git a/docs/zh-cn/_summary.md b/docs/zh-cn/_summary.md index 3baee6dc2e..b8c26ac275 100644 --- a/docs/zh-cn/_summary.md +++ b/docs/zh-cn/_summary.md @@ -42,7 +42,6 @@ * [键映射总览](zh-cn/keymap.md) * 开发环境 * [Docker指南](zh-cn/getting_started_docker.md) - * [Vagrant指南](zh-cn/getting_started_vagrant.md) * 刷写(Flashing) * [刷写](zh-cn/flashing.md) * [刷写ATmega32A (ps2avrgb)](zh-cn/flashing_bootloadhid.md) @@ -188,5 +187,5 @@ * [Midi辅助功能](zh-cn/internals/midi_util.md) * [发送函数](zh-cn/internals/send_functions.md) * [Sysex工具](zh-cn/internals/sysex_tools.md) - + <!--fromen:20211014-12:00(GMT+8) commit 04cf161aa01fd433b5dae69d9fd31569ed5dca59--> diff --git a/docs/zh-cn/getting_started_vagrant.md b/docs/zh-cn/getting_started_vagrant.md deleted file mode 100644 index 5e5de44552..0000000000 --- a/docs/zh-cn/getting_started_vagrant.md +++ /dev/null @@ -1,61 +0,0 @@ -# Vagrant快速上手指引 - -<!--- - original document: 0.15.12:docs/getting_started_vagrant.md - git diff 0.15.12 HEAD -- docs/getting_started_vagrant.md | cat ---> - -本工程包含一份 `Vagrantfile`，可以方便地在不更改你系统环境情况下完成新固件文件的构建工作。这同时也保证了在你拉取该工程代码后的编译环境与也使用Vagrantfile的其它人的一致。当你需要其他人协助你排查遇到的问题时会方便很多。 - -## 需求 - -本工程中的 `Vagrantfile` 需要安装[Vagrant](https://www.vagrantup.com/)以及可用的虚拟机服务： - -* [VirtualBox](https://www.virtualbox.org/) (5.0.12及以后版本) - * 卖点是'最适用于Vagrant的平台' -* [VMware Workstation](https://www.vmware.com/products/workstation) 及 [Vagrant VMware插件](https://www.vagrantup.com/vmware) - * （付费购买的）VMware插件需要在经过正版授权的VMware Workstation/Fusion上运行 -* [Docker](https://www.docker.com/) - -安装了Vagrant之后，在安装合适的虚拟机服务后可能需要重启机器。拉取本工程后在工程目录下执行 'vagrant up' 将启动一个包含了所有本工程所需工具的构建环境（虚拟机或是容器）。最后会有一个vagrant启动提示告知你一切正常就绪，否则你也可以参考一下下面的构建文档。 - -## 刷写固件 - -比较“简单”的方案是在你的宿主系统上借助以下工具刷写固件： - -* [QMK工具箱](https://github.com/qmk/qmk_toolbox) (推荐) -* [Teensy Loader](https://www.pjrc.com/teensy/loader.html) - -如果你希望通过命令行进行编程工作，可以在Vagrantfile中取消掉['modifyvm']的注释以允许USB直通到Linux环境，既可以使用dfu-util/dfu-programmer之类的命令行工具进行编程工作，或是安装Teensy的命令行版本。 - -## Vagrantfile概览 -开发环境被配置为运行QMK Docker镜像 `qmkfm/qmk_cli`，不仅让各系统下的功能预期一致，也是我们CI环境的镜像。 - -## FAQ - -### 为什么我的VirtualBox环境会有问题？ -VirtualBox 5的某些版本与工程中Vagrantfile中指定的VirtualBox扩展存在兼容问题。如果你遇到了/vagrant挂载不成功的问题，请升级VirtualBox至5.0.12或更高版本。**或者，可以尝试执行如下命令：** - -```console -vagrant plugin install vagrant-vbguest -``` - -### 如何移除一个现有环境？ -不再需要这个环境了是吗？在本工程目录下的任何位置，执行： - -```console -vagrant destroy -``` - -### 如果我是想直接用Docker呢？ -想在不使用虚拟机技术的情况下也能使用Vagrant工作流？Vagrangfile已配置为允许绕过运行虚拟机，直接运行容器。通过如下方式执行命令可以强制使用Docker来启动环境： -```console -vagrant up --provider=docker -``` - -### 如何访问虚拟机环境而非Docker容器？ -通过如下方法跳过 `vagrant` 的用户初始化过程以在QMK构建镜像中直接执行： - -```console -vagrant ssh -c 'sudo -i' -``` diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c index cbb0b60774..7895f1497b 100644 --- a/drivers/led/aw20216.c +++ b/drivers/led/aw20216.c @@ -1,4 +1,5 @@ /* Copyright 2021 Jasper Chan + * 2023 Huckies <https://github.com/Huckies> * * 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 @@ -15,6 +16,7 @@ */ #include "aw20216.h" +#include "wait.h" #include "spi_master.h" /* The AW20216 appears to be somewhat similar to the IS31FL743, although quite @@ -34,6 +36,8 @@ #define AW_REG_CONFIGURATION 0x00 // PG0 #define AW_REG_GLOBALCURRENT 0x01 // PG0 +#define AW_REG_RESET 0x2F // PG0 +#define AW_REG_MIXFUNCTION 0x46 // PG0 // Default value of AW_REG_CONFIGURATION // D7:D4 = 1011, SWSEL (SW1~SW12 active) @@ -41,7 +45,10 @@ // D2:D1 = 00, OSDE (open/short detection enable) // D0 = 0, CHIPEN (write 1 to enable LEDs when hardware enable pulled high) #define AW_CONFIG_DEFAULT 0b10110000 +#define AW_MIXCR_DEFAULT 0b00000000 +#define AW_RESET_CMD 0xAE #define AW_CHIPEN 1 +#define AW_LPEN (0x01 << 1) #define AW_PWM_REGISTER_COUNT 216 @@ -94,6 +101,10 @@ static inline bool AW20216_write_register(pin_t cs_pin, uint8_t page, uint8_t re return AW20216_write(cs_pin, page, reg, &value, 1); } +void AW20216_soft_reset(pin_t cs_pin) { + AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_RESET, AW_RESET_CMD); +} + static void AW20216_init_scaling(pin_t cs_pin) { // Set constant current to the max, control brightness with PWM for (uint8_t i = 0; i < AW_PWM_REGISTER_COUNT; i++) { @@ -111,15 +122,23 @@ static inline void AW20216_soft_enable(pin_t cs_pin) { AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); } +static inline void AW20216_auto_lowpower(pin_t cs_pin) { + AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_MIXFUNCTION, AW_MIXCR_DEFAULT | AW_LPEN); +} + void AW20216_init(pin_t cs_pin, pin_t en_pin) { setPinOutput(en_pin); writePinHigh(en_pin); + AW20216_soft_reset(cs_pin); + wait_ms(2); + // Drivers should start with all scaling and PWM registers as off AW20216_init_current_limit(cs_pin); AW20216_init_scaling(cs_pin); AW20216_soft_enable(cs_pin); + AW20216_auto_lowpower(cs_pin); } void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h index 702fb3c609..6023c08795 100644 --- a/keyboards/0_sixty/config.h +++ b/keyboards/0_sixty/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json index 154f7bd442..6097a2f349 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -6,6 +6,11 @@ "vid": "0x7654", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2"], + "rows": ["B1", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "features": { "extrakey": true, "console": true, diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h index 036f18fe6c..244a5f192d 100644 --- a/keyboards/0xc7/61key/config.h +++ b/keyboards/0xc7/61key/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json index 76b525a99e..569a054daf 100644 --- a/keyboards/0xc7/61key/info.json +++ b/keyboards/0xc7/61key/info.json @@ -8,6 +8,11 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index f77002e8ab..10b1f88216 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -16,26 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -// clang-format off - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 -// clang-format on /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index a18bd7b313..6f3b2d06f0 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -8,6 +8,11 @@ "pid": "0xA455", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D4", "C0", "C1", "C2", "C3"], + "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h index 5943564661..ee33867ec3 100644 --- a/keyboards/10bleoledhub/config.h +++ b/keyboards/10bleoledhub/config.h @@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/ #pragma once - -#define MATRIX_ROW_PINS { F0, F5, F4, F6 } -#define MATRIX_COL_PINS { D6, D7, B5 } - -#define DIODE_DIRECTION ROW2COL - #define SSD1306OLED #define RGB_DI_PIN B7 diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json index dd106a74a5..4f5cd9564a 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/info.json @@ -8,6 +8,11 @@ "pid": "0x7C99", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B5"], + "rows": ["F0", "F5", "F4", "F6"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "F7"} diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index b58eef1085..edcad67b86 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json index 07f35c7340..010a82cb5e 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/info.json @@ -8,6 +8,11 @@ "pid": "0x6873", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"], + "rows": ["B3", "B2", "B1", "B0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h index ff5f010cbe..1aa9d54fe1 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json index 98a9082989..383c7f6525 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/info.json @@ -8,6 +8,11 @@ "pid": "0x6874", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"], + "rows": ["B3", "B2", "B1", "B0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h index 806f23075f..348604d71c 100644 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ b/keyboards/1upkeyboards/1up60rgb/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 57a0143544..b0ea1ed036 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x7267", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h index dfed1e4e6f..858e5682d4 100644 --- a/keyboards/1upkeyboards/pi40/config.h +++ b/keyboards/1upkeyboards/pi40/config.h @@ -15,11 +15,6 @@ #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c" #endif -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 } -#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 } - #define RGB_DI_PIN GP0 #define RGB_MATRIX_LED_COUNT 47 #define RGBLED_NUM 47 diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json index 42c0bc7b12..10fb9c1674 100644 --- a/keyboards/1upkeyboards/pi40/info.json +++ b/keyboards/1upkeyboards/pi40/info.json @@ -6,6 +6,11 @@ "pid": "0x5600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12"], + "rows": ["GP21", "GP20", "GP19", "GP18"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "GP14", "pin_b": "GP13"} diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index d8a63123cf..ecb38b92b2 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -74,74 +74,74 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "~", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "~", "matrix": [0, 14], "x": 14, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "ISO'", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "label": "ISO'", "matrix": [2, 12], "x": 12.75, "y": 2 }, { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISO<>", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "ISO<>", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, { "label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 }, - { "label": "RShift", "matrix": [3, 12], "w": 1, "x": 13, "y": 3 }, - { "label": "FN", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "RShift", "matrix": [3, 12], "x": 13, "y": 3 }, + { "label": "FN", "matrix": [3, 14], "x": 14, "y": 3 }, { "label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 }, { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 }, { "label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4 }, { "label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4 }, - { "label": "RAlt", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 }, - { "label": "FN", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 }, - { "label": "Mid1U", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 }, - { "label": "Menu", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 }, - { "label": "RCtrl", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 } + { "label": "RAlt", "matrix": [4, 10], "x": 10, "y": 4 }, + { "label": "FN", "matrix": [4, 11], "x": 11, "y": 4 }, + { "label": "Mid1U", "matrix": [4, 12], "x": 12, "y": 4 }, + { "label": "Menu", "matrix": [4, 13], "x": 13, "y": 4 }, + { "label": "RCtrl", "matrix": [4, 14], "x": 14, "y": 4 } ] } } diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 2fb271382f..0fb710fe5b 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -54,61 +54,61 @@ "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "~", "matrix": [1, 13], "w": 1, "x": 14, "y": 0 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "~", "matrix": [1, 13], "x": 14, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 }, { "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "FN", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "label": "FN", "matrix": [3, 13], "x": 14, "y": 3 }, { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json index 22afdb58a0..f52fe1f836 100644 --- a/keyboards/1upkeyboards/pi60_rgb/info.json +++ b/keyboards/1upkeyboards/pi60_rgb/info.json @@ -102,58 +102,58 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 }, { "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h index 7af70c5b75..ef1a458c9d 100644 --- a/keyboards/1upkeyboards/super16/config.h +++ b/keyboards/1upkeyboards/super16/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS \ - { D1, D0, F4, F5 } -#define MATRIX_COL_PINS \ - { D4, C6, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json index d648c32f3e..53648fbd02 100644 --- a/keyboards/1upkeyboards/super16/info.json +++ b/keyboards/1upkeyboards/super16/info.json @@ -8,6 +8,11 @@ "pid": "0x5516", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "F6", "F7"], + "rows": ["D1", "D0", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "numpad_4x4"], diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index 04f5fdd979..d3235d95ff 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -19,24 +19,6 @@ #define MOUSEKEY_MOVE_DELTA 25 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// 0 1 2 3 -#define MATRIX_ROW_PINS { D1, D2, D3, D4 } -#define MATRIX_COL_PINS { D5, D6, C2, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 20 #ifdef RGB_DI_PIN diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json index 13e2c55fa5..ee5ba391fb 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -8,6 +8,11 @@ "pid": "0x5517", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D6", "C2", "D0"], + "rows": ["D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"}, diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index 02e8564702..bb68f2b5d4 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifndef CONVERT_TO_PROTON_C # define LED_NUM_LOCK_PIN B0 // RXLED # define LED_CAPS_LOCK_PIN D5 // TXLED diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json index d549338988..c89680ba2d 100644 --- a/keyboards/1upkeyboards/sweet16/v1/info.json +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x0161", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index eb8bd97b59..0a8b6b948e 100644 --- a/keyboards/25keys/aleth42/rev0/config.h +++ b/keyboards/25keys/aleth42/rev0/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json index 18023c847e..cd86f9ddf8 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.0" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B7"}, diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index e0799e65a1..56ba105e5d 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B0, B2, B1 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index 9d70daf01f..c7e5658ec4 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"], + "rows": ["B4", "B0", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"}, diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index 776f7f3138..b537056e6b 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/config.h @@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MASTER_RIGHT //#define EE_HANDS -#define MATRIX_ROW_PINS { F6, F7, B1, B3 } -#define MATRIX_COL_PINS { F4, D4, C6, D7, E6, B4 } - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json index fa41ed213f..5d9ec2d7d4 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Zinc rev.1", + "matrix_pins": { + "cols": ["F4", "D4", "C6", "D7", "E6", "B4"], + "rows": ["F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" } diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index 0a7e29a9a6..b537056e6b 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/config.h @@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MASTER_RIGHT //#define EE_HANDS -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3} - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json index ec98ea65a9..3bf44bfe8f 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Zinc rev.A", + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" } diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h index 67a1b48157..a1bbffcef4 100644 --- a/keyboards/2key2crawl/config.h +++ b/keyboards/2key2crawl/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C4, C5 } -#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json index e4ab7f79a9..1421a7b1e0 100644 --- a/keyboards/2key2crawl/info.json +++ b/keyboards/2key2crawl/info.json @@ -8,6 +8,11 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"], + "rows": ["C4", "C5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1", "resolution": 1} diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h deleted file mode 100644 index 23ccf24b81..0000000000 --- a/keyboards/30wer/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -/* pcb default pin-out */ -#define MATRIX_ROW_PINS { E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0, D4, C6, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json index bbaa61f6ba..bced976dd5 100644 --- a/keyboards/30wer/info.json +++ b/keyboards/30wer/info.json @@ -8,6 +8,11 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h index 6bb66fc39f..dca5d4a1ff 100644 --- a/keyboards/3keyecosystem/2key2/config.h +++ b/keyboards/3keyecosystem/2key2/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F6 } -#define MATRIX_COL_PINS { F4, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB matrix key backlighting */ #define RGB_DI_PIN B2 #define RGB_MATRIX_LED_COUNT 2 diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json index 1da073d0fc..398a4d3439 100644 --- a/keyboards/3keyecosystem/2key2/info.json +++ b/keyboards/3keyecosystem/2key2/info.json @@ -8,6 +8,11 @@ "pid": "0x3304", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D7"], + "rows": ["F6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 86d1f0b90f..20ecf94708 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -21,22 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json index d0544f9a2e..70a2749a65 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/info.json @@ -8,6 +8,11 @@ "pid": "0x0F25", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h index ac308220e4..7caa265c1a 100644 --- a/keyboards/40percentclub/4x4/config.h +++ b/keyboards/40percentclub/4x4/config.h @@ -2,23 +2,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B2, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json index 7864832484..eb066e591b 100644 --- a/keyboards/40percentclub/4x4/info.json +++ b/keyboards/40percentclub/4x4/info.json @@ -8,6 +8,11 @@ "pid": "0x0A0C", "device_version": "44.4.4" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], + "rows": ["B2", "D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h index 078344e34b..7caa265c1a 100644 --- a/keyboards/40percentclub/5x5/config.h +++ b/keyboards/40percentclub/5x5/config.h @@ -2,23 +2,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B2, D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json index 76554d54e4..b113485584 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/info.json @@ -8,6 +8,11 @@ "pid": "0x05B5", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], + "rows": ["B2", "D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"], diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h index 8fbc9ea06f..20ecf94708 100644 --- a/keyboards/40percentclub/6lit/config.h +++ b/keyboards/40percentclub/6lit/config.h @@ -21,22 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D7, E6 } -#define MATRIX_COL_PINS { F6, F7, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json index a0892d2a7a..9ddd475570 100644 --- a/keyboards/40percentclub/6lit/info.json +++ b/keyboards/40percentclub/6lit/info.json @@ -8,6 +8,11 @@ "pid": "0x0F61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1"], + "rows": ["D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h index 4107b37948..20ecf94708 100644 --- a/keyboards/40percentclub/foobar/config.h +++ b/keyboards/40percentclub/foobar/config.h @@ -21,22 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D7, E6, B4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json index ecc079f51b..53cda10128 100644 --- a/keyboards/40percentclub/foobar/info.json +++ b/keyboards/40percentclub/foobar/info.json @@ -8,6 +8,11 @@ "pid": "0x0F00", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2"], + "rows": ["D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h index 3d6c38ec80..627d9d6dbb 100644 --- a/keyboards/40percentclub/gherkin/config.h +++ b/keyboards/40percentclub/gherkin/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index ee85708f19..0f889aa04d 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5" }, diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h index af2a983fb4..8b4ccf1479 100644 --- a/keyboards/40percentclub/half_n_half/config.h +++ b/keyboards/40percentclub/half_n_half/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json index 6b847361dc..0bec859a5a 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/info.json @@ -8,6 +8,11 @@ "pid": "0x4A1F", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/i75/promicro/config.h b/keyboards/40percentclub/i75/promicro/config.h deleted file mode 100644 index 844291c8df..0000000000 --- a/keyboards/40percentclub/i75/promicro/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2018 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json index 4369a04103..933c4f8616 100644 --- a/keyboards/40percentclub/i75/promicro/info.json +++ b/keyboards/40percentclub/i75/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/40percentclub/i75/teensy2/config.h b/keyboards/40percentclub/i75/teensy2/config.h deleted file mode 100644 index d8f09b1388..0000000000 --- a/keyboards/40percentclub/i75/teensy2/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2018 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { C6, C7, D6, D7, B5, B6, F7, F6, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json index 0b2db81c11..2296a57828 100644 --- a/keyboards/40percentclub/i75/teensy2/info.json +++ b/keyboards/40percentclub/i75/teensy2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C6", "C7", "D6", "D7", "B5", "B6", "F7", "F6", "F5"], + "rows": ["D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h index 2848c7a32c..2f4ce8ee17 100644 --- a/keyboards/40percentclub/luddite/config.h +++ b/keyboards/40percentclub/luddite/config.h @@ -1,12 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json index 948ef091bd..d81a6b842a 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/info.json @@ -8,6 +8,11 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "levels": 4 diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h index 0a07934e75..b9449c4714 100644 --- a/keyboards/40percentclub/mf68/config.h +++ b/keyboards/40percentclub/mf68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json index 2c8a4c92d6..eecade3b22 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/info.json @@ -8,6 +8,11 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], + "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "breathing": true diff --git a/keyboards/40percentclub/nano/keymaps/default/rules.mk b/keyboards/40percentclub/nano/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/40percentclub/nano/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h index 6bdf5db350..60d3b4e424 100644 --- a/keyboards/40percentclub/nori/config.h +++ b/keyboards/40percentclub/nori/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4, C6, D7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // enable RGB underglow #define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index fa12a8ef03..97c793b069 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -8,6 +8,11 @@ "pid": "0x0A0C", "device_version": "4.4.4" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5" }, @@ -17,108 +22,108 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 } ] + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 3, "y": 0 }, + { "x": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 } ] }, "LAYOUT_ortho_4x8": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "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 } ] }, "LAYOUT_ortho_4x12": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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 } ] } } } diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/40percentclub/polyandry/promicro/config.h deleted file mode 100644 index ff148a0b3f..0000000000 --- a/keyboards/40percentclub/polyandry/promicro/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* key matrix pins - * Direct pins is not used because there is not a shared ground position - * between all compatible microcontrollers. -*/ -#define MATRIX_ROW_PINS { D7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, E6, B4, F4, F5, F6, F7, B3, B2 } - -/* doesn't really matter lol */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json index 4369a04103..a8169c93dd 100644 --- a/keyboards/40percentclub/polyandry/promicro/info.json +++ b/keyboards/40percentclub/polyandry/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"], + "rows": ["D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h deleted file mode 100644 index 8eaeb3167a..0000000000 --- a/keyboards/40percentclub/polyandry/teensy2/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* key matrix pins */ - -// Note from original contributor (ryjelsum): -// Untested - don't have teensy2. if some keys do not function or are in wrong place, -// please check the pin definitions. I may have screwed up. :) - -#define MATRIX_ROW_PINS { D3 } -#define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json index 0b2db81c11..0a870332b2 100644 --- a/keyboards/40percentclub/polyandry/teensy2/info.json +++ b/keyboards/40percentclub/polyandry/teensy2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"], + "rows": ["D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h index 357380e3a7..5e3bf27f3d 100644 --- a/keyboards/40percentclub/tomato/config.h +++ b/keyboards/40percentclub/tomato/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json index cbaefde2bd..8877c31429 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/info.json @@ -8,6 +8,11 @@ "pid": "0x546F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h index fcf2f8ea44..1d951890cd 100644 --- a/keyboards/45_ats/config.h +++ b/keyboards/45_ats/config.h @@ -18,13 +18,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D5, D7, D6 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, F6, F5, F4, C7, F7, C6, B6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json index 0bf42f9a75..f4f163ccc1 100644 --- a/keyboards/45_ats/info.json +++ b/keyboards/45_ats/info.json @@ -8,6 +8,11 @@ "pid": "0x4511", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"], + "rows": ["D3", "D5", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h deleted file mode 100644 index 5f20b5b97a..0000000000 --- a/keyboards/4by3/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json index 0ed57ce2f6..ade503696c 100644 --- a/keyboards/4by3/info.json +++ b/keyboards/4by3/info.json @@ -8,6 +8,11 @@ "pid": "0x2019", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index f7ef22d986..d922c2e10f 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,13 +1,5 @@ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} -#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index 9932b6ec55..2c5c25df4b 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], + "rows": ["C2", "D0", "B0", "C7", "C5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C2", "esc_output": "C4" diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index b5602b1cc0..6892802218 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B15,A9,B7,A1,A2} -#define MATRIX_COL_PINS {A3,A4,F1,F0,C15,C14,C13,B9,B8,B6,B5,B4,B3,A15} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 12 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index fe2e424999..92cd38952a 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B15", "A9", "B7", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A10" }, diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h deleted file mode 100644 index b1743d0982..0000000000 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2} -#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 8f3b5eb2bf..9ff31a1ee3 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"], + "rows": ["D0", "C2", "C4", "D4", "D2"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D0", "esc_output": "C4" @@ -72,7 +77,7 @@ { "label": ">", "x": 10.25, "y": 3 }, { "label": "?", "x": 11.25, "y": 3 }, { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "x": 14, "y": 3, "w": 1 }, + { "label": "Fn", "x": 14, "y": 3 }, { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 3d480a1e93..76bc9a6b4f 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { A0, B1, B0, A4, B5, B4, B3 } -#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 4 #define BACKLIGHT_PAL_MODE 2 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 8748b32480..23c7496c60 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "B1", "B0", "A4", "B5", "B4", "B3"], + "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A3", "levels": 10, @@ -74,7 +79,7 @@ { "label": ">", "x": 10.25, "y": 3 }, { "label": "?", "x": 11.25, "y": 3 }, { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "x": 14, "y": 3, "w": 1 }, + { "label": "Fn", "x": 14, "y": 3 }, { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index eed3b708c4..6ecc98da2d 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { A0, A3, A4, A7, B5, B4, B3 } -#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index 7ced2cf40c..b815c9bf4f 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A0", "A3", "A4", "A7", "B5", "B4", "B3"], + "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index 2764861e97..e033b16259 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { A1, B12, B14, A2, A0, A3, A4} -#define MATRIX_ROW_PINS { C14, C13, B5, B4, B8, A15, B3, B9, A5, A7} -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json index 07bd69f22e..0710674dff 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"], + "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "community_layouts": ["60_iso"], diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index f7ef22d986..d922c2e10f 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -1,13 +1,5 @@ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} -#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index b6e9c37ba2..cf8bfba558 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], + "rows": ["C2", "D0", "B0", "C7", "C5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C2", "esc_output": "C4" diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h deleted file mode 100644 index 670c8132a1..0000000000 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2} -#define MATRIX_COL_PINS {D3,D0,D2,B6,B5,B4,B3,D6,D5,B0,B1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index 0b98be4876..ea24fceea0 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"], + "rows": ["D4", "D1", "C2", "C4", "C7", "B2"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D4", "esc_output": "D3" diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 7c1e13ce84..85521fa3b6 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} -#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 866ae5c1ac..72a9ac953c 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], + "rows": ["C2", "D0", "B0", "D6", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", "esc_output": "C2" diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 689a515013..979a022177 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} -#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 1a6937b096..d7bceba391 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], + "rows": ["C2", "D0", "B0", "D6", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", "esc_output": "C2" diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index 05e66f6a79..91a0e7f0cd 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} -#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 1 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json index 7b09f0a0d3..9648794a7d 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/info.json @@ -8,6 +8,11 @@ "pid": "0x000E", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], + "rows": ["B14", "A9", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h deleted file mode 100644 index beb204bb2d..0000000000 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} -#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json index dc3ea424bb..84f375371d 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json +++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x000D", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], + "rows": ["B14", "A9", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h deleted file mode 100644 index cb2e06921a..0000000000 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} -#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json index 8f9c34b563..c920744d27 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/info.json +++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json @@ -8,6 +8,11 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], + "rows": ["B14", "A9", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index 8b3dc47247..063cfb1b3c 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {C4,C5,B4,B3,B1,B0,D6,D5,D3,D4,D1,D2} -#define MATRIX_COL_PINS {C6,C7,B7,B6,B5,B2,D0,C2} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D7 #define RGBLED_NUM 2 diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 13bffb7384..434b615f4a 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"], + "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", "esc_output": "C6" diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index c863208012..5656563fa1 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {B13,B12,A5,A4,A2,A1,F0,C15,C13,C14,F1,A0} -#define MATRIX_COL_PINS {B2,B1,B0,A7,A6,A3,B9,B8} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 2 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json index f6a835652f..cc5829cb43 100644 --- a/keyboards/4pplet/waffling80/rev_b/info.json +++ b/keyboards/4pplet/waffling80/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x000F", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"], + "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index 959bd92622..b9a17d4128 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, C15, A8 } -#define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json index b902a0d6cf..645c408dcf 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"], + "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6", "scroll_lock": "A7" diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h index ba7016ab34..f6b4b30cf5 100644 --- a/keyboards/7c8/framework/config.h +++ b/keyboards/7c8/framework/config.h @@ -16,11 +16,7 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, D7, B2, D6, B3, D5, B4, D4, B5 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 } - #define TAP_CODE_DELAY 16 -#define DIODE_DIRECTION COL2ROW #define LEADER_TIMEOUT 250 #define LEADER_PER_KEY_TIMING 150 diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json index ca440e9a76..862acea115 100644 --- a/keyboards/7c8/framework/info.json +++ b/keyboards/7c8/framework/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], + "rows": ["B0", "B1", "D7", "B2", "D6", "B3", "D5", "B4", "D4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h index 8f721392c8..a5dd0856a3 100644 --- a/keyboards/9key/config.h +++ b/keyboards/9key/config.h @@ -17,17 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* 9Key PCB default pin-out */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { F4, F5, F6 } - /* ws2812 RGB LED */ #define RGB_DI_PIN F7 #define RGBLED_NUM 1 // Number of LEDs -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json index fa74573e3e..e4109ef2aa 100644 --- a/keyboards/9key/info.json +++ b/keyboards/9key/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 132187db26..d14c59f8a2 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -18,54 +18,54 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0, "w":1}, - {"label":"k01", "x":1, "y":0, "w":1}, - {"label":"k02", "x":2, "y":0, "w":1}, - {"label":"k03", "x":3, "y":0, "w":1}, - {"label":"k04", "x":4, "y":0, "w":1}, - {"label":"k05", "x":5, "y":0, "w":1}, - {"label":"k06", "x":6, "y":0, "w":1}, - {"label":"k07", "x":7, "y":0, "w":1}, - {"label":"k08", "x":8, "y":0, "w":1}, - {"label":"k09", "x":9, "y":0, "w":1}, - {"label":"k0a", "x":10, "y":0, "w":1}, + {"label":"k00", "x":0, "y":0}, + {"label":"k01", "x":1, "y":0}, + {"label":"k02", "x":2, "y":0}, + {"label":"k03", "x":3, "y":0}, + {"label":"k04", "x":4, "y":0}, + {"label":"k05", "x":5, "y":0}, + {"label":"k06", "x":6, "y":0}, + {"label":"k07", "x":7, "y":0}, + {"label":"k08", "x":8, "y":0}, + {"label":"k09", "x":9, "y":0}, + {"label":"k0a", "x":10, "y":0}, {"label":"k0b", "x":11, "y":0, "w":1.75}, {"label":"k10", "x":0, "y":1, "w":1.25}, - {"label":"k11", "x":1.25, "y":1, "w":1}, - {"label":"k12", "x":2.25, "y":1, "w":1}, - {"label":"k13", "x":3.25, "y":1, "w":1}, - {"label":"k14", "x":4.25, "y":1, "w":1}, - {"label":"k15", "x":5.25, "y":1, "w":1}, - {"label":"k16", "x":6.25, "y":1, "w":1}, - {"label":"k17", "x":7.25, "y":1, "w":1}, - {"label":"k18", "x":8.25, "y":1, "w":1}, - {"label":"k19", "x":9.25, "y":1, "w":1}, - {"label":"k1a", "x":10.25, "y":1, "w":1}, + {"label":"k11", "x":1.25, "y":1}, + {"label":"k12", "x":2.25, "y":1}, + {"label":"k13", "x":3.25, "y":1}, + {"label":"k14", "x":4.25, "y":1}, + {"label":"k15", "x":5.25, "y":1}, + {"label":"k16", "x":6.25, "y":1}, + {"label":"k17", "x":7.25, "y":1}, + {"label":"k18", "x":8.25, "y":1}, + {"label":"k19", "x":9.25, "y":1}, + {"label":"k1a", "x":10.25, "y":1}, {"label":"k1b", "x":11.25, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k21", "x":1.75, "y":2, "w":1}, - {"label":"k22", "x":2.75, "y":2, "w":1}, - {"label":"k23", "x":3.75, "y":2, "w":1}, - {"label":"k24", "x":4.75, "y":2, "w":1}, - {"label":"k25", "x":5.75, "y":2, "w":1}, - {"label":"k26", "x":6.75, "y":2, "w":1}, - {"label":"k27", "x":7.75, "y":2, "w":1}, - {"label":"k28", "x":8.75, "y":2, "w":1}, - {"label":"k29", "x":9.75, "y":2, "w":1}, - {"label":"k2a", "x":10.75, "y":2, "w":1}, - {"label":"k2b", "x":11.75, "y":2, "w":1}, + {"label":"k21", "x":1.75, "y":2}, + {"label":"k22", "x":2.75, "y":2}, + {"label":"k23", "x":3.75, "y":2}, + {"label":"k24", "x":4.75, "y":2}, + {"label":"k25", "x":5.75, "y":2}, + {"label":"k26", "x":6.75, "y":2}, + {"label":"k27", "x":7.75, "y":2}, + {"label":"k28", "x":8.75, "y":2}, + {"label":"k29", "x":9.75, "y":2}, + {"label":"k2a", "x":10.75, "y":2}, + {"label":"k2b", "x":11.75, "y":2}, {"label":"k30", "x":0, "y":3, "w":1.25}, - {"label":"k31", "x":1.25, "y":3, "w":1}, - {"label":"k32", "x":2.25, "y":3, "w":1}, + {"label":"k31", "x":1.25, "y":3}, + {"label":"k32", "x":2.25, "y":3}, {"label":"k33", "x":3.25, "y":3, "w":2.75}, {"label":"k34", "x":6, "y":3, "w":2.75}, - {"label":"k35", "x":8.75, "y":3, "w":1}, - {"label":"k36", "x":9.75, "y":3, "w":1}, - {"label":"k37", "x":10.75, "y":3, "w":1}, - {"label":"k38", "x":11.75, "y":3, "w":1} + {"label":"k35", "x":8.75, "y":3}, + {"label":"k36", "x":9.75, "y":3}, + {"label":"k37", "x":10.75, "y":3}, + {"label":"k38", "x":11.75, "y":3} ] } } diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c index 73c453b6c0..0bd190321a 100644 --- a/keyboards/aidansmithdotdev/fine40/fine40.c +++ b/keyboards/aidansmithdotdev/fine40/fine40.c @@ -71,15 +71,15 @@ bool oled_task_kb(void) { #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - // Volume control - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return false; + if (!encoder_update_user(index, clockwise)) { + return false; + } + // Volume control + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; } #endif
\ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json index c41557a920..eb0ec8f143 100644 --- a/keyboards/aidansmithdotdev/fine40/info.json +++ b/keyboards/aidansmithdotdev/fine40/info.json @@ -27,7 +27,7 @@ }, "encoder": { "rotary": [ - {"pin_a": "D5", "pin_b": "B7", "resolution": 2} + {"pin_a": "B7", "pin_b": "D5", "resolution": 2} ] }, "layouts": { diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c index d157d9db31..69b9dacd27 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c +++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c @@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______ ), }; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_TAB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif
\ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c index d157d9db31..69b9dacd27 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c +++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c @@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______ ), }; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_TAB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif
\ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk index 036bd6d1c3..f1adcab005 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk +++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes
\ No newline at end of file +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json index 8e5e511aa2..49af285177 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/info.json @@ -17,7 +17,7 @@ {"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":"Del", "x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"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":2.25}, {"label":"↑", "x":14.5, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Fn", "x":11, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.25, "y":4, "w":1.25}, {"label":"←", "x":13.5, "y":4}, {"label":"↓", "x":14.5, "y":4}, {"label":"→", "x":15.5, "y":4} + {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Fn", "x":11, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.25, "y":4, "w":1.25}, {"label":"←", "x":13.5, "y":4}, {"label":"↓", "x":14.5, "y":4}, {"label":"→", "x":15.5, "y":4} ] } } diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c index fff0c10ef6..c894d18602 100644 --- a/keyboards/capsunlocked/cu75/cu75.c +++ b/keyboards/capsunlocked/cu75/cu75.c @@ -2,7 +2,6 @@ #include <avr/timer_avr.h> #include <avr/wdt.h> #include "cu75.h" -#include "keymap.h" #include "debug.h" #include "../lfkeyboards/issi.h" #include "../lfkeyboards/TWIlib.h" diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json index 09bf2e334c..4f652bf86b 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json @@ -53,82 +53,82 @@ "c_macro": true, "filename": "keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h", "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 }, - { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 }, - { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 }, - { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 }, - { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 }, - { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 }, - { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 }, - { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 }, - { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 }, - { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 }, - { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 }, - { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 }, - { "label": "@", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 }, - { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 }, - { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 }, - { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 }, - { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 }, - { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 }, - { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 }, - { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 }, - { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 }, - { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 }, - { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "F2", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "F3", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "F4", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0 }, + { "label": "F9", "matrix": [0, 10], "x": 11, "y": 0 }, + { "label": "F10", "matrix": [0, 11], "x": 12, "y": 0 }, + { "label": "F11", "matrix": [0, 12], "x": 13, "y": 0 }, + { "label": "F12", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 }, + { "label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.5 }, { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 }, - { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 }, - { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, + { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.5 }, { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 }, - { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 }, - { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 }, - { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 }, - { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 }, - { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 }, - { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 }, - { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 }, - { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 }, - { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 }, - { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 }, - { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, - { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 }, - { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 }, + { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, + { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.5 }, { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 }, - { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 }, - { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 }, - { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 }, - { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 }, - { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 }, - { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 }, - { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 }, - { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 }, - { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 }, - { "label": "\"", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, { "label": "Enter", "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3.5 }, { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 }, - { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 }, - { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 }, - { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 }, - { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 }, - { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 }, - { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 }, - { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 }, - { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 }, - { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 }, - { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 }, - { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 }, + { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 }, { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 }, @@ -137,9 +137,9 @@ { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 }, { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 }, { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 }, - { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 }, - { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 }, - { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 } + { "label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, + { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.5 }, + { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.5 } ] } } diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json index 0c71c940c1..4e2cfafff5 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/info.json @@ -53,83 +53,83 @@ "c_macro": true, "filename": "keyboards/capsunlocked/cu80/v2_iso/v2_iso.h", "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 }, - { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 }, - { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 }, - { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 }, - { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 }, - { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 }, - { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 }, - { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 }, - { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 }, - { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 }, - { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 }, - { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 }, - { "label": "\"", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 }, - { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 }, - { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 }, - { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 }, - { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 }, - { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 }, - { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 }, - { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 }, - { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 }, - { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 }, - { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "F2", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "F3", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "F4", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0 }, + { "label": "F9", "matrix": [0, 10], "x": 11, "y": 0 }, + { "label": "F10", "matrix": [0, 11], "x": 12, "y": 0 }, + { "label": "F11", "matrix": [0, 12], "x": 13, "y": 0 }, + { "label": "F12", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 }, + { "label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.5 }, { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 }, - { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 }, - { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, + { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.5 }, { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 }, - { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 }, - { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 }, - { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 }, - { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 }, - { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 }, - { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 }, - { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 }, - { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 }, - { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 }, - { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 }, - { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 }, - { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 }, - { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, + { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.5 }, { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 }, - { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 }, - { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 }, - { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 }, - { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 }, - { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 }, - { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 }, - { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 }, - { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 }, - { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 }, - { "label": "@", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 }, - { "label": "~", "matrix": [3, 12], "w": 1, "x": 12.75, "y": 3.5 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "label": "@", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "label": "~", "matrix": [3, 12], "x": 12.75, "y": 3.5 }, { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.5 }, { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, - { "label": "|", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4.5 }, - { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 }, - { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 }, - { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 }, - { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 }, - { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 }, - { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 }, - { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 }, - { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 }, - { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 }, - { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 }, + { "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 }, - { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 }, + { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 }, { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 }, @@ -138,9 +138,9 @@ { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 }, { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 }, { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 }, - { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 }, - { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 }, - { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 } + { "label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, + { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.5 }, + { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.5 } ] } } diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json index a8e933d028..c669255cb1 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/info.json @@ -55,23 +55,23 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - { "label": "Num Lock", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "/", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "*", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "-", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "7", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "8", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "9", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "4", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "5", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "6", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "h": 2, "label": "+", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "1", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "2", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "3", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "/", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "*", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "-", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "7", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "8", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "9", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "4", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "5", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "6", "matrix": [2, 2], "x": 2, "y": 2 }, + { "h": 2, "label": "+", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "1", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "2", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "3", "matrix": [3, 2], "x": 2, "y": 3 }, { "label": "0", "matrix": [4, 0], "w": 2, "x": 0, "y": 4 }, - { "label": ".", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 }, - { "h": 2, "label": "Enter", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 } + { "label": ".", "matrix": [4, 2], "x": 2, "y": 4 }, + { "h": 2, "label": "Enter", "matrix": [3, 3], "x": 3, "y": 3 } ] } } diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json index 03162625c6..8267dd983c 100644 --- a/keyboards/clueboard/2x1800/2018/info.json +++ b/keyboards/clueboard/2x1800/2018/info.json @@ -54,386 +54,386 @@ "layouts": { "LAYOUT_4u_space": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4.75, "y": 0 }, + { "matrix": [0, 6], "x": 6.25, "y": 0 }, + { "matrix": [0, 7], "x": 7.25, "y": 0 }, + { "matrix": [0, 8], "x": 8.25, "y": 0 }, + { "matrix": [0, 9], "x": 9.25, "y": 0 }, + { "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "matrix": [6, 0], "x": 11.75, "y": 0 }, + { "matrix": [6, 1], "x": 12.75, "y": 0 }, + { "matrix": [6, 2], "x": 13.75, "y": 0 }, + { "matrix": [6, 3], "x": 15.25, "y": 0 }, + { "matrix": [6, 4], "x": 16.25, "y": 0 }, + { "matrix": [6, 5], "x": 17.25, "y": 0 }, + { "matrix": [6, 6], "x": 18.25, "y": 0 }, + { "matrix": [6, 7], "x": 20, "y": 0 }, + { "matrix": [6, 8], "x": 21, "y": 0 }, + { "matrix": [6, 9], "x": 22, "y": 0 }, + { "matrix": [6, 10], "x": 23, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "x": 4.5, "y": 1.25 }, + { "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "matrix": [1, 6], "x": 6.5, "y": 1.25 }, + { "matrix": [1, 7], "x": 7.5, "y": 1.25 }, + { "matrix": [1, 8], "x": 8.5, "y": 1.25 }, + { "matrix": [1, 9], "x": 9.5, "y": 1.25 }, + { "matrix": [1, 10], "x": 10.5, "y": 1.25 }, + { "matrix": [7, 0], "x": 11.5, "y": 1.25 }, + { "matrix": [7, 1], "x": 12.5, "y": 1.25 }, + { "matrix": [7, 2], "x": 13.5, "y": 1.25 }, + { "matrix": [7, 3], "x": 14.5, "y": 1.25 }, + { "matrix": [7, 4], "x": 15.5, "y": 1.25 }, + { "matrix": [7, 5], "x": 16.5, "y": 1.25 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 }, + { "matrix": [7, 7], "x": 20, "y": 1.25 }, + { "matrix": [7, 8], "x": 21, "y": 1.25 }, + { "matrix": [7, 9], "x": 22, "y": 1.25 }, + { "matrix": [7, 10], "x": 23, "y": 1.25 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "matrix": [2, 3], "x": 3, "y": 2.25 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 }, + { "matrix": [2, 5], "x": 6, "y": 2.25 }, + { "matrix": [2, 6], "x": 7, "y": 2.25 }, + { "matrix": [2, 7], "x": 8, "y": 2.25 }, + { "matrix": [2, 8], "x": 9, "y": 2.25 }, + { "matrix": [2, 9], "x": 10, "y": 2.25 }, + { "matrix": [2, 10], "x": 11, "y": 2.25 }, + { "matrix": [8, 0], "x": 12, "y": 2.25 }, + { "matrix": [8, 1], "x": 13, "y": 2.25 }, + { "matrix": [8, 2], "x": 14, "y": 2.25 }, + { "matrix": [8, 3], "x": 15, "y": 2.25 }, + { "matrix": [8, 4], "x": 16, "y": 2.25 }, + { "matrix": [8, 5], "x": 17, "y": 2.25 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 }, + { "matrix": [8, 7], "x": 20, "y": 2.25 }, + { "matrix": [8, 8], "x": 21, "y": 2.25 }, + { "matrix": [8, 9], "x": 22, "y": 2.25 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 }, + { "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "matrix": [3, 2], "x": 2, "y": 3.25 }, + { "matrix": [3, 3], "x": 3, "y": 3.25 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 }, + { "matrix": [3, 5], "x": 6.25, "y": 3.25 }, + { "matrix": [3, 6], "x": 7.25, "y": 3.25 }, + { "matrix": [3, 7], "x": 8.25, "y": 3.25 }, + { "matrix": [3, 8], "x": 9.25, "y": 3.25 }, + { "matrix": [3, 9], "x": 10.25, "y": 3.25 }, + { "matrix": [3, 10], "x": 11.25, "y": 3.25 }, + { "matrix": [9, 0], "x": 12.25, "y": 3.25 }, + { "matrix": [9, 1], "x": 13.25, "y": 3.25 }, + { "matrix": [9, 2], "x": 14.25, "y": 3.25 }, + { "matrix": [9, 3], "x": 15.25, "y": 3.25 }, + { "matrix": [9, 4], "x": 16.25, "y": 3.25 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 }, + { "matrix": [9, 7], "x": 20, "y": 3.25 }, + { "matrix": [9, 8], "x": 21, "y": 3.25 }, + { "matrix": [9, 9], "x": 22, "y": 3.25 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "x": 1, "y": 4.25 }, + { "matrix": [4, 2], "x": 2, "y": 4.25 }, + { "matrix": [4, 3], "x": 3, "y": 4.25 }, { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 }, - { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 }, - { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 }, - { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 }, - { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 }, - { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 }, - { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 }, - { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 }, - { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 }, - { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 }, - { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 }, + { "matrix": [4, 5], "x": 6.75, "y": 4.25 }, + { "matrix": [4, 6], "x": 7.75, "y": 4.25 }, + { "matrix": [4, 7], "x": 8.75, "y": 4.25 }, + { "matrix": [4, 8], "x": 9.75, "y": 4.25 }, + { "matrix": [4, 9], "x": 10.75, "y": 4.25 }, + { "matrix": [4, 10], "x": 11.75, "y": 4.25 }, + { "matrix": [10, 0], "x": 12.75, "y": 4.25 }, + { "matrix": [10, 1], "x": 13.75, "y": 4.25 }, + { "matrix": [10, 2], "x": 14.75, "y": 4.25 }, + { "matrix": [10, 3], "x": 15.75, "y": 4.25 }, { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 }, - { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 }, - { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 }, - { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 }, - { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 }, - { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 }, - { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 }, - { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 }, - { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 }, - { "matrix": [5, 5], "w": 1, "x": 8.5, "y": 5.25 }, + { "matrix": [10, 5], "x": 20, "y": 4.25 }, + { "matrix": [9, 6], "x": 21, "y": 4.25 }, + { "matrix": [10, 7], "x": 22, "y": 4.25 }, + { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 }, + { "matrix": [10, 9], "x": 4.25, "y": 4.5 }, + { "matrix": [10, 10], "x": 18.75, "y": 4.5 }, + { "matrix": [5, 1], "x": 1, "y": 5.25 }, + { "matrix": [5, 2], "x": 2, "y": 5.25 }, + { "matrix": [5, 3], "x": 6.5, "y": 5.25 }, + { "matrix": [5, 4], "x": 7.5, "y": 5.25 }, + { "matrix": [5, 5], "x": 8.5, "y": 5.25 }, { "matrix": [5, 6], "w": 4, "x": 9.5, "y": 5.25 }, - { "matrix": [5, 7], "w": 1, "x": 13.5, "y": 5.25 }, - { "matrix": [5, 8], "w": 1, "x": 14.5, "y": 5.25 }, - { "matrix": [11, 0], "w": 1, "x": 15.5, "y": 5.25 }, - { "matrix": [11, 2], "w": 1, "x": 16.5, "y": 5.25 }, - { "matrix": [11, 3], "w": 1, "x": 21, "y": 5.25 }, - { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 }, - { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 }, - { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 }, - { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 }, - { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 }, - { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 }, - { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 } + { "matrix": [5, 7], "x": 13.5, "y": 5.25 }, + { "matrix": [5, 8], "x": 14.5, "y": 5.25 }, + { "matrix": [11, 0], "x": 15.5, "y": 5.25 }, + { "matrix": [11, 2], "x": 16.5, "y": 5.25 }, + { "matrix": [11, 3], "x": 21, "y": 5.25 }, + { "matrix": [11, 4], "x": 22, "y": 5.25 }, + { "matrix": [11, 5], "x": 3.25, "y": 5.5 }, + { "matrix": [10, 6], "x": 4.25, "y": 5.5 }, + { "matrix": [11, 6], "x": 5.25, "y": 5.5 }, + { "matrix": [11, 7], "x": 17.75, "y": 5.5 }, + { "matrix": [11, 8], "x": 18.75, "y": 5.5 }, + { "matrix": [11, 9], "x": 19.75, "y": 5.5 } ] }, "LAYOUT_7u_space": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4.75, "y": 0 }, + { "matrix": [0, 6], "x": 6.25, "y": 0 }, + { "matrix": [0, 7], "x": 7.25, "y": 0 }, + { "matrix": [0, 8], "x": 8.25, "y": 0 }, + { "matrix": [0, 9], "x": 9.25, "y": 0 }, + { "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "matrix": [6, 0], "x": 11.75, "y": 0 }, + { "matrix": [6, 1], "x": 12.75, "y": 0 }, + { "matrix": [6, 2], "x": 13.75, "y": 0 }, + { "matrix": [6, 3], "x": 15.25, "y": 0 }, + { "matrix": [6, 4], "x": 16.25, "y": 0 }, + { "matrix": [6, 5], "x": 17.25, "y": 0 }, + { "matrix": [6, 6], "x": 18.25, "y": 0 }, + { "matrix": [6, 7], "x": 20, "y": 0 }, + { "matrix": [6, 8], "x": 21, "y": 0 }, + { "matrix": [6, 9], "x": 22, "y": 0 }, + { "matrix": [6, 10], "x": 23, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "x": 4.5, "y": 1.25 }, + { "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "matrix": [1, 6], "x": 6.5, "y": 1.25 }, + { "matrix": [1, 7], "x": 7.5, "y": 1.25 }, + { "matrix": [1, 8], "x": 8.5, "y": 1.25 }, + { "matrix": [1, 9], "x": 9.5, "y": 1.25 }, + { "matrix": [1, 10], "x": 10.5, "y": 1.25 }, + { "matrix": [7, 0], "x": 11.5, "y": 1.25 }, + { "matrix": [7, 1], "x": 12.5, "y": 1.25 }, + { "matrix": [7, 2], "x": 13.5, "y": 1.25 }, + { "matrix": [7, 3], "x": 14.5, "y": 1.25 }, + { "matrix": [7, 4], "x": 15.5, "y": 1.25 }, + { "matrix": [7, 5], "x": 16.5, "y": 1.25 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 }, + { "matrix": [7, 7], "x": 20, "y": 1.25 }, + { "matrix": [7, 8], "x": 21, "y": 1.25 }, + { "matrix": [7, 9], "x": 22, "y": 1.25 }, + { "matrix": [7, 10], "x": 23, "y": 1.25 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "matrix": [2, 3], "x": 3, "y": 2.25 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 }, + { "matrix": [2, 5], "x": 6, "y": 2.25 }, + { "matrix": [2, 6], "x": 7, "y": 2.25 }, + { "matrix": [2, 7], "x": 8, "y": 2.25 }, + { "matrix": [2, 8], "x": 9, "y": 2.25 }, + { "matrix": [2, 9], "x": 10, "y": 2.25 }, + { "matrix": [2, 10], "x": 11, "y": 2.25 }, + { "matrix": [8, 0], "x": 12, "y": 2.25 }, + { "matrix": [8, 1], "x": 13, "y": 2.25 }, + { "matrix": [8, 2], "x": 14, "y": 2.25 }, + { "matrix": [8, 3], "x": 15, "y": 2.25 }, + { "matrix": [8, 4], "x": 16, "y": 2.25 }, + { "matrix": [8, 5], "x": 17, "y": 2.25 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 }, + { "matrix": [8, 7], "x": 20, "y": 2.25 }, + { "matrix": [8, 8], "x": 21, "y": 2.25 }, + { "matrix": [8, 9], "x": 22, "y": 2.25 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 }, + { "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "matrix": [3, 2], "x": 2, "y": 3.25 }, + { "matrix": [3, 3], "x": 3, "y": 3.25 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 }, + { "matrix": [3, 5], "x": 6.25, "y": 3.25 }, + { "matrix": [3, 6], "x": 7.25, "y": 3.25 }, + { "matrix": [3, 7], "x": 8.25, "y": 3.25 }, + { "matrix": [3, 8], "x": 9.25, "y": 3.25 }, + { "matrix": [3, 9], "x": 10.25, "y": 3.25 }, + { "matrix": [3, 10], "x": 11.25, "y": 3.25 }, + { "matrix": [9, 0], "x": 12.25, "y": 3.25 }, + { "matrix": [9, 1], "x": 13.25, "y": 3.25 }, + { "matrix": [9, 2], "x": 14.25, "y": 3.25 }, + { "matrix": [9, 3], "x": 15.25, "y": 3.25 }, + { "matrix": [9, 4], "x": 16.25, "y": 3.25 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 }, + { "matrix": [9, 7], "x": 20, "y": 3.25 }, + { "matrix": [9, 8], "x": 21, "y": 3.25 }, + { "matrix": [9, 9], "x": 22, "y": 3.25 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "x": 1, "y": 4.25 }, + { "matrix": [4, 2], "x": 2, "y": 4.25 }, + { "matrix": [4, 3], "x": 3, "y": 4.25 }, { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 }, - { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 }, - { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 }, - { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 }, - { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 }, - { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 }, - { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 }, - { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 }, - { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 }, - { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 }, - { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 }, + { "matrix": [4, 5], "x": 6.75, "y": 4.25 }, + { "matrix": [4, 6], "x": 7.75, "y": 4.25 }, + { "matrix": [4, 7], "x": 8.75, "y": 4.25 }, + { "matrix": [4, 8], "x": 9.75, "y": 4.25 }, + { "matrix": [4, 9], "x": 10.75, "y": 4.25 }, + { "matrix": [4, 10], "x": 11.75, "y": 4.25 }, + { "matrix": [10, 0], "x": 12.75, "y": 4.25 }, + { "matrix": [10, 1], "x": 13.75, "y": 4.25 }, + { "matrix": [10, 2], "x": 14.75, "y": 4.25 }, + { "matrix": [10, 3], "x": 15.75, "y": 4.25 }, { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 }, - { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 }, - { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 }, - { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 }, - { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 }, - { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 }, - { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 }, - { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 }, - { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 }, + { "matrix": [10, 5], "x": 20, "y": 4.25 }, + { "matrix": [9, 6], "x": 21, "y": 4.25 }, + { "matrix": [10, 7], "x": 22, "y": 4.25 }, + { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 }, + { "matrix": [10, 9], "x": 4.25, "y": 4.5 }, + { "matrix": [10, 10], "x": 18.75, "y": 4.5 }, + { "matrix": [5, 1], "x": 1, "y": 5.25 }, + { "matrix": [5, 2], "x": 2, "y": 5.25 }, + { "matrix": [5, 3], "x": 6.5, "y": 5.25 }, + { "matrix": [5, 4], "x": 7.5, "y": 5.25 }, { "matrix": [5, 5], "w": 7, "x": 8.5, "y": 5.25 }, - { "matrix": [5, 6], "w": 1, "x": 15.5, "y": 5.25 }, - { "matrix": [5, 7], "w": 1, "x": 16.5, "y": 5.25 }, - { "matrix": [11, 0], "w": 1, "x": 21, "y": 5.25 }, - { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 }, - { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 }, - { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 }, - { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 }, - { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 }, - { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 }, - { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 } + { "matrix": [5, 6], "x": 15.5, "y": 5.25 }, + { "matrix": [5, 7], "x": 16.5, "y": 5.25 }, + { "matrix": [11, 0], "x": 21, "y": 5.25 }, + { "matrix": [11, 4], "x": 22, "y": 5.25 }, + { "matrix": [11, 5], "x": 3.25, "y": 5.5 }, + { "matrix": [10, 6], "x": 4.25, "y": 5.5 }, + { "matrix": [11, 6], "x": 5.25, "y": 5.5 }, + { "matrix": [11, 7], "x": 17.75, "y": 5.5 }, + { "matrix": [11, 8], "x": 18.75, "y": 5.5 }, + { "matrix": [11, 9], "x": 19.75, "y": 5.5 } ] }, "LAYOUT_all": { "layout": [ - { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "PgUp", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "PgDn", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "Esc", "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 }, - { "label": "F1", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, - { "label": "F2", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, - { "label": "F3", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, - { "label": "F4", "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 }, - { "label": "F5", "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 }, - { "label": "F6", "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 }, - { "label": "F7", "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 }, - { "label": "F8", "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 }, - { "label": "F9", "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 }, - { "label": "F10", "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 }, - { "label": "F11", "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 }, - { "label": "F12", "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 }, - { "label": "PrtSc", "matrix": [6, 7], "w": 1, "x": 20, "y": 0 }, - { "label": "Scroll Lock", "matrix": [6, 8], "w": 1, "x": 21, "y": 0 }, - { "label": "Pause", "matrix": [6, 9], "w": 1, "x": 22, "y": 0 }, - { "label": "Insert", "matrix": [6, 10], "w": 1, "x": 23, "y": 0 }, - { "label": "-", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 }, - { "label": "Num Lock", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 }, - { "label": "/", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 }, - { "label": "*", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 }, - { "label": "~", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 }, - { "label": "!", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "@", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 }, - { "label": "#", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 }, - { "label": "$", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 }, - { "label": "%", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 }, - { "label": "^", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "&", "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 }, - { "label": "*", "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 }, - { "label": "(", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 }, - { "label": ")", "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 }, - { "label": "_", "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 }, - { "label": "+", "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 }, + { "label": "Home", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "End", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "PgUp", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "PgDn", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "Esc", "matrix": [0, 4], "x": 4.75, "y": 0 }, + { "label": "F1", "matrix": [0, 6], "x": 6.25, "y": 0 }, + { "label": "F2", "matrix": [0, 7], "x": 7.25, "y": 0 }, + { "label": "F3", "matrix": [0, 8], "x": 8.25, "y": 0 }, + { "label": "F4", "matrix": [0, 9], "x": 9.25, "y": 0 }, + { "label": "F5", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F6", "matrix": [6, 0], "x": 11.75, "y": 0 }, + { "label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0 }, + { "label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0 }, + { "label": "F9", "matrix": [6, 3], "x": 15.25, "y": 0 }, + { "label": "F10", "matrix": [6, 4], "x": 16.25, "y": 0 }, + { "label": "F11", "matrix": [6, 5], "x": 17.25, "y": 0 }, + { "label": "F12", "matrix": [6, 6], "x": 18.25, "y": 0 }, + { "label": "PrtSc", "matrix": [6, 7], "x": 20, "y": 0 }, + { "label": "Scroll Lock", "matrix": [6, 8], "x": 21, "y": 0 }, + { "label": "Pause", "matrix": [6, 9], "x": 22, "y": 0 }, + { "label": "Insert", "matrix": [6, 10], "x": 23, "y": 0 }, + { "label": "-", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "Num Lock", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "/", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "*", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "~", "matrix": [1, 4], "x": 4.5, "y": 1.25 }, + { "label": "!", "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "label": "@", "matrix": [1, 6], "x": 6.5, "y": 1.25 }, + { "label": "#", "matrix": [1, 7], "x": 7.5, "y": 1.25 }, + { "label": "$", "matrix": [1, 8], "x": 8.5, "y": 1.25 }, + { "label": "%", "matrix": [1, 9], "x": 9.5, "y": 1.25 }, + { "label": "^", "matrix": [1, 10], "x": 10.5, "y": 1.25 }, + { "label": "&", "matrix": [7, 0], "x": 11.5, "y": 1.25 }, + { "label": "*", "matrix": [7, 1], "x": 12.5, "y": 1.25 }, + { "label": "(", "matrix": [7, 2], "x": 13.5, "y": 1.25 }, + { "label": ")", "matrix": [7, 3], "x": 14.5, "y": 1.25 }, + { "label": "_", "matrix": [7, 4], "x": 15.5, "y": 1.25 }, + { "label": "+", "matrix": [7, 5], "x": 16.5, "y": 1.25 }, { "label": "Backspace", "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 }, - { "label": "Num Lock", "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 }, - { "label": "/", "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 }, - { "label": "*", "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 }, - { "label": "-", "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 }, - { "h": 2, "label": "+", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 }, - { "label": "7", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 }, - { "label": "8", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 }, - { "label": "9", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 }, + { "label": "Num Lock", "matrix": [7, 7], "x": 20, "y": 1.25 }, + { "label": "/", "matrix": [7, 8], "x": 21, "y": 1.25 }, + { "label": "*", "matrix": [7, 9], "x": 22, "y": 1.25 }, + { "label": "-", "matrix": [7, 10], "x": 23, "y": 1.25 }, + { "h": 2, "label": "+", "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "label": "7", "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "label": "8", "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "label": "9", "matrix": [2, 3], "x": 3, "y": 2.25 }, { "label": "Tab", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 }, - { "label": "Q", "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 }, - { "label": "W", "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 }, - { "label": "E", "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 }, - { "label": "R", "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 }, - { "label": "T", "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 }, - { "label": "Y", "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 }, - { "label": "U", "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 }, - { "label": "I", "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 }, - { "label": "O", "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 }, - { "label": "P", "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 }, - { "label": "{", "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 }, - { "label": "}", "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 }, + { "label": "Q", "matrix": [2, 5], "x": 6, "y": 2.25 }, + { "label": "W", "matrix": [2, 6], "x": 7, "y": 2.25 }, + { "label": "E", "matrix": [2, 7], "x": 8, "y": 2.25 }, + { "label": "R", "matrix": [2, 8], "x": 9, "y": 2.25 }, + { "label": "T", "matrix": [2, 9], "x": 10, "y": 2.25 }, + { "label": "Y", "matrix": [2, 10], "x": 11, "y": 2.25 }, + { "label": "U", "matrix": [8, 0], "x": 12, "y": 2.25 }, + { "label": "I", "matrix": [8, 1], "x": 13, "y": 2.25 }, + { "label": "O", "matrix": [8, 2], "x": 14, "y": 2.25 }, + { "label": "P", "matrix": [8, 3], "x": 15, "y": 2.25 }, + { "label": "{", "matrix": [8, 4], "x": 16, "y": 2.25 }, + { "label": "}", "matrix": [8, 5], "x": 17, "y": 2.25 }, { "label": "|", "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 }, - { "label": "7", "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 }, - { "label": "8", "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 }, - { "label": "9", "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 }, - { "h": 2, "label": "+", "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 }, - { "label": "4", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 }, - { "label": "5", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 }, - { "label": "6", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 }, + { "label": "7", "matrix": [8, 7], "x": 20, "y": 2.25 }, + { "label": "8", "matrix": [8, 8], "x": 21, "y": 2.25 }, + { "label": "9", "matrix": [8, 9], "x": 22, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 10], "x": 23, "y": 2.25 }, + { "label": "4", "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "label": "5", "matrix": [3, 2], "x": 2, "y": 3.25 }, + { "label": "6", "matrix": [3, 3], "x": 3, "y": 3.25 }, { "label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 }, - { "label": "A", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 }, - { "label": "S", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 }, - { "label": "D", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 }, - { "label": "F", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 }, - { "label": "G", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 }, - { "label": "H", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 }, - { "label": "J", "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 }, - { "label": "K", "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 }, - { "label": "L", "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 }, - { "label": ":", "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 }, - { "label": "\"", "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 }, + { "label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.25 }, + { "label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.25 }, + { "label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.25 }, + { "label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.25 }, + { "label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.25 }, + { "label": "H", "matrix": [3, 10], "x": 11.25, "y": 3.25 }, + { "label": "J", "matrix": [9, 0], "x": 12.25, "y": 3.25 }, + { "label": "K", "matrix": [9, 1], "x": 13.25, "y": 3.25 }, + { "label": "L", "matrix": [9, 2], "x": 14.25, "y": 3.25 }, + { "label": ":", "matrix": [9, 3], "x": 15.25, "y": 3.25 }, + { "label": "\"", "matrix": [9, 4], "x": 16.25, "y": 3.25 }, { "label": "Enter", "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 }, - { "label": "4", "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 }, - { "label": "5", "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 }, - { "label": "6", "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 }, - { "h": 2, "label": "Enter", "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 }, - { "label": "1", "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 }, - { "label": "2", "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 }, - { "label": "3", "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 }, - { "label": "\\u2191", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 }, + { "label": "4", "matrix": [9, 7], "x": 20, "y": 3.25 }, + { "label": "5", "matrix": [9, 8], "x": 21, "y": 3.25 }, + { "label": "6", "matrix": [9, 9], "x": 22, "y": 3.25 }, + { "h": 2, "label": "Enter", "matrix": [4, 0], "x": 0, "y": 4.25 }, + { "label": "1", "matrix": [4, 1], "x": 1, "y": 4.25 }, + { "label": "2", "matrix": [4, 2], "x": 2, "y": 4.25 }, + { "label": "3", "matrix": [4, 3], "x": 3, "y": 4.25 }, + { "label": "\\u2191", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.25 }, - { "label": "Z", "matrix": [4, 6], "w": 1, "x": 6.75, "y": 4.25 }, - { "label": "X", "matrix": [4, 7], "w": 1, "x": 7.75, "y": 4.25 }, - { "label": "C", "matrix": [4, 8], "w": 1, "x": 8.75, "y": 4.25 }, - { "label": "V", "matrix": [4, 9], "w": 1, "x": 9.75, "y": 4.25 }, - { "label": "B", "matrix": [4, 10], "w": 1, "x": 10.75, "y": 4.25 }, - { "label": "N", "matrix": [10, 0], "w": 1, "x": 11.75, "y": 4.25 }, - { "label": "M", "matrix": [10, 1], "w": 1, "x": 12.75, "y": 4.25 }, - { "label": "<", "matrix": [10, 2], "w": 1, "x": 13.75, "y": 4.25 }, - { "label": ">", "matrix": [10, 3], "w": 1, "x": 14.75, "y": 4.25 }, - { "label": "?", "matrix": [10, 4], "w": 1, "x": 15.75, "y": 4.25 }, + { "label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.25 }, + { "label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.25 }, + { "label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.25 }, + { "label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.25 }, + { "label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.25 }, + { "label": "N", "matrix": [10, 0], "x": 11.75, "y": 4.25 }, + { "label": "M", "matrix": [10, 1], "x": 12.75, "y": 4.25 }, + { "label": "<", "matrix": [10, 2], "x": 13.75, "y": 4.25 }, + { "label": ">", "matrix": [10, 3], "x": 14.75, "y": 4.25 }, + { "label": "?", "matrix": [10, 4], "x": 15.75, "y": 4.25 }, { "label": "Shift", "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 4.25 }, - { "label": "\\u2191", "matrix": [9, 6], "w": 1, "x": 18.75, "y": 4.5 }, - { "label": "1", "matrix": [10, 7], "w": 1, "x": 20, "y": 4.25 }, - { "label": "2", "matrix": [10, 8], "w": 1, "x": 21, "y": 4.25 }, - { "label": "3", "matrix": [10, 9], "w": 1, "x": 22, "y": 4.25 }, - { "h": 2, "label": "Enter", "matrix": [10, 10], "w": 1, "x": 23, "y": 4.25 }, - { "label": "0", "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 }, - { "label": ".", "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 }, - { "label": "\\u2190", "matrix": [5, 3], "w": 1, "x": 3.25, "y": 5.5 }, - { "label": "\\u2193", "matrix": [5, 4], "w": 1, "x": 4.25, "y": 5.5 }, - { "label": "\\u2192", "matrix": [5, 5], "w": 1, "x": 5.25, "y": 5.5 }, - { "label": "Ctrl", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 5.25 }, - { "label": "Win", "matrix": [5, 7], "w": 1, "x": 7.5, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 8], "w": 1, "x": 8.5, "y": 5.25 }, - { "label": "1u", "matrix": [5, 9], "w": 1, "x": 9.5, "y": 5.25 }, - { "label": "1u", "matrix": [5, 10], "w": 1, "x": 10.5, "y": 5.25 }, - { "label": "1u", "matrix": [11, 0], "w": 1, "x": 11.5, "y": 5.25 }, - { "label": "1u", "matrix": [11, 1], "w": 1, "x": 12.5, "y": 5.25 }, - { "label": "Alt", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 5.25 }, - { "label": "Win", "matrix": [11, 3], "w": 1, "x": 14.5, "y": 5.25 }, - { "label": "Menu", "matrix": [11, 4], "w": 1, "x": 15.5, "y": 5.25 }, - { "label": "Ctrl", "matrix": [11, 5], "w": 1, "x": 16.5, "y": 5.25 }, - { "label": "\\u2190", "matrix": [10, 6], "w": 1, "x": 17.75, "y": 5.5 }, - { "label": "\\u2193", "matrix": [11, 6], "w": 1, "x": 18.75, "y": 5.5 }, - { "label": "\\u2192", "matrix": [11, 7], "w": 1, "x": 19.75, "y": 5.5 }, - { "label": "0", "matrix": [11, 8], "w": 1, "x": 21, "y": 5.25 }, - { "label": ".", "matrix": [11, 9], "w": 1, "x": 22, "y": 5.25 } + { "label": "\\u2191", "matrix": [9, 6], "x": 18.75, "y": 4.5 }, + { "label": "1", "matrix": [10, 7], "x": 20, "y": 4.25 }, + { "label": "2", "matrix": [10, 8], "x": 21, "y": 4.25 }, + { "label": "3", "matrix": [10, 9], "x": 22, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [10, 10], "x": 23, "y": 4.25 }, + { "label": "0", "matrix": [5, 1], "x": 1, "y": 5.25 }, + { "label": ".", "matrix": [5, 2], "x": 2, "y": 5.25 }, + { "label": "\\u2190", "matrix": [5, 3], "x": 3.25, "y": 5.5 }, + { "label": "\\u2193", "matrix": [5, 4], "x": 4.25, "y": 5.5 }, + { "label": "\\u2192", "matrix": [5, 5], "x": 5.25, "y": 5.5 }, + { "label": "Ctrl", "matrix": [5, 6], "x": 6.5, "y": 5.25 }, + { "label": "Win", "matrix": [5, 7], "x": 7.5, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 8], "x": 8.5, "y": 5.25 }, + { "label": "1u", "matrix": [5, 9], "x": 9.5, "y": 5.25 }, + { "label": "1u", "matrix": [5, 10], "x": 10.5, "y": 5.25 }, + { "label": "1u", "matrix": [11, 0], "x": 11.5, "y": 5.25 }, + { "label": "1u", "matrix": [11, 1], "x": 12.5, "y": 5.25 }, + { "label": "Alt", "matrix": [11, 2], "x": 13.5, "y": 5.25 }, + { "label": "Win", "matrix": [11, 3], "x": 14.5, "y": 5.25 }, + { "label": "Menu", "matrix": [11, 4], "x": 15.5, "y": 5.25 }, + { "label": "Ctrl", "matrix": [11, 5], "x": 16.5, "y": 5.25 }, + { "label": "\\u2190", "matrix": [10, 6], "x": 17.75, "y": 5.5 }, + { "label": "\\u2193", "matrix": [11, 6], "x": 18.75, "y": 5.5 }, + { "label": "\\u2192", "matrix": [11, 7], "x": 19.75, "y": 5.5 }, + { "label": "0", "matrix": [11, 8], "x": 21, "y": 5.25 }, + { "label": ".", "matrix": [11, 9], "x": 22, "y": 5.25 } ] } } diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json index 0eebbabb6d..f2922a239a 100644 --- a/keyboards/clueboard/2x1800/2019/info.json +++ b/keyboards/clueboard/2x1800/2019/info.json @@ -41,1198 +41,1198 @@ "layouts": { "LAYOUT_1u_ansi": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, - { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 }, - { "matrix": [5, 10], "w": 1, "x": 10.5, "y": 6.75 }, - { "matrix": [11, 0], "w": 1, "x": 11.5, "y": 6.75 }, - { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, + { "matrix": [5, 9], "x": 9.5, "y": 6.75 }, + { "matrix": [5, 10], "x": 10.5, "y": 6.75 }, + { "matrix": [11, 0], "x": 11.5, "y": 6.75 }, + { "matrix": [11, 1], "x": 12.5, "y": 6.75 }, + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_1u_iso": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, - { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, + { "matrix": [9, 10], "x": 17.25, "y": 4.75 }, { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, - { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 }, - { "matrix": [5, 10], "w": 1, "x": 10.5, "y": 6.75 }, - { "matrix": [11, 0], "w": 1, "x": 11.5, "y": 6.75 }, - { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, + { "matrix": [5, 9], "x": 9.5, "y": 6.75 }, + { "matrix": [5, 10], "x": 10.5, "y": 6.75 }, + { "matrix": [11, 0], "x": 11.5, "y": 6.75 }, + { "matrix": [11, 1], "x": 12.5, "y": 6.75 }, + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_2u_ansi": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, - { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 }, + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, + { "matrix": [5, 9], "x": 9.5, "y": 6.75 }, { "matrix": [11, 0], "w": 2, "x": 10.5, "y": 6.75 }, - { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [11, 1], "x": 12.5, "y": 6.75 }, + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_2u_iso": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, - { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, + { "matrix": [9, 10], "x": 17.25, "y": 4.75 }, { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, - { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 }, + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, + { "matrix": [5, 9], "x": 9.5, "y": 6.75 }, { "matrix": [11, 0], "w": 2, "x": 10.5, "y": 6.75 }, - { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [11, 1], "x": 12.5, "y": 6.75 }, + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_4u_ansi": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, { "matrix": [11, 0], "w": 4, "x": 9.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_4u_iso": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, - { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, + { "matrix": [9, 10], "x": 17.25, "y": 4.75 }, { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, { "matrix": [11, 0], "w": 4, "x": 9.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_7u_ansi": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, { "matrix": [11, 0], "w": 7, "x": 8.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_7u_iso": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, - { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, + { "matrix": [9, 10], "x": 17.25, "y": 4.75 }, { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, { "matrix": [11, 0], "w": 7, "x": 8.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] }, "LAYOUT_all": { "layout": [ - { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 }, - { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 }, - { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 }, + { "matrix": [12, 3], "x": 3, "y": 0 }, + { "matrix": [12, 4], "x": 4, "y": 0 }, + { "matrix": [12, 9], "x": 19, "y": 0 }, + { "matrix": [12, 10], "x": 20, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 1.5 }, + { "matrix": [0, 1], "x": 1, "y": 1.5 }, + { "matrix": [0, 2], "x": 2, "y": 1.5 }, + { "matrix": [0, 3], "x": 3, "y": 1.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 1.5 }, + { "matrix": [0, 6], "x": 6.25, "y": 1.5 }, + { "matrix": [0, 7], "x": 7.25, "y": 1.5 }, + { "matrix": [0, 8], "x": 8.25, "y": 1.5 }, + { "matrix": [0, 9], "x": 9.25, "y": 1.5 }, + { "matrix": [0, 10], "x": 10.75, "y": 1.5 }, + { "matrix": [6, 0], "x": 11.75, "y": 1.5 }, + { "matrix": [6, 1], "x": 12.75, "y": 1.5 }, + { "matrix": [6, 2], "x": 13.75, "y": 1.5 }, + { "matrix": [6, 3], "x": 15.25, "y": 1.5 }, + { "matrix": [6, 4], "x": 16.25, "y": 1.5 }, + { "matrix": [6, 5], "x": 17.25, "y": 1.5 }, + { "matrix": [6, 6], "x": 18.25, "y": 1.5 }, + { "matrix": [6, 7], "x": 20, "y": 1.5 }, + { "matrix": [6, 8], "x": 21, "y": 1.5 }, + { "matrix": [6, 9], "x": 22, "y": 1.5 }, + { "matrix": [6, 10], "x": 23, "y": 1.5 }, + { "matrix": [1, 0], "x": 0, "y": 2.75 }, + { "matrix": [1, 1], "x": 1, "y": 2.75 }, + { "matrix": [1, 2], "x": 2, "y": 2.75 }, + { "matrix": [1, 3], "x": 3, "y": 2.75 }, + { "matrix": [1, 4], "x": 4.5, "y": 2.75 }, + { "matrix": [1, 5], "x": 5.5, "y": 2.75 }, + { "matrix": [1, 6], "x": 6.5, "y": 2.75 }, + { "matrix": [1, 7], "x": 7.5, "y": 2.75 }, + { "matrix": [1, 8], "x": 8.5, "y": 2.75 }, + { "matrix": [1, 9], "x": 9.5, "y": 2.75 }, + { "matrix": [1, 10], "x": 10.5, "y": 2.75 }, + { "matrix": [7, 0], "x": 11.5, "y": 2.75 }, + { "matrix": [7, 1], "x": 12.5, "y": 2.75 }, + { "matrix": [7, 2], "x": 13.5, "y": 2.75 }, + { "matrix": [7, 3], "x": 14.5, "y": 2.75 }, + { "matrix": [7, 4], "x": 15.5, "y": 2.75 }, + { "matrix": [7, 5], "x": 16.5, "y": 2.75 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 }, + { "matrix": [7, 7], "x": 20, "y": 2.75 }, + { "matrix": [7, 8], "x": 21, "y": 2.75 }, + { "matrix": [7, 9], "x": 22, "y": 2.75 }, + { "matrix": [7, 10], "x": 23, "y": 2.75 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 }, + { "matrix": [2, 1], "x": 1, "y": 3.75 }, + { "matrix": [2, 2], "x": 2, "y": 3.75 }, + { "matrix": [2, 3], "x": 3, "y": 3.75 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 }, + { "matrix": [2, 5], "x": 6, "y": 3.75 }, + { "matrix": [2, 6], "x": 7, "y": 3.75 }, + { "matrix": [2, 7], "x": 8, "y": 3.75 }, + { "matrix": [2, 8], "x": 9, "y": 3.75 }, + { "matrix": [2, 9], "x": 10, "y": 3.75 }, + { "matrix": [2, 10], "x": 11, "y": 3.75 }, + { "matrix": [8, 0], "x": 12, "y": 3.75 }, + { "matrix": [8, 1], "x": 13, "y": 3.75 }, + { "matrix": [8, 2], "x": 14, "y": 3.75 }, + { "matrix": [8, 3], "x": 15, "y": 3.75 }, + { "matrix": [8, 4], "x": 16, "y": 3.75 }, + { "matrix": [8, 5], "x": 17, "y": 3.75 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 }, + { "matrix": [8, 7], "x": 20, "y": 3.75 }, + { "matrix": [8, 8], "x": 21, "y": 3.75 }, + { "matrix": [8, 9], "x": 22, "y": 3.75 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 }, + { "matrix": [3, 1], "x": 1, "y": 4.75 }, + { "matrix": [3, 2], "x": 2, "y": 4.75 }, + { "matrix": [3, 3], "x": 3, "y": 4.75 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 }, - { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 }, + { "matrix": [3, 5], "x": 6.25, "y": 4.75 }, + { "matrix": [3, 6], "x": 7.25, "y": 4.75 }, + { "matrix": [3, 7], "x": 8.25, "y": 4.75 }, + { "matrix": [3, 8], "x": 9.25, "y": 4.75 }, + { "matrix": [3, 9], "x": 10.25, "y": 4.75 }, + { "matrix": [3, 10], "x": 11.25, "y": 4.75 }, + { "matrix": [9, 0], "x": 12.25, "y": 4.75 }, + { "matrix": [9, 1], "x": 13.25, "y": 4.75 }, + { "matrix": [9, 2], "x": 14.25, "y": 4.75 }, + { "matrix": [9, 3], "x": 15.25, "y": 4.75 }, + { "matrix": [9, 4], "x": 16.25, "y": 4.75 }, + { "matrix": [9, 10], "x": 17.25, "y": 4.75 }, { "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 4.75 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 }, - { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 }, + { "matrix": [9, 7], "x": 20, "y": 4.75 }, + { "matrix": [9, 8], "x": 21, "y": 4.75 }, + { "matrix": [9, 9], "x": 22, "y": 4.75 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 }, + { "matrix": [4, 1], "x": 1, "y": 5.75 }, + { "matrix": [4, 2], "x": 2, "y": 5.75 }, + { "matrix": [4, 3], "x": 3, "y": 5.75 }, + { "matrix": [4, 4], "x": 4.25, "y": 6 }, { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 }, - { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 }, - { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 }, - { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 }, - { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 }, - { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 }, - { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 }, - { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 }, - { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 }, - { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 }, - { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 }, + { "matrix": [4, 6], "x": 6.75, "y": 5.75 }, + { "matrix": [4, 7], "x": 7.75, "y": 5.75 }, + { "matrix": [4, 8], "x": 8.75, "y": 5.75 }, + { "matrix": [4, 9], "x": 9.75, "y": 5.75 }, + { "matrix": [4, 10], "x": 10.75, "y": 5.75 }, + { "matrix": [10, 0], "x": 11.75, "y": 5.75 }, + { "matrix": [10, 1], "x": 12.75, "y": 5.75 }, + { "matrix": [10, 2], "x": 13.75, "y": 5.75 }, + { "matrix": [10, 3], "x": 14.75, "y": 5.75 }, + { "matrix": [10, 4], "x": 15.75, "y": 5.75 }, { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 }, - { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 }, - { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 }, - { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 }, - { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 }, - { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 }, - { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 }, - { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 }, - { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 }, - { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 }, - { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 }, - { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 }, - { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 }, - { "matrix": [5, 10], "w": 1, "x": 10.5, "y": 6.75 }, - { "matrix": [11, 0], "w": 1, "x": 11.5, "y": 6.75 }, - { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 }, - { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 }, - { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 }, - { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 }, - { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 }, - { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 }, - { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 }, - { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 }, - { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 }, - { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 } + { "matrix": [9, 6], "x": 18.75, "y": 6 }, + { "matrix": [10, 7], "x": 20, "y": 5.75 }, + { "matrix": [10, 8], "x": 21, "y": 5.75 }, + { "matrix": [10, 9], "x": 22, "y": 5.75 }, + { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 }, + { "matrix": [5, 1], "x": 1, "y": 6.75 }, + { "matrix": [5, 2], "x": 2, "y": 6.75 }, + { "matrix": [5, 3], "x": 3.25, "y": 7 }, + { "matrix": [5, 4], "x": 4.25, "y": 7 }, + { "matrix": [5, 5], "x": 5.25, "y": 7 }, + { "matrix": [5, 6], "x": 6.5, "y": 6.75 }, + { "matrix": [5, 7], "x": 7.5, "y": 6.75 }, + { "matrix": [5, 8], "x": 8.5, "y": 6.75 }, + { "matrix": [5, 9], "x": 9.5, "y": 6.75 }, + { "matrix": [5, 10], "x": 10.5, "y": 6.75 }, + { "matrix": [11, 0], "x": 11.5, "y": 6.75 }, + { "matrix": [11, 1], "x": 12.5, "y": 6.75 }, + { "matrix": [11, 2], "x": 13.5, "y": 6.75 }, + { "matrix": [11, 3], "x": 14.5, "y": 6.75 }, + { "matrix": [11, 4], "x": 15.5, "y": 6.75 }, + { "matrix": [11, 5], "x": 16.5, "y": 6.75 }, + { "matrix": [10, 6], "x": 17.75, "y": 7 }, + { "matrix": [11, 6], "x": 18.75, "y": 7 }, + { "matrix": [11, 7], "x": 19.75, "y": 7 }, + { "matrix": [11, 8], "x": 21, "y": 6.75 }, + { "matrix": [11, 9], "x": 22, "y": 6.75 } ] } } diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/info.json index 44842c0e16..3565fba938 100644 --- a/keyboards/clueboard/2x1800/2021/info.json +++ b/keyboards/clueboard/2x1800/2021/info.json @@ -38,386 +38,386 @@ "layouts": { "LAYOUT_4u_space": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4.75, "y": 0 }, + { "matrix": [0, 6], "x": 6.25, "y": 0 }, + { "matrix": [0, 7], "x": 7.25, "y": 0 }, + { "matrix": [0, 8], "x": 8.25, "y": 0 }, + { "matrix": [0, 9], "x": 9.25, "y": 0 }, + { "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "matrix": [6, 0], "x": 11.75, "y": 0 }, + { "matrix": [6, 1], "x": 12.75, "y": 0 }, + { "matrix": [6, 2], "x": 13.75, "y": 0 }, + { "matrix": [6, 3], "x": 15.25, "y": 0 }, + { "matrix": [6, 4], "x": 16.25, "y": 0 }, + { "matrix": [6, 5], "x": 17.25, "y": 0 }, + { "matrix": [6, 6], "x": 18.25, "y": 0 }, + { "matrix": [6, 7], "x": 20, "y": 0 }, + { "matrix": [6, 8], "x": 21, "y": 0 }, + { "matrix": [6, 9], "x": 22, "y": 0 }, + { "matrix": [6, 10], "x": 23, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "x": 4.5, "y": 1.25 }, + { "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "matrix": [1, 6], "x": 6.5, "y": 1.25 }, + { "matrix": [1, 7], "x": 7.5, "y": 1.25 }, + { "matrix": [1, 8], "x": 8.5, "y": 1.25 }, + { "matrix": [1, 9], "x": 9.5, "y": 1.25 }, + { "matrix": [1, 10], "x": 10.5, "y": 1.25 }, + { "matrix": [7, 0], "x": 11.5, "y": 1.25 }, + { "matrix": [7, 1], "x": 12.5, "y": 1.25 }, + { "matrix": [7, 2], "x": 13.5, "y": 1.25 }, + { "matrix": [7, 3], "x": 14.5, "y": 1.25 }, + { "matrix": [7, 4], "x": 15.5, "y": 1.25 }, + { "matrix": [7, 5], "x": 16.5, "y": 1.25 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 }, + { "matrix": [7, 7], "x": 20, "y": 1.25 }, + { "matrix": [7, 8], "x": 21, "y": 1.25 }, + { "matrix": [7, 9], "x": 22, "y": 1.25 }, + { "matrix": [7, 10], "x": 23, "y": 1.25 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "matrix": [2, 3], "x": 3, "y": 2.25 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 }, + { "matrix": [2, 5], "x": 6, "y": 2.25 }, + { "matrix": [2, 6], "x": 7, "y": 2.25 }, + { "matrix": [2, 7], "x": 8, "y": 2.25 }, + { "matrix": [2, 8], "x": 9, "y": 2.25 }, + { "matrix": [2, 9], "x": 10, "y": 2.25 }, + { "matrix": [2, 10], "x": 11, "y": 2.25 }, + { "matrix": [8, 0], "x": 12, "y": 2.25 }, + { "matrix": [8, 1], "x": 13, "y": 2.25 }, + { "matrix": [8, 2], "x": 14, "y": 2.25 }, + { "matrix": [8, 3], "x": 15, "y": 2.25 }, + { "matrix": [8, 4], "x": 16, "y": 2.25 }, + { "matrix": [8, 5], "x": 17, "y": 2.25 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 }, + { "matrix": [8, 7], "x": 20, "y": 2.25 }, + { "matrix": [8, 8], "x": 21, "y": 2.25 }, + { "matrix": [8, 9], "x": 22, "y": 2.25 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 }, + { "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "matrix": [3, 2], "x": 2, "y": 3.25 }, + { "matrix": [3, 3], "x": 3, "y": 3.25 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 }, + { "matrix": [3, 5], "x": 6.25, "y": 3.25 }, + { "matrix": [3, 6], "x": 7.25, "y": 3.25 }, + { "matrix": [3, 7], "x": 8.25, "y": 3.25 }, + { "matrix": [3, 8], "x": 9.25, "y": 3.25 }, + { "matrix": [3, 9], "x": 10.25, "y": 3.25 }, + { "matrix": [3, 10], "x": 11.25, "y": 3.25 }, + { "matrix": [9, 0], "x": 12.25, "y": 3.25 }, + { "matrix": [9, 1], "x": 13.25, "y": 3.25 }, + { "matrix": [9, 2], "x": 14.25, "y": 3.25 }, + { "matrix": [9, 3], "x": 15.25, "y": 3.25 }, + { "matrix": [9, 4], "x": 16.25, "y": 3.25 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 }, + { "matrix": [9, 7], "x": 20, "y": 3.25 }, + { "matrix": [9, 8], "x": 21, "y": 3.25 }, + { "matrix": [9, 9], "x": 22, "y": 3.25 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "x": 1, "y": 4.25 }, + { "matrix": [4, 2], "x": 2, "y": 4.25 }, + { "matrix": [4, 3], "x": 3, "y": 4.25 }, { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 }, - { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 }, - { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 }, - { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 }, - { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 }, - { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 }, - { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 }, - { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 }, - { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 }, - { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 }, - { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 }, + { "matrix": [4, 5], "x": 6.75, "y": 4.25 }, + { "matrix": [4, 6], "x": 7.75, "y": 4.25 }, + { "matrix": [4, 7], "x": 8.75, "y": 4.25 }, + { "matrix": [4, 8], "x": 9.75, "y": 4.25 }, + { "matrix": [4, 9], "x": 10.75, "y": 4.25 }, + { "matrix": [4, 10], "x": 11.75, "y": 4.25 }, + { "matrix": [10, 0], "x": 12.75, "y": 4.25 }, + { "matrix": [10, 1], "x": 13.75, "y": 4.25 }, + { "matrix": [10, 2], "x": 14.75, "y": 4.25 }, + { "matrix": [10, 3], "x": 15.75, "y": 4.25 }, { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 }, - { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 }, - { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 }, - { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 }, - { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 }, - { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 }, - { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 }, - { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 }, - { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 }, - { "matrix": [5, 5], "w": 1, "x": 8.5, "y": 5.25 }, + { "matrix": [10, 5], "x": 20, "y": 4.25 }, + { "matrix": [9, 6], "x": 21, "y": 4.25 }, + { "matrix": [10, 7], "x": 22, "y": 4.25 }, + { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 }, + { "matrix": [10, 9], "x": 4.25, "y": 4.5 }, + { "matrix": [10, 10], "x": 18.75, "y": 4.5 }, + { "matrix": [5, 1], "x": 1, "y": 5.25 }, + { "matrix": [5, 2], "x": 2, "y": 5.25 }, + { "matrix": [5, 3], "x": 6.5, "y": 5.25 }, + { "matrix": [5, 4], "x": 7.5, "y": 5.25 }, + { "matrix": [5, 5], "x": 8.5, "y": 5.25 }, { "matrix": [5, 6], "w": 4, "x": 9.5, "y": 5.25 }, - { "matrix": [5, 7], "w": 1, "x": 13.5, "y": 5.25 }, - { "matrix": [5, 8], "w": 1, "x": 14.5, "y": 5.25 }, - { "matrix": [11, 0], "w": 1, "x": 15.5, "y": 5.25 }, - { "matrix": [11, 2], "w": 1, "x": 16.5, "y": 5.25 }, - { "matrix": [11, 3], "w": 1, "x": 21, "y": 5.25 }, - { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 }, - { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 }, - { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 }, - { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 }, - { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 }, - { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 }, - { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 } + { "matrix": [5, 7], "x": 13.5, "y": 5.25 }, + { "matrix": [5, 8], "x": 14.5, "y": 5.25 }, + { "matrix": [11, 0], "x": 15.5, "y": 5.25 }, + { "matrix": [11, 2], "x": 16.5, "y": 5.25 }, + { "matrix": [11, 3], "x": 21, "y": 5.25 }, + { "matrix": [11, 4], "x": 22, "y": 5.25 }, + { "matrix": [11, 5], "x": 3.25, "y": 5.5 }, + { "matrix": [10, 6], "x": 4.25, "y": 5.5 }, + { "matrix": [11, 6], "x": 5.25, "y": 5.5 }, + { "matrix": [11, 7], "x": 17.75, "y": 5.5 }, + { "matrix": [11, 8], "x": 18.75, "y": 5.5 }, + { "matrix": [11, 9], "x": 19.75, "y": 5.5 } ] }, "LAYOUT_7u_space": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 }, - { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 }, - { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 }, - { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 }, - { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 }, - { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 }, - { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 }, - { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 }, - { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 }, - { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 }, - { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 }, - { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 }, - { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 }, - { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 }, - { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 }, - { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 }, - { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 }, - { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 }, - { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 }, - { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 }, - { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 }, - { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4.75, "y": 0 }, + { "matrix": [0, 6], "x": 6.25, "y": 0 }, + { "matrix": [0, 7], "x": 7.25, "y": 0 }, + { "matrix": [0, 8], "x": 8.25, "y": 0 }, + { "matrix": [0, 9], "x": 9.25, "y": 0 }, + { "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "matrix": [6, 0], "x": 11.75, "y": 0 }, + { "matrix": [6, 1], "x": 12.75, "y": 0 }, + { "matrix": [6, 2], "x": 13.75, "y": 0 }, + { "matrix": [6, 3], "x": 15.25, "y": 0 }, + { "matrix": [6, 4], "x": 16.25, "y": 0 }, + { "matrix": [6, 5], "x": 17.25, "y": 0 }, + { "matrix": [6, 6], "x": 18.25, "y": 0 }, + { "matrix": [6, 7], "x": 20, "y": 0 }, + { "matrix": [6, 8], "x": 21, "y": 0 }, + { "matrix": [6, 9], "x": 22, "y": 0 }, + { "matrix": [6, 10], "x": 23, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "x": 4.5, "y": 1.25 }, + { "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "matrix": [1, 6], "x": 6.5, "y": 1.25 }, + { "matrix": [1, 7], "x": 7.5, "y": 1.25 }, + { "matrix": [1, 8], "x": 8.5, "y": 1.25 }, + { "matrix": [1, 9], "x": 9.5, "y": 1.25 }, + { "matrix": [1, 10], "x": 10.5, "y": 1.25 }, + { "matrix": [7, 0], "x": 11.5, "y": 1.25 }, + { "matrix": [7, 1], "x": 12.5, "y": 1.25 }, + { "matrix": [7, 2], "x": 13.5, "y": 1.25 }, + { "matrix": [7, 3], "x": 14.5, "y": 1.25 }, + { "matrix": [7, 4], "x": 15.5, "y": 1.25 }, + { "matrix": [7, 5], "x": 16.5, "y": 1.25 }, { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 }, - { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 }, - { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 }, - { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 }, - { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 }, - { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 }, - { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 }, - { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 }, - { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 }, + { "matrix": [7, 7], "x": 20, "y": 1.25 }, + { "matrix": [7, 8], "x": 21, "y": 1.25 }, + { "matrix": [7, 9], "x": 22, "y": 1.25 }, + { "matrix": [7, 10], "x": 23, "y": 1.25 }, + { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "matrix": [2, 3], "x": 3, "y": 2.25 }, { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 }, - { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 }, - { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 }, - { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 }, - { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 }, - { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 }, - { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 }, - { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 }, - { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 }, - { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 }, - { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 }, - { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 }, - { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 }, + { "matrix": [2, 5], "x": 6, "y": 2.25 }, + { "matrix": [2, 6], "x": 7, "y": 2.25 }, + { "matrix": [2, 7], "x": 8, "y": 2.25 }, + { "matrix": [2, 8], "x": 9, "y": 2.25 }, + { "matrix": [2, 9], "x": 10, "y": 2.25 }, + { "matrix": [2, 10], "x": 11, "y": 2.25 }, + { "matrix": [8, 0], "x": 12, "y": 2.25 }, + { "matrix": [8, 1], "x": 13, "y": 2.25 }, + { "matrix": [8, 2], "x": 14, "y": 2.25 }, + { "matrix": [8, 3], "x": 15, "y": 2.25 }, + { "matrix": [8, 4], "x": 16, "y": 2.25 }, + { "matrix": [8, 5], "x": 17, "y": 2.25 }, { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 }, - { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 }, - { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 }, - { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 }, - { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 }, - { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 }, - { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 }, - { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 }, + { "matrix": [8, 7], "x": 20, "y": 2.25 }, + { "matrix": [8, 8], "x": 21, "y": 2.25 }, + { "matrix": [8, 9], "x": 22, "y": 2.25 }, + { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 }, + { "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "matrix": [3, 2], "x": 2, "y": 3.25 }, + { "matrix": [3, 3], "x": 3, "y": 3.25 }, { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 }, - { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 }, - { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 }, - { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 }, - { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 }, - { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 }, + { "matrix": [3, 5], "x": 6.25, "y": 3.25 }, + { "matrix": [3, 6], "x": 7.25, "y": 3.25 }, + { "matrix": [3, 7], "x": 8.25, "y": 3.25 }, + { "matrix": [3, 8], "x": 9.25, "y": 3.25 }, + { "matrix": [3, 9], "x": 10.25, "y": 3.25 }, + { "matrix": [3, 10], "x": 11.25, "y": 3.25 }, + { "matrix": [9, 0], "x": 12.25, "y": 3.25 }, + { "matrix": [9, 1], "x": 13.25, "y": 3.25 }, + { "matrix": [9, 2], "x": 14.25, "y": 3.25 }, + { "matrix": [9, 3], "x": 15.25, "y": 3.25 }, + { "matrix": [9, 4], "x": 16.25, "y": 3.25 }, { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 }, - { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 }, - { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 }, - { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 }, - { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 }, - { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 }, - { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 }, - { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 }, + { "matrix": [9, 7], "x": 20, "y": 3.25 }, + { "matrix": [9, 8], "x": 21, "y": 3.25 }, + { "matrix": [9, 9], "x": 22, "y": 3.25 }, + { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "x": 1, "y": 4.25 }, + { "matrix": [4, 2], "x": 2, "y": 4.25 }, + { "matrix": [4, 3], "x": 3, "y": 4.25 }, { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 }, - { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 }, - { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 }, - { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 }, - { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 }, - { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 }, - { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 }, - { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 }, - { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 }, - { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 }, - { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 }, + { "matrix": [4, 5], "x": 6.75, "y": 4.25 }, + { "matrix": [4, 6], "x": 7.75, "y": 4.25 }, + { "matrix": [4, 7], "x": 8.75, "y": 4.25 }, + { "matrix": [4, 8], "x": 9.75, "y": 4.25 }, + { "matrix": [4, 9], "x": 10.75, "y": 4.25 }, + { "matrix": [4, 10], "x": 11.75, "y": 4.25 }, + { "matrix": [10, 0], "x": 12.75, "y": 4.25 }, + { "matrix": [10, 1], "x": 13.75, "y": 4.25 }, + { "matrix": [10, 2], "x": 14.75, "y": 4.25 }, + { "matrix": [10, 3], "x": 15.75, "y": 4.25 }, { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 }, - { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 }, - { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 }, - { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 }, - { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 }, - { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 }, - { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 }, - { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 }, - { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 }, - { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 }, - { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 }, + { "matrix": [10, 5], "x": 20, "y": 4.25 }, + { "matrix": [9, 6], "x": 21, "y": 4.25 }, + { "matrix": [10, 7], "x": 22, "y": 4.25 }, + { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 }, + { "matrix": [10, 9], "x": 4.25, "y": 4.5 }, + { "matrix": [10, 10], "x": 18.75, "y": 4.5 }, + { "matrix": [5, 1], "x": 1, "y": 5.25 }, + { "matrix": [5, 2], "x": 2, "y": 5.25 }, + { "matrix": [5, 3], "x": 6.5, "y": 5.25 }, + { "matrix": [5, 4], "x": 7.5, "y": 5.25 }, { "matrix": [5, 5], "w": 7, "x": 8.5, "y": 5.25 }, - { "matrix": [5, 6], "w": 1, "x": 15.5, "y": 5.25 }, - { "matrix": [5, 7], "w": 1, "x": 16.5, "y": 5.25 }, - { "matrix": [11, 0], "w": 1, "x": 21, "y": 5.25 }, - { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 }, - { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 }, - { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 }, - { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 }, - { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 }, - { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 }, - { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 } + { "matrix": [5, 6], "x": 15.5, "y": 5.25 }, + { "matrix": [5, 7], "x": 16.5, "y": 5.25 }, + { "matrix": [11, 0], "x": 21, "y": 5.25 }, + { "matrix": [11, 4], "x": 22, "y": 5.25 }, + { "matrix": [11, 5], "x": 3.25, "y": 5.5 }, + { "matrix": [10, 6], "x": 4.25, "y": 5.5 }, + { "matrix": [11, 6], "x": 5.25, "y": 5.5 }, + { "matrix": [11, 7], "x": 17.75, "y": 5.5 }, + { "matrix": [11, 8], "x": 18.75, "y": 5.5 }, + { "matrix": [11, 9], "x": 19.75, "y": 5.5 } ] }, "LAYOUT_all": { "layout": [ - { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "PgUp", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "PgDn", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "Esc", "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 }, - { "label": "F1", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, - { "label": "F2", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, - { "label": "F3", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, - { "label": "F4", "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 }, - { "label": "F5", "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 }, - { "label": "F6", "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 }, - { "label": "F7", "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 }, - { "label": "F8", "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 }, - { "label": "F9", "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 }, - { "label": "F10", "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 }, - { "label": "F11", "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 }, - { "label": "F12", "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 }, - { "label": "PrtSc", "matrix": [6, 7], "w": 1, "x": 20, "y": 0 }, - { "label": "Scroll Lock", "matrix": [6, 8], "w": 1, "x": 21, "y": 0 }, - { "label": "Pause", "matrix": [6, 9], "w": 1, "x": 22, "y": 0 }, - { "label": "Insert", "matrix": [6, 10], "w": 1, "x": 23, "y": 0 }, - { "label": "-", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 }, - { "label": "Num Lock", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 }, - { "label": "/", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 }, - { "label": "*", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 }, - { "label": "~", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 }, - { "label": "!", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "@", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 }, - { "label": "#", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 }, - { "label": "$", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 }, - { "label": "%", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 }, - { "label": "^", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "&", "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 }, - { "label": "*", "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 }, - { "label": "(", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 }, - { "label": ")", "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 }, - { "label": "_", "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 }, - { "label": "+", "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 }, + { "label": "Home", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "End", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "PgUp", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "PgDn", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "Esc", "matrix": [0, 4], "x": 4.75, "y": 0 }, + { "label": "F1", "matrix": [0, 6], "x": 6.25, "y": 0 }, + { "label": "F2", "matrix": [0, 7], "x": 7.25, "y": 0 }, + { "label": "F3", "matrix": [0, 8], "x": 8.25, "y": 0 }, + { "label": "F4", "matrix": [0, 9], "x": 9.25, "y": 0 }, + { "label": "F5", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F6", "matrix": [6, 0], "x": 11.75, "y": 0 }, + { "label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0 }, + { "label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0 }, + { "label": "F9", "matrix": [6, 3], "x": 15.25, "y": 0 }, + { "label": "F10", "matrix": [6, 4], "x": 16.25, "y": 0 }, + { "label": "F11", "matrix": [6, 5], "x": 17.25, "y": 0 }, + { "label": "F12", "matrix": [6, 6], "x": 18.25, "y": 0 }, + { "label": "PrtSc", "matrix": [6, 7], "x": 20, "y": 0 }, + { "label": "Scroll Lock", "matrix": [6, 8], "x": 21, "y": 0 }, + { "label": "Pause", "matrix": [6, 9], "x": 22, "y": 0 }, + { "label": "Insert", "matrix": [6, 10], "x": 23, "y": 0 }, + { "label": "-", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "Num Lock", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "/", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "*", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "~", "matrix": [1, 4], "x": 4.5, "y": 1.25 }, + { "label": "!", "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "label": "@", "matrix": [1, 6], "x": 6.5, "y": 1.25 }, + { "label": "#", "matrix": [1, 7], "x": 7.5, "y": 1.25 }, + { "label": "$", "matrix": [1, 8], "x": 8.5, "y": 1.25 }, + { "label": "%", "matrix": [1, 9], "x": 9.5, "y": 1.25 }, + { "label": "^", "matrix": [1, 10], "x": 10.5, "y": 1.25 }, + { "label": "&", "matrix": [7, 0], "x": 11.5, "y": 1.25 }, + { "label": "*", "matrix": [7, 1], "x": 12.5, "y": 1.25 }, + { "label": "(", "matrix": [7, 2], "x": 13.5, "y": 1.25 }, + { "label": ")", "matrix": [7, 3], "x": 14.5, "y": 1.25 }, + { "label": "_", "matrix": [7, 4], "x": 15.5, "y": 1.25 }, + { "label": "+", "matrix": [7, 5], "x": 16.5, "y": 1.25 }, { "label": "Backspace", "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 }, - { "label": "Num Lock", "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 }, - { "label": "/", "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 }, - { "label": "*", "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 }, - { "label": "-", "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 }, - { "h": 2, "label": "+", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 }, - { "label": "7", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 }, - { "label": "8", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 }, - { "label": "9", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 }, + { "label": "Num Lock", "matrix": [7, 7], "x": 20, "y": 1.25 }, + { "label": "/", "matrix": [7, 8], "x": 21, "y": 1.25 }, + { "label": "*", "matrix": [7, 9], "x": 22, "y": 1.25 }, + { "label": "-", "matrix": [7, 10], "x": 23, "y": 1.25 }, + { "h": 2, "label": "+", "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "label": "7", "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "label": "8", "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "label": "9", "matrix": [2, 3], "x": 3, "y": 2.25 }, { "label": "Tab", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 }, - { "label": "Q", "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 }, - { "label": "W", "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 }, - { "label": "E", "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 }, - { "label": "R", "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 }, - { "label": "T", "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 }, - { "label": "Y", "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 }, - { "label": "U", "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 }, - { "label": "I", "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 }, - { "label": "O", "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 }, - { "label": "P", "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 }, - { "label": "{", "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 }, - { "label": "}", "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 }, + { "label": "Q", "matrix": [2, 5], "x": 6, "y": 2.25 }, + { "label": "W", "matrix": [2, 6], "x": 7, "y": 2.25 }, + { "label": "E", "matrix": [2, 7], "x": 8, "y": 2.25 }, + { "label": "R", "matrix": [2, 8], "x": 9, "y": 2.25 }, + { "label": "T", "matrix": [2, 9], "x": 10, "y": 2.25 }, + { "label": "Y", "matrix": [2, 10], "x": 11, "y": 2.25 }, + { "label": "U", "matrix": [8, 0], "x": 12, "y": 2.25 }, + { "label": "I", "matrix": [8, 1], "x": 13, "y": 2.25 }, + { "label": "O", "matrix": [8, 2], "x": 14, "y": 2.25 }, + { "label": "P", "matrix": [8, 3], "x": 15, "y": 2.25 }, + { "label": "{", "matrix": [8, 4], "x": 16, "y": 2.25 }, + { "label": "}", "matrix": [8, 5], "x": 17, "y": 2.25 }, { "label": "|", "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 }, - { "label": "7", "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 }, - { "label": "8", "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 }, - { "label": "9", "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 }, - { "h": 2, "label": "+", "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 }, - { "label": "4", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 }, - { "label": "5", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 }, - { "label": "6", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 }, + { "label": "7", "matrix": [8, 7], "x": 20, "y": 2.25 }, + { "label": "8", "matrix": [8, 8], "x": 21, "y": 2.25 }, + { "label": "9", "matrix": [8, 9], "x": 22, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 10], "x": 23, "y": 2.25 }, + { "label": "4", "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "label": "5", "matrix": [3, 2], "x": 2, "y": 3.25 }, + { "label": "6", "matrix": [3, 3], "x": 3, "y": 3.25 }, { "label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 }, - { "label": "A", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 }, - { "label": "S", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 }, - { "label": "D", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 }, - { "label": "F", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 }, - { "label": "G", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 }, - { "label": "H", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 }, - { "label": "J", "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 }, - { "label": "K", "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 }, - { "label": "L", "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 }, - { "label": ":", "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 }, - { "label": "\"", "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 }, + { "label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.25 }, + { "label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.25 }, + { "label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.25 }, + { "label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.25 }, + { "label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.25 }, + { "label": "H", "matrix": [3, 10], "x": 11.25, "y": 3.25 }, + { "label": "J", "matrix": [9, 0], "x": 12.25, "y": 3.25 }, + { "label": "K", "matrix": [9, 1], "x": 13.25, "y": 3.25 }, + { "label": "L", "matrix": [9, 2], "x": 14.25, "y": 3.25 }, + { "label": ":", "matrix": [9, 3], "x": 15.25, "y": 3.25 }, + { "label": "\"", "matrix": [9, 4], "x": 16.25, "y": 3.25 }, { "label": "Enter", "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 }, - { "label": "4", "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 }, - { "label": "5", "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 }, - { "label": "6", "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 }, - { "h": 2, "label": "Enter", "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 }, - { "label": "1", "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 }, - { "label": "2", "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 }, - { "label": "3", "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 }, - { "label": "\\u2191", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 }, + { "label": "4", "matrix": [9, 7], "x": 20, "y": 3.25 }, + { "label": "5", "matrix": [9, 8], "x": 21, "y": 3.25 }, + { "label": "6", "matrix": [9, 9], "x": 22, "y": 3.25 }, + { "h": 2, "label": "Enter", "matrix": [4, 0], "x": 0, "y": 4.25 }, + { "label": "1", "matrix": [4, 1], "x": 1, "y": 4.25 }, + { "label": "2", "matrix": [4, 2], "x": 2, "y": 4.25 }, + { "label": "3", "matrix": [4, 3], "x": 3, "y": 4.25 }, + { "label": "\\u2191", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.25 }, - { "label": "Z", "matrix": [4, 6], "w": 1, "x": 6.75, "y": 4.25 }, - { "label": "X", "matrix": [4, 7], "w": 1, "x": 7.75, "y": 4.25 }, - { "label": "C", "matrix": [4, 8], "w": 1, "x": 8.75, "y": 4.25 }, - { "label": "V", "matrix": [4, 9], "w": 1, "x": 9.75, "y": 4.25 }, - { "label": "B", "matrix": [4, 10], "w": 1, "x": 10.75, "y": 4.25 }, - { "label": "N", "matrix": [10, 0], "w": 1, "x": 11.75, "y": 4.25 }, - { "label": "M", "matrix": [10, 1], "w": 1, "x": 12.75, "y": 4.25 }, - { "label": "<", "matrix": [10, 2], "w": 1, "x": 13.75, "y": 4.25 }, - { "label": ">", "matrix": [10, 3], "w": 1, "x": 14.75, "y": 4.25 }, - { "label": "?", "matrix": [10, 4], "w": 1, "x": 15.75, "y": 4.25 }, + { "label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.25 }, + { "label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.25 }, + { "label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.25 }, + { "label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.25 }, + { "label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.25 }, + { "label": "N", "matrix": [10, 0], "x": 11.75, "y": 4.25 }, + { "label": "M", "matrix": [10, 1], "x": 12.75, "y": 4.25 }, + { "label": "<", "matrix": [10, 2], "x": 13.75, "y": 4.25 }, + { "label": ">", "matrix": [10, 3], "x": 14.75, "y": 4.25 }, + { "label": "?", "matrix": [10, 4], "x": 15.75, "y": 4.25 }, { "label": "Shift", "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 4.25 }, - { "label": "\\u2191", "matrix": [9, 6], "w": 1, "x": 18.75, "y": 4.5 }, - { "label": "1", "matrix": [10, 7], "w": 1, "x": 20, "y": 4.25 }, - { "label": "2", "matrix": [10, 8], "w": 1, "x": 21, "y": 4.25 }, - { "label": "3", "matrix": [10, 9], "w": 1, "x": 22, "y": 4.25 }, - { "h": 2, "label": "Enter", "matrix": [10, 10], "w": 1, "x": 23, "y": 4.25 }, - { "label": "0", "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 }, - { "label": ".", "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 }, - { "label": "\\u2190", "matrix": [5, 3], "w": 1, "x": 3.25, "y": 5.5 }, - { "label": "\\u2193", "matrix": [5, 4], "w": 1, "x": 4.25, "y": 5.5 }, - { "label": "\\u2192", "matrix": [5, 5], "w": 1, "x": 5.25, "y": 5.5 }, - { "label": "Ctrl", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 5.25 }, - { "label": "Win", "matrix": [5, 7], "w": 1, "x": 7.5, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 8], "w": 1, "x": 8.5, "y": 5.25 }, - { "label": "1u", "matrix": [5, 9], "w": 1, "x": 9.5, "y": 5.25 }, - { "label": "1u", "matrix": [5, 10], "w": 1, "x": 10.5, "y": 5.25 }, - { "label": "1u", "matrix": [11, 0], "w": 1, "x": 11.5, "y": 5.25 }, - { "label": "1u", "matrix": [11, 1], "w": 1, "x": 12.5, "y": 5.25 }, - { "label": "Alt", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 5.25 }, - { "label": "Win", "matrix": [11, 3], "w": 1, "x": 14.5, "y": 5.25 }, - { "label": "Menu", "matrix": [11, 4], "w": 1, "x": 15.5, "y": 5.25 }, - { "label": "Ctrl", "matrix": [11, 5], "w": 1, "x": 16.5, "y": 5.25 }, - { "label": "\\u2190", "matrix": [10, 6], "w": 1, "x": 17.75, "y": 5.5 }, - { "label": "\\u2193", "matrix": [11, 6], "w": 1, "x": 18.75, "y": 5.5 }, - { "label": "\\u2192", "matrix": [11, 7], "w": 1, "x": 19.75, "y": 5.5 }, - { "label": "0", "matrix": [11, 8], "w": 1, "x": 21, "y": 5.25 }, - { "label": ".", "matrix": [11, 9], "w": 1, "x": 22, "y": 5.25 } + { "label": "\\u2191", "matrix": [9, 6], "x": 18.75, "y": 4.5 }, + { "label": "1", "matrix": [10, 7], "x": 20, "y": 4.25 }, + { "label": "2", "matrix": [10, 8], "x": 21, "y": 4.25 }, + { "label": "3", "matrix": [10, 9], "x": 22, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [10, 10], "x": 23, "y": 4.25 }, + { "label": "0", "matrix": [5, 1], "x": 1, "y": 5.25 }, + { "label": ".", "matrix": [5, 2], "x": 2, "y": 5.25 }, + { "label": "\\u2190", "matrix": [5, 3], "x": 3.25, "y": 5.5 }, + { "label": "\\u2193", "matrix": [5, 4], "x": 4.25, "y": 5.5 }, + { "label": "\\u2192", "matrix": [5, 5], "x": 5.25, "y": 5.5 }, + { "label": "Ctrl", "matrix": [5, 6], "x": 6.5, "y": 5.25 }, + { "label": "Win", "matrix": [5, 7], "x": 7.5, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 8], "x": 8.5, "y": 5.25 }, + { "label": "1u", "matrix": [5, 9], "x": 9.5, "y": 5.25 }, + { "label": "1u", "matrix": [5, 10], "x": 10.5, "y": 5.25 }, + { "label": "1u", "matrix": [11, 0], "x": 11.5, "y": 5.25 }, + { "label": "1u", "matrix": [11, 1], "x": 12.5, "y": 5.25 }, + { "label": "Alt", "matrix": [11, 2], "x": 13.5, "y": 5.25 }, + { "label": "Win", "matrix": [11, 3], "x": 14.5, "y": 5.25 }, + { "label": "Menu", "matrix": [11, 4], "x": 15.5, "y": 5.25 }, + { "label": "Ctrl", "matrix": [11, 5], "x": 16.5, "y": 5.25 }, + { "label": "\\u2190", "matrix": [10, 6], "x": 17.75, "y": 5.5 }, + { "label": "\\u2193", "matrix": [11, 6], "x": 18.75, "y": 5.5 }, + { "label": "\\u2192", "matrix": [11, 7], "x": 19.75, "y": 5.5 }, + { "label": "0", "matrix": [11, 8], "x": 21, "y": 5.25 }, + { "label": ".", "matrix": [11, 9], "x": 22, "y": 5.25 } ] } } diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json index d89253fa3e..0a97eed0e0 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/info.json @@ -39,58 +39,58 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, @@ -104,61 +104,61 @@ }, "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "k0d", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "Back", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "Back", "matrix": [0, 14], "x": 14, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "k3e", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -171,59 +171,59 @@ }, "LAYOUT_60_iso": { "layout": [ - { "label": "\\u00ac", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "\"", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "\\u00a3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "\\u00ac", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "\"", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "\\u00a3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "h": 2, "label": "Enter", "matrix": [2, 0], "w": 1.25, "x": 13.75, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 2], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 3], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 4], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 5], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 6], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 7], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 8], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 9], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 10], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 11], "w": 1, "x": 10.75, "y": 2 }, - { "label": "@", "matrix": [2, 12], "w": 1, "x": 11.75, "y": 2 }, - { "label": "~", "matrix": [2, 14], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "label": "@", "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "label": "~", "matrix": [2, 14], "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, @@ -237,58 +237,58 @@ }, "LAYOUT_aek": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.5, "y": 4 }, @@ -301,63 +301,63 @@ }, "LAYOUT_all": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "k0d", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "Back", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "Back", "matrix": [0, 14], "x": 14, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "k2c", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "label": "k2c", "matrix": [2, 12], "x": 12.75, "y": 2 }, { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, { "label": "Shift", "matrix": [3, 1], "w": 1.25, "x": 1, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "k3e", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json index ed7d39cf95..4f9f0a1642 100644 --- a/keyboards/clueboard/66/rev1/info.json +++ b/keyboards/clueboard/66/rev1/info.json @@ -57,62 +57,62 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, - { "label": "k0F", "matrix": [0, 15], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k0F", "matrix": [0, 15], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k1F", "matrix": [1, 15], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k1F", "matrix": [1, 15], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 13], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "k3E", "matrix": [3, 14], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k3E", "matrix": [3, 14], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -120,70 +120,70 @@ { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k4E", "matrix": [4, 14], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k4F", "matrix": [4, 15], "w": 1, "x": 15.5, "y": 4 } + { "label": "k4D", "matrix": [4, 13], "x": 13.5, "y": 4 }, + { "label": "k4E", "matrix": [4, 14], "x": 14.5, "y": 4 }, + { "label": "k4F", "matrix": [4, 15], "x": 15.5, "y": 4 } ] }, "LAYOUT_66_iso": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, - { "label": "Insert", "matrix": [0, 15], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, - { "label": "Delete", "matrix": [1, 15], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "label": "", "matrix": [2, 12], "x": 12.75, "y": 2 }, { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 }, { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 13], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "\u2191", "matrix": [3, 14], "w": 1, "x": 14.5, "y": 3 }, + { "label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -191,86 +191,86 @@ { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Ctrl", "matrix": [4, 11], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "\u2190", "matrix": [4, 13], "w": 1, "x": 13.5, "y": 4 }, - { "label": "\u2193", "matrix": [4, 14], "w": 1, "x": 14.5, "y": 4 }, - { "label": "\u2192", "matrix": [4, 15], "w": 1, "x": 15.5, "y": 4 } + { "label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4 }, + { "label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4 }, + { "label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "DASH", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "EQUALSIGN", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "YEN", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "BACKSPACE", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, - { "label": "PAGEUP", "matrix": [0, 15], "w": 1, "x": 15.5, "y": 0 }, + { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "DASH", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "EQUALSIGN", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "YEN", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "BACKSPACE", "matrix": [0, 14], "x": 14, "y": 0 }, + { "label": "PAGEUP", "matrix": [0, 15], "x": 15.5, "y": 0 }, { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "LBRACKET", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "RBRACKET", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "LBRACKET", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "RBRACKET", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "BACKSLASH", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "PAGEDOWN", "matrix": [1, 15], "w": 1, "x": 15.5, "y": 1 }, + { "label": "PAGEDOWN", "matrix": [1, 15], "x": 15.5, "y": 1 }, { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "SEMICOLON", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "QUOTE", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "ISOHASH", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": "SEMICOLON", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "QUOTE", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "label": "ISOHASH", "matrix": [2, 12], "x": 12.75, "y": 2 }, { "label": "ENTER", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "COMMA", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": "PERIOD", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "SLASH", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, - { "label": "JPBACKSLASH", "matrix": [3, 12], "w": 1, "x": 12.25, "y": 3 }, + { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "COMMA", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": "PERIOD", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "SLASH", "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "label": "JPBACKSLASH", "matrix": [3, 12], "x": 12.25, "y": 3 }, { "label": "RSHIFT", "matrix": [3, 13], "w": 1.25, "x": 13.25, "y": 3 }, - { "label": "UP", "matrix": [3, 14], "w": 1, "x": 14.5, "y": 3 }, + { "label": "UP", "matrix": [3, 14], "x": 14.5, "y": 3 }, { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 }, + { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 }, { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 }, { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 }, { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 }, { "label": "HENKAN", "matrix": [4, 9], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "RCMD", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RCTRL", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4 }, + { "label": "RCTRL", "matrix": [4, 11], "x": 11.25, "y": 4 }, { "label": "FN", "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "LEFT", "matrix": [4, 13], "w": 1, "x": 13.5, "y": 4 }, - { "label": "DOWN", "matrix": [4, 14], "w": 1, "x": 14.5, "y": 4 }, - { "label": "RIGHT", "matrix": [4, 15], "w": 1, "x": 15.5, "y": 4 } + { "label": "LEFT", "matrix": [4, 13], "x": 13.5, "y": 4 }, + { "label": "DOWN", "matrix": [4, 14], "x": 14.5, "y": 4 }, + { "label": "RIGHT", "matrix": [4, 15], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json index 5945c2c833..ff8128627e 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/info.json @@ -61,62 +61,62 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -124,70 +124,70 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_66_iso": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, - { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, + { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 }, { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -195,86 +195,86 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, - { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 }, - { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 }, - { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 }, + { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 }, + { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 }, + { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, - { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 }, + { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 }, + { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 }, { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 }, - { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 }, + { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 }, { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 }, { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 }, { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 }, { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json index 4c0569622c..fc655351fb 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/info.json @@ -61,62 +61,62 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -124,70 +124,70 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_66_iso": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, - { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, + { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 }, { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -195,86 +195,86 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, - { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 }, - { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 }, - { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 }, + { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 }, + { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 }, + { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, - { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 }, + { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 }, + { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 }, { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 }, - { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 }, + { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 }, { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 }, { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 }, { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 }, { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json index 2c19b85d0d..dbe3b49756 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/info.json @@ -55,62 +55,62 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Page Up", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Page Down", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "Up", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -118,70 +118,70 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "Left", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "Down", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "Up", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_66_iso": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, - { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, + { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 }, { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -189,86 +189,86 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, - { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 }, - { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 }, - { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 }, + { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 }, + { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 }, + { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, - { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 }, + { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 }, + { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 }, { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 }, - { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 }, + { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 }, { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 }, { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 }, { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 }, { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json index afa4f8adb5..647ad869a9 100644 --- a/keyboards/clueboard/66_hotswap/gen1/info.json +++ b/keyboards/clueboard/66_hotswap/gen1/info.json @@ -35,132 +35,132 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "k55", "matrix": [5, 5], "w": 2, "x": 13, "y": 0 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "k55", "matrix": [5, 5], "w": 2, "x": 13, "y": 0 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -168,11 +168,11 @@ { "label": "k46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4 }, { "label": "k90", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json index 522eda3fba..7f80684d8d 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/info.json @@ -61,134 +61,134 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, - { "label": "k84", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 }, + { "label": "k84", "matrix": [8, 4], "x": 12.25, "y": 3 }, { "label": "k85", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 }, - { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -196,11 +196,11 @@ { "label": "k46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4 }, { "label": "k90", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json index 24a9399923..bd4f6c5958 100644 --- a/keyboards/clueboard/california/info.json +++ b/keyboards/clueboard/california/info.json @@ -26,16 +26,16 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 1, "matrix": [0, 0]}, - {"x": 1, "y": 0, "w": 1, "matrix": [0, 1]}, - {"x": 0, "y": 1, "w": 1, "matrix": [1, 0]}, - {"x": 1, "y": 1, "w": 1, "matrix": [1, 1]}, - {"x": 1, "y": 2, "w": 1, "matrix": [2, 1]}, - {"x": 1.25, "y": 3, "w": 1, "matrix": [3, 0]}, - {"x": 2.25, "y": 3, "w": 1, "matrix": [3, 1]}, - {"x": 2, "y": 4, "w": 1, "matrix": [4, 0]}, - {"x": 3, "y": 4, "w": 1, "matrix": [4, 1]}, - {"x": 3.75, "y": 5, "w": 1, "matrix": [5, 1]} + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 1.25, "y": 3, "matrix": [3, 0]}, + {"x": 2.25, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 4, "matrix": [4, 0]}, + {"x": 3, "y": 4, "matrix": [4, 1]}, + {"x": 3.75, "y": 5, "matrix": [5, 1]} ] } } diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json index 4564768c19..5b6a208c16 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/info.json @@ -47,15 +47,15 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "ON/OFF", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "SAT+", "matrix": [0, 1], "w": 1, "x": 4, "y": 0 }, - { "label": "BRIGHT+", "matrix": [0, 2], "w": 1, "x": 8, "y": 0 }, - { "label": "HUE-", "matrix": [1, 0], "w": 1, "x": 2, "y": 1 }, - { "label": "HUE+", "matrix": [1, 2], "w": 1, "x": 6, "y": 1 }, - { "label": "MODE", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "SAT-", "matrix": [2, 1], "w": 1, "x": 4, "y": 2 }, - { "label": "BRIGHT-", "matrix": [2, 2], "w": 1, "x": 8, "y": 2 }, - { "label": "LAYER", "matrix": [1, 1], "w": 1, "x": 2, "y": 4 }, + { "label": "ON/OFF", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "SAT+", "matrix": [0, 1], "x": 4, "y": 0 }, + { "label": "BRIGHT+", "matrix": [0, 2], "x": 8, "y": 0 }, + { "label": "HUE-", "matrix": [1, 0], "x": 2, "y": 1 }, + { "label": "HUE+", "matrix": [1, 2], "x": 6, "y": 1 }, + { "label": "MODE", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "SAT-", "matrix": [2, 1], "x": 4, "y": 2 }, + { "label": "BRIGHT-", "matrix": [2, 2], "x": 8, "y": 2 }, + { "label": "LAYER", "matrix": [1, 1], "x": 2, "y": 4 }, { "h": 2, "label": "MX1", "matrix": [3, 0], "w": 2, "x": 4, "y": 6 }, { "h": 2, "label": "MX2", "matrix": [3, 1], "w": 2, "x": 6, "y": 6 }, { "h": 2, "label": "MX3", "matrix": [3, 2], "w": 2, "x": 8, "y": 6 } diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index 1b46444ba8..e889432474 100644 --- a/keyboards/converter/a1200/info.json +++ b/keyboards/converter/a1200/info.json @@ -69,7 +69,7 @@ {"label":":", "x":11, "y":3.5}, {"label":"\"", "x":12, "y":3.5}, {"label":"~", "x":13, "y":3.5}, - {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, + {"label":"Enter", "x":14, "y":2.5, "h":2}, {"label":"\u2191", "x":16.25, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json index a0bd7ed6e4..436e08038d 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/info.json @@ -70,7 +70,7 @@ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [4, 3], "w": 1, "x": 1.25, "y": 3 }, + { "matrix": [4, 3], "x": 1.25, "y": 3 }, { "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 }, { "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4 }, { "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4 }, diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json index e5e43b55b6..e2679325c4 100644 --- a/keyboards/cradio/info.json +++ b/keyboards/cradio/info.json @@ -55,40 +55,40 @@ "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - { "label": "L01", "matrix": [0, 0], "w": 1, "x": 0, "y": 1.27 }, - { "label": "L02", "matrix": [0, 1], "w": 1, "x": 1, "y": 0.31 }, - { "label": "L03", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "L04", "matrix": [0, 3], "w": 1, "x": 3, "y": 0.28 }, - { "label": "L05", "matrix": [0, 4], "w": 1, "x": 4, "y": 0.42 }, - { "label": "R01", "matrix": [4, 0], "w": 1, "x": 8, "y": 0.42 }, - { "label": "R02", "matrix": [4, 1], "w": 1, "x": 9, "y": 0.28 }, - { "label": "R03", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "R04", "matrix": [4, 3], "w": 1, "x": 11, "y": 0.31 }, - { "label": "R05", "matrix": [4, 4], "w": 1, "x": 12, "y": 1.27 }, - { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 }, - { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 }, - { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 }, - { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 }, - { "label": "R06", "matrix": [5, 0], "w": 1, "x": 8, "y": 1.42 }, - { "label": "R07", "matrix": [5, 1], "w": 1, "x": 9, "y": 1.28 }, - { "label": "R08", "matrix": [5, 2], "w": 1, "x": 10, "y": 1 }, - { "label": "R09", "matrix": [5, 3], "w": 1, "x": 11, "y": 1.31 }, - { "label": "R10", "matrix": [5, 4], "w": 1, "x": 12, "y": 2.27 }, - { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 }, - { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 }, - { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 }, - { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 }, - { "label": "R11", "matrix": [6, 0], "w": 1, "x": 8, "y": 2.42 }, - { "label": "R12", "matrix": [6, 1], "w": 1, "x": 9, "y": 2.28 }, - { "label": "R13", "matrix": [6, 2], "w": 1, "x": 10, "y": 2 }, - { "label": "R14", "matrix": [6, 3], "w": 1, "x": 11, "y": 2.31 }, - { "label": "R15", "matrix": [6, 4], "w": 1, "x": 12, "y": 3.27 }, - { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 }, - { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 }, - { "label": "R16", "matrix": [7, 0], "w": 1, "x": 7, "y": 3.7 }, - { "label": "R17", "matrix": [7, 1], "w": 1, "x": 8, "y": 3.9 } + { "label": "L01", "matrix": [0, 0], "x": 0, "y": 1.27 }, + { "label": "L02", "matrix": [0, 1], "x": 1, "y": 0.31 }, + { "label": "L03", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "L04", "matrix": [0, 3], "x": 3, "y": 0.28 }, + { "label": "L05", "matrix": [0, 4], "x": 4, "y": 0.42 }, + { "label": "R01", "matrix": [4, 0], "x": 8, "y": 0.42 }, + { "label": "R02", "matrix": [4, 1], "x": 9, "y": 0.28 }, + { "label": "R03", "matrix": [4, 2], "x": 10, "y": 0 }, + { "label": "R04", "matrix": [4, 3], "x": 11, "y": 0.31 }, + { "label": "R05", "matrix": [4, 4], "x": 12, "y": 1.27 }, + { "label": "L06", "matrix": [1, 0], "x": 0, "y": 2.27 }, + { "label": "L07", "matrix": [1, 1], "x": 1, "y": 1.31 }, + { "label": "L08", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "L09", "matrix": [1, 3], "x": 3, "y": 1.28 }, + { "label": "L10", "matrix": [1, 4], "x": 4, "y": 1.42 }, + { "label": "R06", "matrix": [5, 0], "x": 8, "y": 1.42 }, + { "label": "R07", "matrix": [5, 1], "x": 9, "y": 1.28 }, + { "label": "R08", "matrix": [5, 2], "x": 10, "y": 1 }, + { "label": "R09", "matrix": [5, 3], "x": 11, "y": 1.31 }, + { "label": "R10", "matrix": [5, 4], "x": 12, "y": 2.27 }, + { "label": "L11", "matrix": [2, 0], "x": 0, "y": 3.27 }, + { "label": "L12", "matrix": [2, 1], "x": 1, "y": 2.31 }, + { "label": "L13", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "L14", "matrix": [2, 3], "x": 3, "y": 2.28 }, + { "label": "L15", "matrix": [2, 4], "x": 4, "y": 2.42 }, + { "label": "R11", "matrix": [6, 0], "x": 8, "y": 2.42 }, + { "label": "R12", "matrix": [6, 1], "x": 9, "y": 2.28 }, + { "label": "R13", "matrix": [6, 2], "x": 10, "y": 2 }, + { "label": "R14", "matrix": [6, 3], "x": 11, "y": 2.31 }, + { "label": "R15", "matrix": [6, 4], "x": 12, "y": 3.27 }, + { "label": "L16", "matrix": [3, 0], "x": 4, "y": 3.9 }, + { "label": "L17", "matrix": [3, 1], "x": 5, "y": 3.7 }, + { "label": "R16", "matrix": [7, 0], "x": 7, "y": 3.7 }, + { "label": "R17", "matrix": [7, 1], "x": 8, "y": 3.9 } ] } } diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json index 20d5ad2ff4..5eeedab700 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/info.json @@ -23,153 +23,153 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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 } ] }, "LAYOUT_planck_mit": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, { "w": 2, "x": 5, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "x": 7, "y": 3 }, + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 } ] }, "LAYOUT_2x2u": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, { "w": 2, "x": 4, "y": 3 }, { "w": 2, "x": 6, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 } ] } } } diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index f0e3577e5f..2854ea1481 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -14,104 +14,104 @@ "layouts": { "LAYOUT_planck_mit": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, { "w": 2, "x": 5, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "x": 7, "y": 3 }, + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 } ] }, "LAYOUT_ortho_4x12": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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 } ] } } } diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index 24fad8a9ff..d8eca7dd4a 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -16,7 +16,7 @@ "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] }, "LAYOUT_60_ansi_split_bs": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":1}, {"label":"", "x":14, "y":0, "w":1}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] }, "LAYOUT_60_ansi_split_bs_rshift": { "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":"BS", "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index 286396776e..c308aa77f9 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -48,12 +48,12 @@ {"label":".", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3, "w":1}, + {"label":"Win", "x":1.25, "y":3}, {"label":"Alt", "x":2.25, "y":3, "w":1.25}, {"label":"Space", "x":3.5, "y":3, "w":2.25}, {"label":"Space", "x":5.75, "y":3, "w":2.75}, {"label":"App", "x":8.5, "y":3, "w":1.25}, - {"label":"Fn", "x":9.75, "y":3, "w":1}, + {"label":"Fn", "x":9.75, "y":3}, {"label":"Ctrl", "x":10.75, "y":3, "w":1.25} ] } diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json index 364d803718..04138d2dc2 100644 --- a/keyboards/ducky/one2mini/1861st/info.json +++ b/keyboards/ducky/one2mini/1861st/info.json @@ -12,63 +12,63 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "x": 0, "y": 0, "w": 1, "label": "ESC" }, - { "x": 1, "y": 0, "w": 1, "label": "1" }, - { "x": 2, "y": 0, "w": 1, "label": "2" }, - { "x": 3, "y": 0, "w": 1, "label": "3" }, - { "x": 4, "y": 0, "w": 1, "label": "4" }, - { "x": 5, "y": 0, "w": 1, "label": "5" }, - { "x": 6, "y": 0, "w": 1, "label": "6" }, - { "x": 7, "y": 0, "w": 1, "label": "7" }, - { "x": 8, "y": 0, "w": 1, "label": "8" }, - { "x": 9, "y": 0, "w": 1, "label": "9" }, - { "x": 10, "y": 0, "w": 1, "label": "0" }, - { "x": 11, "y": 0, "w": 1, "label": "DASH" }, - { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, + { "x": 0, "y": 0, "label": "ESC" }, + { "x": 1, "y": 0, "label": "1" }, + { "x": 2, "y": 0, "label": "2" }, + { "x": 3, "y": 0, "label": "3" }, + { "x": 4, "y": 0, "label": "4" }, + { "x": 5, "y": 0, "label": "5" }, + { "x": 6, "y": 0, "label": "6" }, + { "x": 7, "y": 0, "label": "7" }, + { "x": 8, "y": 0, "label": "8" }, + { "x": 9, "y": 0, "label": "9" }, + { "x": 10, "y": 0, "label": "0" }, + { "x": 11, "y": 0, "label": "DASH" }, + { "x": 12, "y": 0, "label": "EQUALSIGN" }, { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, - { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, - { "x": 2.5, "y": 1, "w": 1, "label": "W" }, - { "x": 3.5, "y": 1, "w": 1, "label": "E" }, - { "x": 4.5, "y": 1, "w": 1, "label": "R" }, - { "x": 5.5, "y": 1, "w": 1, "label": "T" }, - { "x": 6.5, "y": 1, "w": 1, "label": "Y" }, - { "x": 7.5, "y": 1, "w": 1, "label": "U" }, - { "x": 8.5, "y": 1, "w": 1, "label": "I" }, - { "x": 9.5, "y": 1, "w": 1, "label": "O" }, - { "x": 10.5, "y": 1, "w": 1, "label": "P" }, - { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, - { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, + { "x": 1.5, "y": 1, "label": "Q" }, + { "x": 2.5, "y": 1, "label": "W" }, + { "x": 3.5, "y": 1, "label": "E" }, + { "x": 4.5, "y": 1, "label": "R" }, + { "x": 5.5, "y": 1, "label": "T" }, + { "x": 6.5, "y": 1, "label": "Y" }, + { "x": 7.5, "y": 1, "label": "U" }, + { "x": 8.5, "y": 1, "label": "I" }, + { "x": 9.5, "y": 1, "label": "O" }, + { "x": 10.5, "y": 1, "label": "P" }, + { "x": 11.5, "y": 1, "label": "LBRACKET" }, + { "x": 12.5, "y": 1, "label": "RBRACKET" }, { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" }, { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, - { "x": 1.75, "y": 2, "w": 1, "label": "A" }, - { "x": 2.75, "y": 2, "w": 1, "label": "S" }, - { "x": 3.75, "y": 2, "w": 1, "label": "D" }, - { "x": 4.75, "y": 2, "w": 1, "label": "F" }, - { "x": 5.75, "y": 2, "w": 1, "label": "G" }, - { "x": 6.75, "y": 2, "w": 1, "label": "H" }, - { "x": 7.75, "y": 2, "w": 1, "label": "J" }, - { "x": 8.75, "y": 2, "w": 1, "label": "K" }, - { "x": 9.75, "y": 2, "w": 1, "label": "L" }, - { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" }, - { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, - { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" }, + { "x": 1.75, "y": 2, "label": "A" }, + { "x": 2.75, "y": 2, "label": "S" }, + { "x": 3.75, "y": 2, "label": "D" }, + { "x": 4.75, "y": 2, "label": "F" }, + { "x": 5.75, "y": 2, "label": "G" }, + { "x": 6.75, "y": 2, "label": "H" }, + { "x": 7.75, "y": 2, "label": "J" }, + { "x": 8.75, "y": 2, "label": "K" }, + { "x": 9.75, "y": 2, "label": "L" }, + { "x": 10.75, "y": 2, "label": "SEMICOLON" }, + { "x": 11.75, "y": 2, "label": "QUOTE" }, + { "x": 12.75, "y": 2, "label": "ISOHASH" }, { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" }, { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" }, - { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" }, - { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, - { "x": 3.25, "y": 3, "w": 1, "label": "X" }, - { "x": 4.25, "y": 3, "w": 1, "label": "C" }, - { "x": 5.25, "y": 3, "w": 1, "label": "V" }, - { "x": 6.25, "y": 3, "w": 1, "label": "B" }, - { "x": 7.25, "y": 3, "w": 1, "label": "N" }, - { "x": 8.25, "y": 3, "w": 1, "label": "M" }, - { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" }, - { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, - { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, + { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" }, + { "x": 2.25, "y": 3, "label": "Z" }, + { "x": 3.25, "y": 3, "label": "X" }, + { "x": 4.25, "y": 3, "label": "C" }, + { "x": 5.25, "y": 3, "label": "V" }, + { "x": 6.25, "y": 3, "label": "B" }, + { "x": 7.25, "y": 3, "label": "N" }, + { "x": 8.25, "y": 3, "label": "M" }, + { "x": 9.25, "y": 3, "label": "COMMA" }, + { "x": 10.25, "y": 3, "label": "PERIOD" }, + { "x": 11.25, "y": 3, "label": "SLASH" }, { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" }, { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, @@ -84,61 +84,61 @@ "LAYOUT_60_ansi": { "layout": [ - { "x": 0, "y": 0, "w": 1, "label": "ESC" }, - { "x": 1, "y": 0, "w": 1, "label": "1" }, - { "x": 2, "y": 0, "w": 1, "label": "2" }, - { "x": 3, "y": 0, "w": 1, "label": "3" }, - { "x": 4, "y": 0, "w": 1, "label": "4" }, - { "x": 5, "y": 0, "w": 1, "label": "5" }, - { "x": 6, "y": 0, "w": 1, "label": "6" }, - { "x": 7, "y": 0, "w": 1, "label": "7" }, - { "x": 8, "y": 0, "w": 1, "label": "8" }, - { "x": 9, "y": 0, "w": 1, "label": "9" }, - { "x": 10, "y": 0, "w": 1, "label": "0" }, - { "x": 11, "y": 0, "w": 1, "label": "DASH" }, - { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, + { "x": 0, "y": 0, "label": "ESC" }, + { "x": 1, "y": 0, "label": "1" }, + { "x": 2, "y": 0, "label": "2" }, + { "x": 3, "y": 0, "label": "3" }, + { "x": 4, "y": 0, "label": "4" }, + { "x": 5, "y": 0, "label": "5" }, + { "x": 6, "y": 0, "label": "6" }, + { "x": 7, "y": 0, "label": "7" }, + { "x": 8, "y": 0, "label": "8" }, + { "x": 9, "y": 0, "label": "9" }, + { "x": 10, "y": 0, "label": "0" }, + { "x": 11, "y": 0, "label": "DASH" }, + { "x": 12, "y": 0, "label": "EQUALSIGN" }, { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, - { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, - { "x": 2.5, "y": 1, "w": 1, "label": "W" }, - { "x": 3.5, "y": 1, "w": 1, "label": "E" }, - { "x": 4.5, "y": 1, "w": 1, "label": "R" }, - { "x": 5.5, "y": 1, "w": 1, "label": "T" }, - { "x": 6.5, "y": 1, "w": 1, "label": "Y" }, - { "x": 7.5, "y": 1, "w": 1, "label": "U" }, - { "x": 8.5, "y": 1, "w": 1, "label": "I" }, - { "x": 9.5, "y": 1, "w": 1, "label": "O" }, - { "x": 10.5, "y": 1, "w": 1, "label": "P" }, - { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, - { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, + { "x": 1.5, "y": 1, "label": "Q" }, + { "x": 2.5, "y": 1, "label": "W" }, + { "x": 3.5, "y": 1, "label": "E" }, + { "x": 4.5, "y": 1, "label": "R" }, + { "x": 5.5, "y": 1, "label": "T" }, + { "x": 6.5, "y": 1, "label": "Y" }, + { "x": 7.5, "y": 1, "label": "U" }, + { "x": 8.5, "y": 1, "label": "I" }, + { "x": 9.5, "y": 1, "label": "O" }, + { "x": 10.5, "y": 1, "label": "P" }, + { "x": 11.5, "y": 1, "label": "LBRACKET" }, + { "x": 12.5, "y": 1, "label": "RBRACKET" }, { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" }, { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, - { "x": 1.75, "y": 2, "w": 1, "label": "A" }, - { "x": 2.75, "y": 2, "w": 1, "label": "S" }, - { "x": 3.75, "y": 2, "w": 1, "label": "D" }, - { "x": 4.75, "y": 2, "w": 1, "label": "F" }, - { "x": 5.75, "y": 2, "w": 1, "label": "G" }, - { "x": 6.75, "y": 2, "w": 1, "label": "H" }, - { "x": 7.75, "y": 2, "w": 1, "label": "J" }, - { "x": 8.75, "y": 2, "w": 1, "label": "K" }, - { "x": 9.75, "y": 2, "w": 1, "label": "L" }, - { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" }, - { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, + { "x": 1.75, "y": 2, "label": "A" }, + { "x": 2.75, "y": 2, "label": "S" }, + { "x": 3.75, "y": 2, "label": "D" }, + { "x": 4.75, "y": 2, "label": "F" }, + { "x": 5.75, "y": 2, "label": "G" }, + { "x": 6.75, "y": 2, "label": "H" }, + { "x": 7.75, "y": 2, "label": "J" }, + { "x": 8.75, "y": 2, "label": "K" }, + { "x": 9.75, "y": 2, "label": "L" }, + { "x": 10.75, "y": 2, "label": "SEMICOLON" }, + { "x": 11.75, "y": 2, "label": "QUOTE" }, { "x": 12.75, "y": 2, "w": 2.25, "label": "ENTER" }, { "x": 0, "y": 3, "w": 2.25, "label": "LSHIFT" }, - { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, - { "x": 3.25, "y": 3, "w": 1, "label": "X" }, - { "x": 4.25, "y": 3, "w": 1, "label": "C" }, - { "x": 5.25, "y": 3, "w": 1, "label": "V" }, - { "x": 6.25, "y": 3, "w": 1, "label": "B" }, - { "x": 7.25, "y": 3, "w": 1, "label": "N" }, - { "x": 8.25, "y": 3, "w": 1, "label": "M" }, - { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" }, - { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, - { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, + { "x": 2.25, "y": 3, "label": "Z" }, + { "x": 3.25, "y": 3, "label": "X" }, + { "x": 4.25, "y": 3, "label": "C" }, + { "x": 5.25, "y": 3, "label": "V" }, + { "x": 6.25, "y": 3, "label": "B" }, + { "x": 7.25, "y": 3, "label": "N" }, + { "x": 8.25, "y": 3, "label": "M" }, + { "x": 9.25, "y": 3, "label": "COMMA" }, + { "x": 10.25, "y": 3, "label": "PERIOD" }, + { "x": 11.25, "y": 3, "label": "SLASH" }, { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" }, { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, @@ -154,62 +154,62 @@ "LAYOUT_60_iso": { "layout": [ - { "x": 0, "y": 0, "w": 1, "label": "ESC" }, - { "x": 1, "y": 0, "w": 1, "label": "1" }, - { "x": 2, "y": 0, "w": 1, "label": "2" }, - { "x": 3, "y": 0, "w": 1, "label": "3" }, - { "x": 4, "y": 0, "w": 1, "label": "4" }, - { "x": 5, "y": 0, "w": 1, "label": "5" }, - { "x": 6, "y": 0, "w": 1, "label": "6" }, - { "x": 7, "y": 0, "w": 1, "label": "7" }, - { "x": 8, "y": 0, "w": 1, "label": "8" }, - { "x": 9, "y": 0, "w": 1, "label": "9" }, - { "x": 10, "y": 0, "w": 1, "label": "0" }, - { "x": 11, "y": 0, "w": 1, "label": "DASH" }, - { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, + { "x": 0, "y": 0, "label": "ESC" }, + { "x": 1, "y": 0, "label": "1" }, + { "x": 2, "y": 0, "label": "2" }, + { "x": 3, "y": 0, "label": "3" }, + { "x": 4, "y": 0, "label": "4" }, + { "x": 5, "y": 0, "label": "5" }, + { "x": 6, "y": 0, "label": "6" }, + { "x": 7, "y": 0, "label": "7" }, + { "x": 8, "y": 0, "label": "8" }, + { "x": 9, "y": 0, "label": "9" }, + { "x": 10, "y": 0, "label": "0" }, + { "x": 11, "y": 0, "label": "DASH" }, + { "x": 12, "y": 0, "label": "EQUALSIGN" }, { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, - { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, - { "x": 2.5, "y": 1, "w": 1, "label": "W" }, - { "x": 3.5, "y": 1, "w": 1, "label": "E" }, - { "x": 4.5, "y": 1, "w": 1, "label": "R" }, - { "x": 5.5, "y": 1, "w": 1, "label": "T" }, - { "x": 6.5, "y": 1, "w": 1, "label": "Y" }, - { "x": 7.5, "y": 1, "w": 1, "label": "U" }, - { "x": 8.5, "y": 1, "w": 1, "label": "I" }, - { "x": 9.5, "y": 1, "w": 1, "label": "O" }, - { "x": 10.5, "y": 1, "w": 1, "label": "P" }, - { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, - { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, + { "x": 1.5, "y": 1, "label": "Q" }, + { "x": 2.5, "y": 1, "label": "W" }, + { "x": 3.5, "y": 1, "label": "E" }, + { "x": 4.5, "y": 1, "label": "R" }, + { "x": 5.5, "y": 1, "label": "T" }, + { "x": 6.5, "y": 1, "label": "Y" }, + { "x": 7.5, "y": 1, "label": "U" }, + { "x": 8.5, "y": 1, "label": "I" }, + { "x": 9.5, "y": 1, "label": "O" }, + { "x": 10.5, "y": 1, "label": "P" }, + { "x": 11.5, "y": 1, "label": "LBRACKET" }, + { "x": 12.5, "y": 1, "label": "RBRACKET" }, { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, - { "x": 1.75, "y": 2, "w": 1, "label": "A" }, - { "x": 2.75, "y": 2, "w": 1, "label": "S" }, - { "x": 3.75, "y": 2, "w": 1, "label": "D" }, - { "x": 4.75, "y": 2, "w": 1, "label": "F" }, - { "x": 5.75, "y": 2, "w": 1, "label": "G" }, - { "x": 6.75, "y": 2, "w": 1, "label": "H" }, - { "x": 7.75, "y": 2, "w": 1, "label": "J" }, - { "x": 8.75, "y": 2, "w": 1, "label": "K" }, - { "x": 9.75, "y": 2, "w": 1, "label": "L" }, - { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" }, - { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, - { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" }, + { "x": 1.75, "y": 2, "label": "A" }, + { "x": 2.75, "y": 2, "label": "S" }, + { "x": 3.75, "y": 2, "label": "D" }, + { "x": 4.75, "y": 2, "label": "F" }, + { "x": 5.75, "y": 2, "label": "G" }, + { "x": 6.75, "y": 2, "label": "H" }, + { "x": 7.75, "y": 2, "label": "J" }, + { "x": 8.75, "y": 2, "label": "K" }, + { "x": 9.75, "y": 2, "label": "L" }, + { "x": 10.75, "y": 2, "label": "SEMICOLON" }, + { "x": 11.75, "y": 2, "label": "QUOTE" }, + { "x": 12.75, "y": 2, "label": "ISOHASH" }, { "x": 13.75, "y": 1, "w": 1.25, "h": 2, "label": "ENTER" }, { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" }, - { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" }, - { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, - { "x": 3.25, "y": 3, "w": 1, "label": "X" }, - { "x": 4.25, "y": 3, "w": 1, "label": "C" }, - { "x": 5.25, "y": 3, "w": 1, "label": "V" }, - { "x": 6.25, "y": 3, "w": 1, "label": "B" }, - { "x": 7.25, "y": 3, "w": 1, "label": "N" }, - { "x": 8.25, "y": 3, "w": 1, "label": "M" }, - { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" }, - { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, - { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, + { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" }, + { "x": 2.25, "y": 3, "label": "Z" }, + { "x": 3.25, "y": 3, "label": "X" }, + { "x": 4.25, "y": 3, "label": "C" }, + { "x": 5.25, "y": 3, "label": "V" }, + { "x": 6.25, "y": 3, "label": "B" }, + { "x": 7.25, "y": 3, "label": "N" }, + { "x": 8.25, "y": 3, "label": "M" }, + { "x": 9.25, "y": 3, "label": "COMMA" }, + { "x": 10.25, "y": 3, "label": "PERIOD" }, + { "x": 11.25, "y": 3, "label": "SLASH" }, { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" }, { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 5361dbd4a0..2b085cf8da 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -10,79 +10,79 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "x": 0, "y": 0, "w": 1, "label": "ESC" }, - { "x": 1, "y": 0, "w": 1, "label": "1" }, - { "x": 2, "y": 0, "w": 1, "label": "2" }, - { "x": 3, "y": 0, "w": 1, "label": "3" }, - { "x": 4, "y": 0, "w": 1, "label": "4" }, - { "x": 5, "y": 0, "w": 1, "label": "5" }, - { "x": 6, "y": 0, "w": 1, "label": "6" }, - { "x": 7, "y": 0, "w": 1, "label": "7" }, - { "x": 8, "y": 0, "w": 1, "label": "8" }, - { "x": 9, "y": 0, "w": 1, "label": "9" }, - { "x": 10, "y": 0, "w": 1, "label": "0" }, - { "x": 11, "y": 0, "w": 1, "label": "DASH" }, - { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, + { "x": 0, "y": 0, "label": "ESC" }, + { "x": 1, "y": 0, "label": "1" }, + { "x": 2, "y": 0, "label": "2" }, + { "x": 3, "y": 0, "label": "3" }, + { "x": 4, "y": 0, "label": "4" }, + { "x": 5, "y": 0, "label": "5" }, + { "x": 6, "y": 0, "label": "6" }, + { "x": 7, "y": 0, "label": "7" }, + { "x": 8, "y": 0, "label": "8" }, + { "x": 9, "y": 0, "label": "9" }, + { "x": 10, "y": 0, "label": "0" }, + { "x": 11, "y": 0, "label": "DASH" }, + { "x": 12, "y": 0, "label": "EQUALSIGN" }, { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, - { "x": 15.25, "y": 0, "w": 1, "label": "DEL" }, + { "x": 15.25, "y": 0, "label": "DEL" }, { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, - { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, - { "x": 2.5, "y": 1, "w": 1, "label": "W" }, - { "x": 3.5, "y": 1, "w": 1, "label": "E" }, - { "x": 4.5, "y": 1, "w": 1, "label": "R" }, - { "x": 5.5, "y": 1, "w": 1, "label": "T" }, - { "x": 6.5, "y": 1, "w": 1, "label": "Y" }, - { "x": 7.5, "y": 1, "w": 1, "label": "U" }, - { "x": 8.5, "y": 1, "w": 1, "label": "I" }, - { "x": 9.5, "y": 1, "w": 1, "label": "O" }, - { "x": 10.5, "y": 1, "w": 1, "label": "P" }, - { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, - { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, + { "x": 1.5, "y": 1, "label": "Q" }, + { "x": 2.5, "y": 1, "label": "W" }, + { "x": 3.5, "y": 1, "label": "E" }, + { "x": 4.5, "y": 1, "label": "R" }, + { "x": 5.5, "y": 1, "label": "T" }, + { "x": 6.5, "y": 1, "label": "Y" }, + { "x": 7.5, "y": 1, "label": "U" }, + { "x": 8.5, "y": 1, "label": "I" }, + { "x": 9.5, "y": 1, "label": "O" }, + { "x": 10.5, "y": 1, "label": "P" }, + { "x": 11.5, "y": 1, "label": "LBRACKET" }, + { "x": 12.5, "y": 1, "label": "RBRACKET" }, { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" }, - { "x": 15.25, "y": 1, "w": 1, "label": "PAGEUP" }, + { "x": 15.25, "y": 1, "label": "PAGEUP" }, { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, - { "x": 1.75, "y": 2, "w": 1, "label": "A" }, - { "x": 2.75, "y": 2, "w": 1, "label": "S" }, - { "x": 3.75, "y": 2, "w": 1, "label": "D" }, - { "x": 4.75, "y": 2, "w": 1, "label": "F" }, - { "x": 5.75, "y": 2, "w": 1, "label": "G" }, - { "x": 6.75, "y": 2, "w": 1, "label": "H" }, - { "x": 7.75, "y": 2, "w": 1, "label": "J" }, - { "x": 8.75, "y": 2, "w": 1, "label": "K" }, - { "x": 9.75, "y": 2, "w": 1, "label": "L" }, - { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" }, - { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, - { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" }, + { "x": 1.75, "y": 2, "label": "A" }, + { "x": 2.75, "y": 2, "label": "S" }, + { "x": 3.75, "y": 2, "label": "D" }, + { "x": 4.75, "y": 2, "label": "F" }, + { "x": 5.75, "y": 2, "label": "G" }, + { "x": 6.75, "y": 2, "label": "H" }, + { "x": 7.75, "y": 2, "label": "J" }, + { "x": 8.75, "y": 2, "label": "K" }, + { "x": 9.75, "y": 2, "label": "L" }, + { "x": 10.75, "y": 2, "label": "SEMICOLON" }, + { "x": 11.75, "y": 2, "label": "QUOTE" }, + { "x": 12.75, "y": 2, "label": "ISOHASH" }, { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" }, - { "x": 15.25, "y": 2, "w": 1, "label": "PAGEDOWN" }, + { "x": 15.25, "y": 2, "label": "PAGEDOWN" }, { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" }, - { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" }, - { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, - { "x": 3.25, "y": 3, "w": 1, "label": "X" }, - { "x": 4.25, "y": 3, "w": 1, "label": "C" }, - { "x": 5.25, "y": 3, "w": 1, "label": "V" }, - { "x": 6.25, "y": 3, "w": 1, "label": "B" }, - { "x": 7.25, "y": 3, "w": 1, "label": "N" }, - { "x": 8.25, "y": 3, "w": 1, "label": "M" }, - { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" }, - { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, - { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, + { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" }, + { "x": 2.25, "y": 3, "label": "Z" }, + { "x": 3.25, "y": 3, "label": "X" }, + { "x": 4.25, "y": 3, "label": "C" }, + { "x": 5.25, "y": 3, "label": "V" }, + { "x": 6.25, "y": 3, "label": "B" }, + { "x": 7.25, "y": 3, "label": "N" }, + { "x": 8.25, "y": 3, "label": "M" }, + { "x": 9.25, "y": 3, "label": "COMMA" }, + { "x": 10.25, "y": 3, "label": "PERIOD" }, + { "x": 11.25, "y": 3, "label": "SLASH" }, { "x": 12.25, "y": 3, "w": 2, "label": "RSHIFT" }, - { "x": 14.25, "y": 3, "w": 1, "label": "UP" }, + { "x": 14.25, "y": 3, "label": "UP" }, { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" }, { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" }, { "x": 3.75, "y": 4, "w": 6.25, "label": "SPACE" }, - { "x": 10, "y": 4, "w": 1, "label": "RALT" }, - { "x": 11, "y": 4, "w": 1, "label": "FN" }, + { "x": 10, "y": 4, "label": "RALT" }, + { "x": 11, "y": 4, "label": "FN" }, { "x": 12, "y": 4, "w": 1.25, "label": "RCTRL" }, - { "x": 13.25, "y": 4, "w": 1, "label": "LEFT" }, - { "x": 14.25, "y": 4, "w": 1, "label": "DOWN" }, - { "x": 15.25, "y": 4, "w": 1, "label": "RIGHT" } + { "x": 13.25, "y": 4, "label": "LEFT" }, + { "x": 14.25, "y": 4, "label": "DOWN" }, + { "x": 15.25, "y": 4, "label": "RIGHT" } ] } } diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json index b28edb717a..bce81094c2 100644 --- a/keyboards/dztech/tofu/ii/v1/info.json +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -94,72 +94,72 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 }, + { "matrix": [0, 14], "x": 15, "y": 0 }, { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 }, + { "matrix": [1, 14], "x": 15, "y": 1 }, { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 }, + { "matrix": [2, 14], "x": 15, "y": 2 }, { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "x": 11.25, "y": 3 }, { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 }, { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 }, - { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 }, - { "matrix": [4, 14], "w": 1, "x": 15, "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/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json index a786b8689d..338c040255 100644 --- a/keyboards/dztech/tofu/jr/v1/info.json +++ b/keyboards/dztech/tofu/jr/v1/info.json @@ -97,74 +97,74 @@ "layouts": { "LAYOUT_65_ansi": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 }, + { "matrix": [0, 14], "x": 15, "y": 0 }, { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 }, + { "matrix": [1, 14], "x": 15, "y": 1 }, { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 }, + { "matrix": [2, 14], "x": 15, "y": 2 }, { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "x": 11.25, "y": 3 }, { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, - { "matrix": [3, 14], "w": 1, "x": 15, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, + { "matrix": [3, 14], "x": 15, "y": 3 }, { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 }, - { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 }, - { "matrix": [4, 10], "w": 1, "x": 12, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 }, - { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 }, - { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 } + { "matrix": [4, 8], "x": 10, "y": 4 }, + { "matrix": [4, 9], "x": 11, "y": 4 }, + { "matrix": [4, 10], "x": 12, "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/ergotravel/keymaps/ian/rules.mk b/keyboards/ergotravel/keymaps/ian/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/ergotravel/keymaps/ian/rules.mk +++ /dev/null diff --git a/keyboards/ergotravel/keymaps/rs/rules.mk b/keyboards/ergotravel/keymaps/rs/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/ergotravel/keymaps/rs/rules.mk +++ /dev/null diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index 9994741f24..0a24070bd8 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/info.json @@ -17,88 +17,88 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00", "x": 0, "y": 0, "w": 1 }, - { "label": "K01", "x": 1.25, "y": 0, "w": 1 }, - { "label": "K02", "x": 2.25, "y": 0, "w": 1 }, - { "label": "K03", "x": 3.25, "y": 0, "w": 1 }, - { "label": "K04", "x": 4.25, "y": 0, "w": 1 }, - { "label": "K05", "x": 5.5, "y": 0, "w": 1 }, - { "label": "K06", "x": 6.5, "y": 0, "w": 1 }, - { "label": "K07", "x": 7.5, "y": 0, "w": 1 }, - { "label": "K08", "x": 8.5, "y": 0, "w": 1 }, - { "label": "K09", "x": 9.75, "y": 0, "w": 1 }, - { "label": "K0a", "x": 10.75, "y": 0, "w": 1 }, - { "label": "K0b", "x": 11.75, "y": 0, "w": 1 }, - { "label": "K0c", "x": 12.75, "y": 0, "w": 1 }, - { "label": "K0e", "x": 14, "y": 0, "w": 1 }, - { "label": "K0f", "x": 15.25, "y": 0, "w": 1 }, - { "label": "K10", "x": 0, "y": 1, "w": 1 }, - { "label": "K11", "x": 1, "y": 1, "w": 1 }, - { "label": "K12", "x": 2, "y": 1, "w": 1 }, - { "label": "K13", "x": 3, "y": 1, "w": 1 }, - { "label": "K14", "x": 4, "y": 1, "w": 1 }, - { "label": "K15", "x": 5, "y": 1, "w": 1 }, - { "label": "K16", "x": 6, "y": 1, "w": 1 }, - { "label": "K17", "x": 7, "y": 1, "w": 1 }, - { "label": "K18", "x": 8, "y": 1, "w": 1 }, - { "label": "K19", "x": 9, "y": 1, "w": 1 }, - { "label": "K1a", "x": 10, "y": 1, "w": 1 }, - { "label": "K1b", "x": 11, "y": 1, "w": 1 }, - { "label": "K1c", "x": 12, "y": 1, "w": 1 }, - { "label": "K1d", "x": 13, "y": 1, "w": 1 }, - { "label": "K1e", "x": 14, "y": 1, "w": 1 }, - { "label": "K1f", "x": 15.25, "y": 1, "w": 1 }, + { "label": "K00", "x": 0, "y": 0 }, + { "label": "K01", "x": 1.25, "y": 0 }, + { "label": "K02", "x": 2.25, "y": 0 }, + { "label": "K03", "x": 3.25, "y": 0 }, + { "label": "K04", "x": 4.25, "y": 0 }, + { "label": "K05", "x": 5.5, "y": 0 }, + { "label": "K06", "x": 6.5, "y": 0 }, + { "label": "K07", "x": 7.5, "y": 0 }, + { "label": "K08", "x": 8.5, "y": 0 }, + { "label": "K09", "x": 9.75, "y": 0 }, + { "label": "K0a", "x": 10.75, "y": 0 }, + { "label": "K0b", "x": 11.75, "y": 0 }, + { "label": "K0c", "x": 12.75, "y": 0 }, + { "label": "K0e", "x": 14, "y": 0 }, + { "label": "K0f", "x": 15.25, "y": 0 }, + { "label": "K10", "x": 0, "y": 1 }, + { "label": "K11", "x": 1, "y": 1 }, + { "label": "K12", "x": 2, "y": 1 }, + { "label": "K13", "x": 3, "y": 1 }, + { "label": "K14", "x": 4, "y": 1 }, + { "label": "K15", "x": 5, "y": 1 }, + { "label": "K16", "x": 6, "y": 1 }, + { "label": "K17", "x": 7, "y": 1 }, + { "label": "K18", "x": 8, "y": 1 }, + { "label": "K19", "x": 9, "y": 1 }, + { "label": "K1a", "x": 10, "y": 1 }, + { "label": "K1b", "x": 11, "y": 1 }, + { "label": "K1c", "x": 12, "y": 1 }, + { "label": "K1d", "x": 13, "y": 1 }, + { "label": "K1e", "x": 14, "y": 1 }, + { "label": "K1f", "x": 15.25, "y": 1 }, { "label": "K20", "x": 0, "y": 2, "w": 1.5 }, - { "label": "K22", "x": 1.5, "y": 2, "w": 1 }, - { "label": "K23", "x": 2.5, "y": 2, "w": 1 }, - { "label": "K24", "x": 3.5, "y": 2, "w": 1 }, - { "label": "K25", "x": 4.5, "y": 2, "w": 1 }, - { "label": "K26", "x": 5.5, "y": 2, "w": 1 }, - { "label": "K27", "x": 6.5, "y": 2, "w": 1 }, - { "label": "K28", "x": 7.5, "y": 2, "w": 1 }, - { "label": "K29", "x": 8.5, "y": 2, "w": 1 }, - { "label": "K2a", "x": 9.5, "y": 2, "w": 1 }, - { "label": "K2b", "x": 10.5, "y": 2, "w": 1 }, - { "label": "K2c", "x": 11.5, "y": 2, "w": 1 }, - { "label": "K2d", "x": 12.5, "y": 2, "w": 1 }, + { "label": "K22", "x": 1.5, "y": 2 }, + { "label": "K23", "x": 2.5, "y": 2 }, + { "label": "K24", "x": 3.5, "y": 2 }, + { "label": "K25", "x": 4.5, "y": 2 }, + { "label": "K26", "x": 5.5, "y": 2 }, + { "label": "K27", "x": 6.5, "y": 2 }, + { "label": "K28", "x": 7.5, "y": 2 }, + { "label": "K29", "x": 8.5, "y": 2 }, + { "label": "K2a", "x": 9.5, "y": 2 }, + { "label": "K2b", "x": 10.5, "y": 2 }, + { "label": "K2c", "x": 11.5, "y": 2 }, + { "label": "K2d", "x": 12.5, "y": 2 }, { "label": "K2e", "x": 13.5, "y": 2, "w": 1.5 }, - { "label": "K2f", "x": 15.25, "y": 2, "w": 1 }, + { "label": "K2f", "x": 15.25, "y": 2 }, { "label": "K30", "x": 0, "y": 3, "w": 1.75 }, - { "label": "K32", "x": 1.75, "y": 3, "w": 1 }, - { "label": "K33", "x": 2.75, "y": 3, "w": 1 }, - { "label": "K34", "x": 3.75, "y": 3, "w": 1 }, - { "label": "K35", "x": 4.75, "y": 3, "w": 1 }, - { "label": "K36", "x": 5.75, "y": 3, "w": 1 }, - { "label": "K37", "x": 6.75, "y": 3, "w": 1 }, - { "label": "K38", "x": 7.75, "y": 3, "w": 1 }, - { "label": "K39", "x": 8.75, "y": 3, "w": 1 }, - { "label": "K3a", "x": 9.75, "y": 3, "w": 1 }, - { "label": "K3b", "x": 10.75, "y": 3, "w": 1 }, - { "label": "K3c", "x": 11.75, "y": 3, "w": 1 }, + { "label": "K32", "x": 1.75, "y": 3 }, + { "label": "K33", "x": 2.75, "y": 3 }, + { "label": "K34", "x": 3.75, "y": 3 }, + { "label": "K35", "x": 4.75, "y": 3 }, + { "label": "K36", "x": 5.75, "y": 3 }, + { "label": "K37", "x": 6.75, "y": 3 }, + { "label": "K38", "x": 7.75, "y": 3 }, + { "label": "K39", "x": 8.75, "y": 3 }, + { "label": "K3a", "x": 9.75, "y": 3 }, + { "label": "K3b", "x": 10.75, "y": 3 }, + { "label": "K3c", "x": 11.75, "y": 3 }, { "label": "K3d", "x": 12.75, "y": 3, "w": 2.25 }, { "label": "K40", "x": 0, "y": 4, "w": 1.25 }, - { "label": "K41", "x": 1.25, "y": 4, "w": 1 }, - { "label": "K42", "x": 2.25, "y": 4, "w": 1 }, - { "label": "K43", "x": 3.25, "y": 4, "w": 1 }, - { "label": "K44", "x": 4.25, "y": 4, "w": 1 }, - { "label": "K45", "x": 5.25, "y": 4, "w": 1 }, - { "label": "K46", "x": 6.25, "y": 4, "w": 1 }, - { "label": "K47", "x": 7.25, "y": 4, "w": 1 }, - { "label": "K48", "x": 8.25, "y": 4, "w": 1 }, - { "label": "K49", "x": 9.25, "y": 4, "w": 1 }, - { "label": "K4a", "x": 10.25, "y": 4, "w": 1 }, - { "label": "K4b", "x": 11.25, "y": 4, "w": 1 }, + { "label": "K41", "x": 1.25, "y": 4 }, + { "label": "K42", "x": 2.25, "y": 4 }, + { "label": "K43", "x": 3.25, "y": 4 }, + { "label": "K44", "x": 4.25, "y": 4 }, + { "label": "K45", "x": 5.25, "y": 4 }, + { "label": "K46", "x": 6.25, "y": 4 }, + { "label": "K47", "x": 7.25, "y": 4 }, + { "label": "K48", "x": 8.25, "y": 4 }, + { "label": "K49", "x": 9.25, "y": 4 }, + { "label": "K4a", "x": 10.25, "y": 4 }, + { "label": "K4b", "x": 11.25, "y": 4 }, { "label": "K4d", "x": 12.25, "y": 4, "w": 1.75 }, - { "label": "K4e", "x": 14.25, "y": 4.25, "w": 1 }, + { "label": "K4e", "x": 14.25, "y": 4.25 }, { "label": "K50", "x": 0, "y": 5, "w": 1.25 }, { "label": "K51", "x": 1.25, "y": 5, "w": 1.25 }, { "label": "K52", "x": 2.5, "y": 5, "w": 1.25 }, { "label": "K56", "x": 3.75, "y": 5, "w": 6.25 }, { "label": "K5a", "x": 10, "y": 5, "w": 1.25 }, { "label": "K5b", "x": 11.25, "y": 5, "w": 1.25 }, - { "label": "K5d", "x": 13.25, "y": 5.25, "w": 1 }, - { "label": "K5e", "x": 14.25, "y": 5.25, "w": 1 }, - { "label": "K5f", "x": 15.25, "y": 5.25, "w": 1 } + { "label": "K5d", "x": 13.25, "y": 5.25 }, + { "label": "K5e", "x": 14.25, "y": 5.25 }, + { "label": "K5f", "x": 15.25, "y": 5.25 } ] } } diff --git a/keyboards/for_science/info.json b/keyboards/for_science/info.json index 2864385fb0..a1f49342df 100644 --- a/keyboards/for_science/info.json +++ b/keyboards/for_science/info.json @@ -29,61 +29,61 @@ "layouts": { "LAYOUT_split_4x5_3": { "layout": [ - { "label": "L00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "L00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "L01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "L02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "L03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "L04", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "R00", "matrix": [5, 0], "w": 1, "x": 6.25, "y": 0 }, - { "label": "R01", "matrix": [5, 1], "w": 1, "x": 7.25, "y": 0 }, - { "label": "R02", "matrix": [5, 2], "w": 1, "x": 8.25, "y": 0 }, - { "label": "R03", "matrix": [5, 3], "w": 1, "x": 9.25, "y": 0 }, - { "label": "R04", "matrix": [5, 4], "w": 1, "x": 10.25, "y": 0 }, + { "label": "R00", "matrix": [5, 0], "x": 6.25, "y": 0 }, + { "label": "R01", "matrix": [5, 1], "x": 7.25, "y": 0 }, + { "label": "R02", "matrix": [5, 2], "x": 8.25, "y": 0 }, + { "label": "R03", "matrix": [5, 3], "x": 9.25, "y": 0 }, + { "label": "R04", "matrix": [5, 4], "x": 10.25, "y": 0 }, - { "label": "L10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, + { "label": "L10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "L11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "L12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "L13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "L14", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "R10", "matrix": [6, 0], "w": 1, "x": 6.25, "y": 1 }, - { "label": "R11", "matrix": [6, 1], "w": 1, "x": 7.25, "y": 1 }, - { "label": "R12", "matrix": [6, 2], "w": 1, "x": 8.25, "y": 1 }, - { "label": "R13", "matrix": [6, 3], "w": 1, "x": 9.25, "y": 1 }, - { "label": "R14", "matrix": [6, 4], "w": 1, "x": 10.25, "y": 1 }, + { "label": "R10", "matrix": [6, 0], "x": 6.25, "y": 1 }, + { "label": "R11", "matrix": [6, 1], "x": 7.25, "y": 1 }, + { "label": "R12", "matrix": [6, 2], "x": 8.25, "y": 1 }, + { "label": "R13", "matrix": [6, 3], "x": 9.25, "y": 1 }, + { "label": "R14", "matrix": [6, 4], "x": 10.25, "y": 1 }, - { "label": "L20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, + { "label": "L20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "L21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "L22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "L23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "L24", "matrix": [2, 4], "x": 4, "y": 2 }, - { "label": "R20", "matrix": [7, 0], "w": 1, "x": 6.25, "y": 2 }, - { "label": "R21", "matrix": [7, 1], "w": 1, "x": 7.25, "y": 2 }, - { "label": "R22", "matrix": [7, 2], "w": 1, "x": 8.25, "y": 2 }, - { "label": "R23", "matrix": [7, 3], "w": 1, "x": 9.25, "y": 2 }, - { "label": "R24", "matrix": [7, 4], "w": 1, "x": 10.25, "y": 2 }, + { "label": "R20", "matrix": [7, 0], "x": 6.25, "y": 2 }, + { "label": "R21", "matrix": [7, 1], "x": 7.25, "y": 2 }, + { "label": "R22", "matrix": [7, 2], "x": 8.25, "y": 2 }, + { "label": "R23", "matrix": [7, 3], "x": 9.25, "y": 2 }, + { "label": "R24", "matrix": [7, 4], "x": 10.25, "y": 2 }, - { "label": "L30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, - { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, + { "label": "L30", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "L31", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "L32", "matrix": [3, 2], "x": 2, "y": 3 }, + { "label": "L33", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "L34", "matrix": [3, 4], "x": 4, "y": 3 }, - { "label": "R30", "matrix": [8, 0], "w": 1, "x": 6.25, "y": 3 }, - { "label": "R31", "matrix": [8, 1], "w": 1, "x": 7.25, "y": 3 }, - { "label": "R32", "matrix": [8, 2], "w": 1, "x": 8.25, "y": 3 }, - { "label": "R33", "matrix": [8, 3], "w": 1, "x": 9.25, "y": 3 }, - { "label": "R34", "matrix": [8, 4], "w": 1, "x": 10.25, "y": 3 }, + { "label": "R30", "matrix": [8, 0], "x": 6.25, "y": 3 }, + { "label": "R31", "matrix": [8, 1], "x": 7.25, "y": 3 }, + { "label": "R32", "matrix": [8, 2], "x": 8.25, "y": 3 }, + { "label": "R33", "matrix": [8, 3], "x": 9.25, "y": 3 }, + { "label": "R34", "matrix": [8, 4], "x": 10.25, "y": 3 }, - { "label": "LT1", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 }, - { "label": "LT2", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 }, - { "label": "LT3", "matrix": [4, 4], "w": 1, "x": 4, "y": 4 }, + { "label": "LT1", "matrix": [4, 2], "x": 2, "y": 4 }, + { "label": "LT2", "matrix": [4, 3], "x": 3, "y": 4 }, + { "label": "LT3", "matrix": [4, 4], "x": 4, "y": 4 }, - { "label": "RT1", "matrix": [9, 0], "w": 1, "x": 6.25, "y": 4 }, - { "label": "RT2", "matrix": [9, 1], "w": 1, "x": 7.25, "y": 4 }, - { "label": "RT3", "matrix": [9, 2], "w": 1, "x": 8.25, "y": 4 } + { "label": "RT1", "matrix": [9, 0], "x": 6.25, "y": 4 }, + { "label": "RT2", "matrix": [9, 1], "x": 7.25, "y": 4 }, + { "label": "RT3", "matrix": [9, 2], "x": 8.25, "y": 4 } ] } } diff --git a/keyboards/fortitude60/keymaps/default/rules.mk b/keyboards/fortitude60/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/fortitude60/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h index 152c1a512b..f7e36e63eb 100644 --- a/keyboards/gami_studio/lex60/config.h +++ b/keyboards/gami_studio/lex60/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {D5,D4,B0,D2,D3} -#define MATRIX_COL_PINS {B7,F7,C7,E6,C6,F0,B6,F1,B5,F4,B4,F5,D7,F6,D6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D1 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index 8c1d730787..62ac3b40bf 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -8,6 +8,11 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "F7", "C7", "E6", "C6", "F0", "B6", "F1", "B5", "F4", "B4", "F5", "D7", "F6", "D6"], + "rows": ["D5", "D4", "B0", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D5", "esc_output": "B7" diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index d0415c48f5..a3516ccedb 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -4,9 +4,3 @@ #define VERSION "Paula Deen" #define FORCE_NKRO - -#define MATRIX_ROW_PINS { F4, F5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 085d56f91e..465cd940a1 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -8,6 +8,11 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"], + "rows": ["F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h index 0d5c58df21..84c54c9e2e 100644 --- a/keyboards/gboards/butterstick/sten.h +++ b/keyboards/gboards/butterstick/sten.h @@ -5,9 +5,10 @@ // // Amen. +#pragma once + #include QMK_KEYBOARD_H #include "mousekey.h" -#include "keymap.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 5b9d5b0ecb..5b2da811d8 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -10,9 +10,8 @@ crap is removed where possible */ -#include QMK_KEYBOARD_H #pragma once -#include "keymap.h" +#include QMK_KEYBOARD_H #include <string.h> #include <stdint.h> #include <stdio.h> diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index 547ea09fdd..e166ba37d2 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -10,9 +10,9 @@ crap is removed where possible */ -#include QMK_KEYBOARD_H #pragma once -#include "keymap.h" + +#include QMK_KEYBOARD_H #include <string.h> #include <stdint.h> #include <stdio.h> diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h index 320c49514c..05d518efac 100644 --- a/keyboards/gboards/georgi/sten.h +++ b/keyboards/gboards/georgi/sten.h @@ -4,10 +4,10 @@ // the slave and the master. Until we return from main. // // Amen. +#pragma once #include QMK_KEYBOARD_H #include "mousekey.h" -#include "keymap.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index 0a184388ae..0fea806b6f 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -1,10 +1,5 @@ #pragma once - -#define MATRIX_ROW_PINS { B0, D4} -#define MATRIX_COL_PINS { F7, F6, D2, D3} - -#define DIODE_DIRECTION COL2ROW #define LOCKING_SUPPORT_ENABL #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index fdc0463e41..97d2c078fe 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -8,6 +8,11 @@ "pid": "0x1319", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "D2", "D3"], + "rows": ["B0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "debounce": 3, diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h deleted file mode 100644 index 20163dedc5..0000000000 --- a/keyboards/generic_panda/panda65_01/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 generic_panda - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A9, A8, B15, A6, A4 } -#define MATRIX_COL_PINS { A3, A10, B7, B6, B5, B4, B3, A15, A14, A2, A1, A0, F1, F0, B10, B11 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json index 57fe2ea133..fe6292d80f 100644 --- a/keyboards/generic_panda/panda65_01/info.json +++ b/keyboards/generic_panda/panda65_01/info.json @@ -8,6 +8,11 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A2", "A1", "A0", "F1", "F0", "B10", "B11"], + "rows": ["A9", "A8", "B15", "A6", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h deleted file mode 100644 index 9c6056154a..0000000000 --- a/keyboards/genone/eclipse_65/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/info.json index b17bc2bf68..ad20ba2837 100644 --- a/keyboards/genone/eclipse_65/info.json +++ b/keyboards/genone/eclipse_65/info.json @@ -8,6 +8,11 @@ "pid": "0x2222", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["B3", "B7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/genone/g1_65/config.h b/keyboards/genone/g1_65/config.h deleted file mode 100644 index 95e67a9d12..0000000000 --- a/keyboards/genone/g1_65/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/genone/g1_65/info.json b/keyboards/genone/g1_65/info.json index da5a1df03a..2e02a77ff1 100644 --- a/keyboards/genone/g1_65/info.json +++ b/keyboards/genone/g1_65/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["B3", "B7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/geonworks/frogmini/fmh/config.h b/keyboards/geonworks/frogmini/fmh/config.h index 4f62de8d8b..7410a49e59 100644 --- a/keyboards/geonworks/frogmini/fmh/config.h +++ b/keyboards/geonworks/frogmini/fmh/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 -#define MATRIX_COL_PINS { C4 , C5 , B0 , C13, C14, C15, B9 , C1 , C2 , C3 , A6 , A5 , A4 , A0 } -// R0 , R1 , R2 , R3 , R4 , R5 , R6 -#define MATRIX_ROW_PINS { A3 , A2 , A1 , B8 , A7 , C0 } - -#define DIODE_DIRECTION COL2ROW - #define I2C_DRIVER I2CD1 #define I2C_SCL_PIN B6 #define I2C_SDA_PIN B7 diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/info.json index 856705b4f1..617c7a4972 100644 --- a/keyboards/geonworks/frogmini/fmh/info.json +++ b/keyboards/geonworks/frogmini/fmh/info.json @@ -8,6 +8,11 @@ "pid": "0x2D28", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], + "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/geonworks/frogmini/fms/config.h b/keyboards/geonworks/frogmini/fms/config.h index ad9c202933..6576ee9efe 100644 --- a/keyboards/geonworks/frogmini/fms/config.h +++ b/keyboards/geonworks/frogmini/fms/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 -#define MATRIX_COL_PINS { C4 , C5 , B0 , C13, C14, C15, B9 , C1 , C2 , C3 , A6 , A5 , A4 , A0 } -// R0 , R1 , R2 , R3 , R4 , R5 , R6 -#define MATRIX_ROW_PINS { A3 , A2 , A1 , B8 , A7 , C0 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/info.json index 9e51f9226f..5c459d129e 100644 --- a/keyboards/geonworks/frogmini/fms/info.json +++ b/keyboards/geonworks/frogmini/fms/info.json @@ -8,6 +8,11 @@ "pid": "0x2D33", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], + "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A10", "levels": 20 diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h deleted file mode 100644 index b2d8ee9014..0000000000 --- a/keyboards/ggkeyboards/genesis/hotswap/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS \ - { C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS \ - { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json index 35b52cb9c4..8963434bd9 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xD4D3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], + "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h deleted file mode 100644 index 6bdd3cc57c..0000000000 --- a/keyboards/ggkeyboards/genesis/solder/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json index ebc309987c..27b1d36847 100644 --- a/keyboards/ggkeyboards/genesis/solder/info.json +++ b/keyboards/ggkeyboards/genesis/solder/info.json @@ -8,6 +8,11 @@ "pid": "0xD4D2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], + "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h index fdeb69cae2..baf09cebb5 100644 --- a/keyboards/gh60/revc/config.h +++ b/keyboards/gh60/revc/config.h @@ -17,26 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -// Rev A -// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 } -// Rev B/C - #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json index 052eaea8a3..9db9441171 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/gh60/revc/keymaps/sethbc/rules.mk b/keyboards/gh60/revc/keymaps/sethbc/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/gh60/revc/keymaps/sethbc/rules.mk +++ /dev/null diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index ce76bc8233..3e9a6d3a1c 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 88a09cb3f6..9a3b190d54 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h index a7d7231e25..5382607589 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json index 4806535fd0..648a98e37c 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 15 diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h index 5befa284fa..b44dfaac52 100644 --- a/keyboards/gh80_3000/config.h +++ b/keyboards/gh80_3000/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 } -#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json index b03ea8f6a3..abc9c14051 100644 --- a/keyboards/gh80_3000/info.json +++ b/keyboards/gh80_3000/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], + "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["fullsize_ansi", "fullsize_iso"], diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h index 2853b095cc..ea09e835d0 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN #define RGBLED_NUM 17 diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index 1a8b534e56..b97ee064fd 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"], + "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h index 01e84b4cdd..1b2a8bdf5b 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B1, F7, F6, F5, F4, B3, B2, B6, D0, D1 } -#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, C7, B7, F1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index 30bd26159f..31c0c3366d 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -8,6 +8,11 @@ "pid": "0xF4B0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [] }, @@ -19,6 +24,12 @@ {"pin_a": "B4", "pin_b": "B6"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h index 402c6f17cc..ba683e4fed 100755 --- a/keyboards/gizmo_engineering/gk6/config.h +++ b/keyboards/gizmo_engineering/gk6/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments -*/ -#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4} -#define MATRIX_COL_PINS { B5, C6, C7, F7, F6, D5, D3, D2, F1, F4, B7, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - // RGB Matrix #define DRIVER_ADDR_1 0b1110100 #define DRIVER_ADDR_2 0b1110111 diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json index a8c0e5b05d..f3169e3c0d 100644 --- a/keyboards/gizmo_engineering/gk6/info.json +++ b/keyboards/gizmo_engineering/gk6/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"], + "rows": ["B6", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h index 9589c7887d..036340f2fd 100644 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ b/keyboards/gkeyboard/gkb_m16/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, D5, D6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index ca200a1485..4719f1ee94 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -8,6 +8,11 @@ "pid": "0x4201", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7"], + "rows": ["D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index 76e6e89925..0ece27735d 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5045", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 3] }, diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h index c2483d675f..64febeb948 100644 --- a/keyboards/gmmk/gmmk2/p65/config.h +++ b/keyboards/gmmk/gmmk2/p65/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json index 5d5aba914e..af52b203dc 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x504A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 3] }, diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index f5b05748c7..5a67f0b74c 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x504B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index 19cab78423..16aae9b330 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index a2f377615b..22678f64a1 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x505A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index c633d722a0..8188418469 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json index b8a7e94a82..7e66ad5043 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json index 48181ec488..082f28a774 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index a8a25f8547..0a20c97d2e 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index c37ccd53df..e3cb707c48 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index c3762c6388..fa9a83d08e 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -1,12 +1,5 @@ #pragma once -/* matrix pins */ -#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 097d4d45c0..4b1f158717 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -8,6 +8,11 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"], + "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h index 8db20474be..fa9a83d08e 100644 --- a/keyboards/gon/nerdtkl/config.h +++ b/keyboards/gon/nerdtkl/config.h @@ -1,12 +1,5 @@ #pragma once -/* matrix pins */ -#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index f9e38f0c89..ac7d8a0ce7 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -8,6 +8,11 @@ "pid": "0x5244", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"], + "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h index f660448b46..86fc4cef7f 100644 --- a/keyboards/gopolar/gg86/config.h +++ b/keyboards/gopolar/gg86/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C6, B6, B5, B4, D7, D6, D4, C7, E6, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index dc017f23c4..d03cbc899b 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gorthage_truck/config.h b/keyboards/gorthage_truck/config.h deleted file mode 100644 index 56b84cb427..0000000000 --- a/keyboards/gorthage_truck/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 s8erdude - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, B6, B5, B4, C7, B3, B7, D7} -#define MATRIX_COL_PINS { F0, F1, F4, F7, D6, E6, B0, B1, B2} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json index fe5b37c6b8..7f40f6583f 100644 --- a/keyboards/gorthage_truck/info.json +++ b/keyboards/gorthage_truck/info.json @@ -8,6 +8,11 @@ "pid": "0x58E4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F7", "D6", "E6", "B0", "B1", "B2"], + "rows": ["C6", "B6", "B5", "B4", "C7", "B3", "B7", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} diff --git a/keyboards/gowla/config.h b/keyboards/gowla/config.h deleted file mode 100644 index 843389ea2e..0000000000 --- a/keyboards/gowla/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* Pin-out */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { B5, B4, E6 } - -/* ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/gowla/info.json b/keyboards/gowla/info.json index 8393d1c82d..b9225b0cf0 100644 --- a/keyboards/gowla/info.json +++ b/keyboards/gowla/info.json @@ -8,6 +8,11 @@ "pid": "0xE9B6", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h index 479ca4c744..70ee32e0a3 100644 --- a/keyboards/gray_studio/aero75/config.h +++ b/keyboards/gray_studio/aero75/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { A7, A6, B12, A2, A1, A0 } -#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B1, A8, B15, B14, B13 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index 37376a90e9..aaf8cf8dfd 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json @@ -8,6 +8,11 @@ "pid": "0x3075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"], + "rows": ["A7", "A6", "B12", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h index 8d360498a5..ceab86fb29 100644 --- a/keyboards/gray_studio/apollo80/config.h +++ b/keyboards/gray_studio/apollo80/config.h @@ -16,21 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index 2f090ef342..5fc332b465 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -8,6 +8,11 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], + "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h index 64b58911e3..ee5248471a 100644 --- a/keyboards/gray_studio/cod67/config.h +++ b/keyboards/gray_studio/cod67/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } -#define MATRIX_COL_PINS { D7, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index 2f8a81d08e..06de4b4f4b 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -8,6 +8,11 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"], + "rows": ["C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "on_state": 0 diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h index 20dbdb3f50..41df8a357d 100644 --- a/keyboards/gray_studio/hb85/config.h +++ b/keyboards/gray_studio/hb85/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index a8b7641a0b..e49b1667c5 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -8,6 +8,11 @@ "pid": "0x2000", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h index 17a91e8e47..1b3e39536f 100644 --- a/keyboards/gray_studio/space65/config.h +++ b/keyboards/gray_studio/space65/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 } -#define MATRIX_COL_PINS { B0, B3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index 0689443af5..92eb084b56 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["D0", "D1", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h index 0cd753963c..089bb27b17 100644 --- a/keyboards/gray_studio/space65r3/config.h +++ b/keyboards/gray_studio/space65r3/config.h @@ -2,23 +2,6 @@ // SPDX-License-Identifier: GPL-2.0 #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { A6, B12, A2, A0, A1 } -#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B0, A8, B15, B14, B13 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json index b514a2886b..c2eca2b769 100644 --- a/keyboards/gray_studio/space65r3/info.json +++ b/keyboards/gray_studio/space65r3/info.json @@ -8,6 +8,11 @@ "pid":"0x3003", "device_version": "0.0.3", }, + "matrix_pins": { + "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"], + "rows": ["A6", "B12", "A2", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h index cad954709b..1934bc77ad 100644 --- a/keyboards/gray_studio/think65/hotswap/config.h +++ b/keyboards/gray_studio/think65/hotswap/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json index 1ec54ad748..ff21f224f4 100644 --- a/keyboards/gray_studio/think65/hotswap/info.json +++ b/keyboards/gray_studio/think65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x4001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index b6e0419aa1..1934bc77ad 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - // 0 1 2 3 4 5 6 7 8 9 A B C D E F -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json index 5374b4619d..c16f665209 100644 --- a/keyboards/gray_studio/think65/solder/info.json +++ b/keyboards/gray_studio/think65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h index a5a0733063..38cde33eec 100644 --- a/keyboards/grid600/press/config.h +++ b/keyboards/grid600/press/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0 } -#define MATRIX_COL_PINS { F1, F4, F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN B6 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index 6fb7c8d5b0..0e0aaff476 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -8,6 +8,11 @@ "pid": "0x7539", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6"], + "rows": ["F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gvalchca/ga150/config.h b/keyboards/gvalchca/ga150/config.h deleted file mode 100644 index 7678422bc5..0000000000 --- a/keyboards/gvalchca/ga150/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Kirill Shkuretskiy - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B2,B3,F1,F0} -#define MATRIX_COL_PINS {E6,B7,D5,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json index 4e2d65df59..53b4b69a42 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/info.json @@ -8,6 +8,11 @@ "pid": "0x6135", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "D3"], + "rows": ["B1", "B2", "B3", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "E6" diff --git a/keyboards/gvalchca/spaccboard/config.h b/keyboards/gvalchca/spaccboard/config.h deleted file mode 100644 index 2703cdd688..0000000000 --- a/keyboards/gvalchca/spaccboard/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Kirill Shkuretskiy - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B2,B3,C7,F0} -#define MATRIX_COL_PINS {E6,B7,D5,D6,D7,B4,B5,B6,C6,F7,F6,F5,F4,F1,D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json index 435abb01e0..31c752537f 100644 --- a/keyboards/gvalchca/spaccboard/info.json +++ b/keyboards/gvalchca/spaccboard/info.json @@ -8,6 +8,11 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "D3"], + "rows": ["B1", "B2", "B3", "C7", "F0"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "E6" diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h index 2d677beb5c..489dae2a4e 100644 --- a/keyboards/handwired/arrow_pad/arrow_pad.h +++ b/keyboards/handwired/arrow_pad/arrow_pad.h @@ -1,13 +1,6 @@ #pragma once #include "quantum.h" -#include "matrix.h" -#include "keymap.h" -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif -#include <avr/io.h> -#include <stddef.h> #define XXX KC_NO diff --git a/keyboards/handwired/chiron/keymaps/default/rules.mk b/keyboards/handwired/chiron/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/chiron/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/handwired/co60/info.json b/keyboards/handwired/co60/info.json index 04541098a2..1ea1ac4ad2 100644 --- a/keyboards/handwired/co60/info.json +++ b/keyboards/handwired/co60/info.json @@ -9,13 +9,13 @@ "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"], "layouts": { "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":"Del", "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Win", "x":11, "y":4, "w":1}, {"label":"Menu", "x":12, "y":4, "w":1}, {"label":"Ctrl", "x":13, "y":4, "w":1}, {"label":"Fn", "x":14, "y":4, "w":1}] + "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":"Del", "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"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}] }, "LAYOUT_60_ansi": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"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":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] }, "LAYOUT_60_ansi_split_bs_rshift": { - "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, "w":1}, {"label":"Del", "x":14, "y":0, "w":1}, {"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":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3, "w":1}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + "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":"Del", "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":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] }, "LAYOUT_60_iso": { "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"CapsLock", "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":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index ab8ec811c3..b1fe1f8479 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -48,12 +48,12 @@ {"label":".", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3, "w":1}, + {"label":"Win", "x":1.25, "y":3}, {"label":"Alt", "x":2.25, "y":3, "w":1.25}, {"label":"Space", "x":3.5, "y":3, "w":2.25}, {"label":"Space", "x":5.75, "y":3, "w":2.75}, {"label":"App", "x":8.5, "y":3, "w":1.25}, - {"label":"Fn", "x":9.75, "y":3, "w":1}, + {"label":"Fn", "x":9.75, "y":3}, {"label":"Ctrl", "x":10.75, "y":3, "w":1.25} ] }, diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index 5ab526ce67..0c8f353bff 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -22,66 +22,66 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Enc", "x": 0, "y": 0, "w": 1}, + {"label": "Enc", "x": 0, "y": 0}, - {"label": "Esc", "x": 0, "y": 1, "w": 1}, - {"label": "1","x": 1, "y": 1, "w": 1}, - {"label": "2","x": 2, "y": 1, "w": 1}, - {"label": "3","x": 3, "y": 1, "w": 1}, - {"label": "4","x": 4, "y": 1, "w": 1}, - {"label": "5","x": 5, "y": 1, "w": 1}, - {"label": "6","x": 6, "y": 1, "w": 1}, - {"label": "7","x": 7, "y": 1, "w": 1}, - {"label": "8","x": 8, "y": 1, "w": 1}, - {"label": "9","x": 9, "y": 1, "w": 1}, - {"label": "0","x": 10, "y": 1, "w": 1}, - {"label": "-","x": 11, "y": 1, "w": 1}, - {"label": "=","x": 12, "y": 1, "w": 1}, - {"label": "\\","x": 13, "y": 1, "w": 1}, - {"label": "Del","x": 14, "y": 1, "w": 1}, + {"label": "Esc", "x": 0, "y": 1}, + {"label": "1","x": 1, "y": 1}, + {"label": "2","x": 2, "y": 1}, + {"label": "3","x": 3, "y": 1}, + {"label": "4","x": 4, "y": 1}, + {"label": "5","x": 5, "y": 1}, + {"label": "6","x": 6, "y": 1}, + {"label": "7","x": 7, "y": 1}, + {"label": "8","x": 8, "y": 1}, + {"label": "9","x": 9, "y": 1}, + {"label": "0","x": 10, "y": 1}, + {"label": "-","x": 11, "y": 1}, + {"label": "=","x": 12, "y": 1}, + {"label": "\\","x": 13, "y": 1}, + {"label": "Del","x": 14, "y": 1}, {"label": "Tab","x": 0, "y": 2, "w": 1.5}, - {"label": "Q","x": 1.5, "y": 2, "w": 1}, - {"label": "W","x": 2.5, "y": 2, "w": 1}, - {"label": "E","x": 3.5, "y": 2, "w": 1}, - {"label": "R","x": 4.5, "y": 2, "w": 1}, - {"label": "T","x": 5.5, "y": 2, "w": 1}, - {"label": "Y","x": 6.5, "y": 2, "w": 1}, - {"label": "U","x": 7.5, "y": 2, "w": 1}, - {"label": "I","x": 8.5, "y": 2, "w": 1}, - {"label": "O","x": 9.5, "y": 2, "w": 1}, - {"label": "P","x": 10.5, "y": 2, "w": 1}, - {"label": "[","x": 11.5, "y": 2, "w": 1}, - {"label": "]","x": 12.5, "y": 2, "w": 1}, + {"label": "Q","x": 1.5, "y": 2}, + {"label": "W","x": 2.5, "y": 2}, + {"label": "E","x": 3.5, "y": 2}, + {"label": "R","x": 4.5, "y": 2}, + {"label": "T","x": 5.5, "y": 2}, + {"label": "Y","x": 6.5, "y": 2}, + {"label": "U","x": 7.5, "y": 2}, + {"label": "I","x": 8.5, "y": 2}, + {"label": "O","x": 9.5, "y": 2}, + {"label": "P","x": 10.5, "y": 2}, + {"label": "[","x": 11.5, "y": 2}, + {"label": "]","x": 12.5, "y": 2}, {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5}, {"label": "Caps","x": 0, "y": 3, "w": 1.75}, - {"label": "A","x": 1.75, "y": 3, "w": 1}, - {"label": "S","x": 2.75, "y": 3, "w": 1}, - {"label": "D","x": 3.75, "y": 3, "w": 1}, - {"label": "F","x": 4.75, "y": 3, "w": 1}, - {"label": "G","x": 5.75, "y": 3, "w": 1}, - {"label": "H","x": 6.75, "y": 3, "w": 1}, - {"label": "J","x": 7.75, "y": 3, "w": 1}, - {"label": "K","x": 8.75, "y": 3, "w": 1}, - {"label": "L","x": 9.75, "y": 3, "w": 1}, - {"label": ";","x": 10.75, "y": 3, "w": 1}, - {"label": "'","x": 11.75, "y": 3, "w": 1}, + {"label": "A","x": 1.75, "y": 3}, + {"label": "S","x": 2.75, "y": 3}, + {"label": "D","x": 3.75, "y": 3}, + {"label": "F","x": 4.75, "y": 3}, + {"label": "G","x": 5.75, "y": 3}, + {"label": "H","x": 6.75, "y": 3}, + {"label": "J","x": 7.75, "y": 3}, + {"label": "K","x": 8.75, "y": 3}, + {"label": "L","x": 9.75, "y": 3}, + {"label": ";","x": 10.75, "y": 3}, + {"label": "'","x": 11.75, "y": 3}, {"label": "Enter","x": 12.75, "y": 3, "w": 2.25}, {"label": "L Shift","x": 0, "y": 4, "w": 2.25}, - {"label": "Z","x": 2.25, "y": 4, "w": 1}, - {"label": "X","x": 3.25, "y": 4, "w": 1}, - {"label": "C","x": 4.25, "y": 4, "w": 1}, - {"label": "V","x": 5.25, "y": 4, "w": 1}, - {"label": "B","x": 6.25, "y": 4, "w": 1}, - {"label": "N","x": 7.25, "y": 4, "w": 1}, - {"label": "M","x": 8.25, "y": 4, "w": 1}, - {"label": ",","x": 9.25, "y": 4, "w": 1}, - {"label": ".","x": 10.25, "y": 4, "w": 1}, - {"label": "/","x": 11.25, "y": 4, "w": 1}, + {"label": "Z","x": 2.25, "y": 4}, + {"label": "X","x": 3.25, "y": 4}, + {"label": "C","x": 4.25, "y": 4}, + {"label": "V","x": 5.25, "y": 4}, + {"label": "B","x": 6.25, "y": 4}, + {"label": "N","x": 7.25, "y": 4}, + {"label": "M","x": 8.25, "y": 4}, + {"label": ",","x": 9.25, "y": 4}, + {"label": ".","x": 10.25, "y": 4}, + {"label": "/","x": 11.25, "y": 4}, {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75}, - {"label": "FN","x": 14, "y": 4, "w": 1}, + {"label": "FN","x": 14, "y": 4}, {"label": "L CTRL","x": 0, "y": 5, "w": 1.25}, {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25}, diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index e1a3955d5d..e8409b78d7 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -16,7 +16,7 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.25,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}] + "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.5,"y":0}, {"x":7.5,"y":0}, {"x":8.5,"y":0}, {"x":9.5,"y":0}, {"x":10.5,"y":0}, {"x":11.5,"y":0}, {"x":13.75,"y":0}, {"x":14.75,"y":0}, {"x":15.75,"y":0}, {"x":16.75,"y":0}, {"x":17.75,"y":0}, {"x":18.75,"y":0,"w":2}, {"x":0,"y":1}, {"x":1,"y":1}, {"x":2,"y":1}, {"x":3,"y":1}, {"x":4,"y":1}, {"x":5,"y":1}, {"x":6.5,"y":1,"w":1.25}, {"x":7.75,"y":1}, {"x":8.75,"y":1}, {"x":9.75,"y":1}, {"x":10.75,"y":1}, {"x":11.75,"y":1}, {"x":14,"y":1}, {"x":15,"y":1}, {"x":16,"y":1}, {"x":17,"y":1}, {"x":18,"y":1}, {"x":19,"y":1,"w":1.75}, {"x":0,"y":2}, {"x":1,"y":2}, {"x":2,"y":2}, {"x":3,"y":2}, {"x":4,"y":2}, {"x":5,"y":2}, {"x":6.5,"y":2,"w":1.75}, {"x":8.25,"y":2}, {"x":9.25,"y":2}, {"x":10.25,"y":2}, {"x":11.25,"y":2}, {"x":12.25,"y":2}, {"x":13.5,"y":2}, {"x":14.5,"y":2}, {"x":15.5,"y":2}, {"x":16.5,"y":2}, {"x":17.5,"y":2}, {"x":18.5,"y":2}, {"x":19.5,"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.5,"y":3,"w":1.25}, {"x":7.75,"y":3,"w":1.25}, {"x":9,"y":3}, {"x":10,"y":3}, {"x":11,"y":3,"w":2}, {"x":13.5,"y":3,"w":2}, {"x":15.5,"y":3}, {"x":16.5,"y":3}, {"x":17.5,"y":3,"w":1.5}, {"x":19,"y":3,"w":1.5}, {"x":0,"y":4}, {"x":1,"y":4}, {"x":2,"y":4}, {"x":3,"y":4}, {"x":4,"y":4}, {"x":5,"y":4}] } } } diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json index af57447d30..9cabb3e32e 100644 --- a/keyboards/handwired/pytest/basic/info.json +++ b/keyboards/handwired/pytest/basic/info.json @@ -2,7 +2,7 @@ "layouts": { "LAYOUT_custom": { "layout": [ - { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 } + { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 } ] } } diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json index 11442461d4..8f82662058 100644 --- a/keyboards/handwired/pytest/info.json +++ b/keyboards/handwired/pytest/info.json @@ -12,7 +12,7 @@ "layouts": { "LAYOUT_ortho_1x1": { "layout": [ - { "w": 1, "x": 0, "y": 0 } + { "x": 0, "y": 0 } ] } } diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/info.json index ed052a14a3..914d5edcd6 100644 --- a/keyboards/handwired/pytest/macro/info.json +++ b/keyboards/handwired/pytest/macro/info.json @@ -3,7 +3,7 @@ "layouts": { "LAYOUT_custom": { "layout": [ - { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 } + { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 } ] } } diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json index 8699edea43..9440cda961 100644 --- a/keyboards/handwired/reclined/info.json +++ b/keyboards/handwired/reclined/info.json @@ -26,54 +26,54 @@ "c_macro": true, "filename": "keyboards/handwired/reclined/reclined.h", "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 } + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 }, + { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 }, + { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 }, + { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 }, + { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 }, + { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 }, + { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 }, + { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 }, + { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 }, + { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 } ] } } diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk +++ /dev/null diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json index aac770596f..c35abf4556 100644 --- a/keyboards/handwired/wakizashi40/info.json +++ b/keyboards/handwired/wakizashi40/info.json @@ -35,44 +35,44 @@ "LAYOUT_all": { "layout": [ { "label": "TAB", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 }, - { "label": "Q", "matrix": [0, 2], "w": 1, "x": 1.5, "y": 0 }, - { "label": "W", "matrix": [0, 3], "w": 1, "x": 2.5, "y": 0 }, - { "label": "E", "matrix": [0, 4], "w": 1, "x": 3.5, "y": 0 }, - { "label": "R", "matrix": [0, 5], "w": 1, "x": 4.5, "y": 0 }, - { "label": "T", "matrix": [0, 6], "w": 1, "x": 5.5, "y": 0 }, - { "label": "Y", "matrix": [0, 7], "w": 1, "x": 6.5, "y": 0 }, - { "label": "U", "matrix": [0, 8], "w": 1, "x": 7.5, "y": 0 }, - { "label": "I", "matrix": [0, 9], "w": 1, "x": 8.5, "y": 0 }, - { "label": "O", "matrix": [0, 10], "w": 1, "x": 9.5, "y": 0 }, - { "label": "P", "matrix": [0, 11], "w": 1, "x": 10.5, "y": 0 }, + { "label": "Q", "matrix": [0, 2], "x": 1.5, "y": 0 }, + { "label": "W", "matrix": [0, 3], "x": 2.5, "y": 0 }, + { "label": "E", "matrix": [0, 4], "x": 3.5, "y": 0 }, + { "label": "R", "matrix": [0, 5], "x": 4.5, "y": 0 }, + { "label": "T", "matrix": [0, 6], "x": 5.5, "y": 0 }, + { "label": "Y", "matrix": [0, 7], "x": 6.5, "y": 0 }, + { "label": "U", "matrix": [0, 8], "x": 7.5, "y": 0 }, + { "label": "I", "matrix": [0, 9], "x": 8.5, "y": 0 }, + { "label": "O", "matrix": [0, 10], "x": 9.5, "y": 0 }, + { "label": "P", "matrix": [0, 11], "x": 10.5, "y": 0 }, { "label": "BACKSPACE", "matrix": [0, 12], "w": 1.5, "x": 11.5, "y": 0 }, { "label": "CAPSLOCK", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "A", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "S", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "D", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "F", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "G", "matrix": [1, 5], "w": 1, "x": 5.75, "y": 1 }, - { "label": "H", "matrix": [1, 7], "w": 1, "x": 6.75, "y": 1 }, - { "label": "J", "matrix": [1, 8], "w": 1, "x": 7.75, "y": 1 }, - { "label": "K", "matrix": [1, 9], "w": 1, "x": 8.75, "y": 1 }, - { "label": "L", "matrix": [1, 10], "w": 1, "x": 9.75, "y": 1 }, - { "label": "SEMICOLON", "matrix": [1, 11], "w": 1, "x": 10.75, "y": 1 }, + { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 }, + { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 }, + { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 }, + { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 }, + { "label": "G", "matrix": [1, 5], "x": 5.75, "y": 1 }, + { "label": "H", "matrix": [1, 7], "x": 6.75, "y": 1 }, + { "label": "J", "matrix": [1, 8], "x": 7.75, "y": 1 }, + { "label": "K", "matrix": [1, 9], "x": 8.75, "y": 1 }, + { "label": "L", "matrix": [1, 10], "x": 9.75, "y": 1 }, + { "label": "SEMICOLON", "matrix": [1, 11], "x": 10.75, "y": 1 }, { "label": "ENTER", "matrix": [1, 12], "w": 1.25, "x": 11.75, "y": 1 }, - { "label": "LSHIFT", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "Z", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "X", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "C", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "V", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, - { "label": "B", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, - { "label": "ESCAPE", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, - { "label": "N", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, - { "label": "M", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, - { "label": "COMMA", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, - { "label": "PERIOD", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, - { "label": "SLASH", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, - { "label": "RSHIFT", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 }, + { "label": "LSHIFT", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "Z", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "X", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "C", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "V", "matrix": [2, 4], "x": 4, "y": 2 }, + { "label": "B", "matrix": [2, 5], "x": 5, "y": 2 }, + { "label": "ESCAPE", "matrix": [2, 6], "x": 6, "y": 2 }, + { "label": "N", "matrix": [2, 7], "x": 7, "y": 2 }, + { "label": "M", "matrix": [2, 8], "x": 8, "y": 2 }, + { "label": "COMMA", "matrix": [2, 9], "x": 9, "y": 2 }, + { "label": "PERIOD", "matrix": [2, 10], "x": 10, "y": 2 }, + { "label": "SLASH", "matrix": [2, 11], "x": 11, "y": 2 }, + { "label": "RSHIFT", "matrix": [2, 12], "x": 12, "y": 2 }, { "label": "LCTRL", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, { "label": "LWIN", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 }, diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json index 70c62212f1..e0f9ed5f26 100644 --- a/keyboards/hotdox76v2/info.json +++ b/keyboards/hotdox76v2/info.json @@ -37,187 +37,187 @@ "LAYOUT_ergodox": { "layout": [ { "label": "L00", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 0.375 }, - { "label": "L01", "matrix": [5, 1], "w": 1, "x": 1.5, "y": 0.375 }, - { "label": "L02", "matrix": [5, 2], "w": 1, "x": 2.5, "y": 0.125 }, - { "label": "L03", "matrix": [5, 3], "w": 1, "x": 3.5, "y": 0 }, - { "label": "L04", "matrix": [5, 4], "w": 1, "x": 4.5, "y": 0.125 }, - { "label": "L05", "matrix": [5, 5], "w": 1, "x": 5.5, "y": 0.25 }, - { "label": "L06", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 0.25 }, + { "label": "L01", "matrix": [5, 1], "x": 1.5, "y": 0.375 }, + { "label": "L02", "matrix": [5, 2], "x": 2.5, "y": 0.125 }, + { "label": "L03", "matrix": [5, 3], "x": 3.5, "y": 0 }, + { "label": "L04", "matrix": [5, 4], "x": 4.5, "y": 0.125 }, + { "label": "L05", "matrix": [5, 5], "x": 5.5, "y": 0.25 }, + { "label": "L06", "matrix": [5, 6], "x": 6.5, "y": 0.25 }, { "label": "L10", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 1.375 }, - { "label": "L11", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 1.375 }, - { "label": "L12", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 1.125 }, - { "label": "L13", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "L14", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 1.125 }, - { "label": "L15", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "L16", "matrix": [4, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 }, + { "label": "L11", "matrix": [4, 1], "x": 1.5, "y": 1.375 }, + { "label": "L12", "matrix": [4, 2], "x": 2.5, "y": 1.125 }, + { "label": "L13", "matrix": [4, 3], "x": 3.5, "y": 1 }, + { "label": "L14", "matrix": [4, 4], "x": 4.5, "y": 1.125 }, + { "label": "L15", "matrix": [4, 5], "x": 5.5, "y": 1.25 }, + { "label": "L16", "matrix": [4, 6], "x": 6.5, "y": 1.25, "h": 1.5 }, { "label": "L20", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 2.375 }, - { "label": "L21", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 2.375 }, - { "label": "L22", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 2.125 }, - { "label": "L23", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 2 }, - { "label": "L24", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 2.125 }, - { "label": "L25", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 2.25 }, + { "label": "L21", "matrix": [3, 1], "x": 1.5, "y": 2.375 }, + { "label": "L22", "matrix": [3, 2], "x": 2.5, "y": 2.125 }, + { "label": "L23", "matrix": [3, 3], "x": 3.5, "y": 2 }, + { "label": "L24", "matrix": [3, 4], "x": 4.5, "y": 2.125 }, + { "label": "L25", "matrix": [3, 5], "x": 5.5, "y": 2.25 }, { "label": "L30", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.375 }, - { "label": "L31", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 3.375 }, - { "label": "L32", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 3.125 }, - { "label": "L33", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 3 }, - { "label": "L34", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 3.125 }, - { "label": "L35", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 3.25 }, - { "label": "L36", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 }, - - { "label": "L40", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 4.375 }, - { "label": "L41", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 4.375 }, - { "label": "L42", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 4.125 }, - { "label": "L43", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 4 }, - { "label": "L44", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 4.125 }, - - { "label": "L55", "matrix": [0, 5], "w": 1, "x": 6, "y": 5 }, - { "label": "L56", "matrix": [0, 6], "w": 1, "x": 7, "y": 5 }, - { "label": "L54", "matrix": [0, 4], "w": 1, "x": 7, "y": 6 }, - { "label": "L53", "matrix": [0, 3], "w": 1, "x": 5, "y": 6, "h": 2 }, - { "label": "L52", "matrix": [0, 2], "w": 1, "x": 6, "y": 6, "h": 2 }, - { "label": "L51", "matrix": [0, 1], "w": 1, "x": 7, "y": 7 }, - - { "label": "R06", "matrix": [11, 6], "w": 1, "x": 9.5, "y": 0.25 }, - { "label": "R05", "matrix": [11, 5], "w": 1, "x": 10.5, "y": 0.25 }, - { "label": "R04", "matrix": [11, 4], "w": 1, "x": 11.5, "y": 0.125 }, - { "label": "R03", "matrix": [11, 3], "w": 1, "x": 12.5, "y": 0 }, - { "label": "R02", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 0.125 }, - { "label": "R01", "matrix": [11, 1], "w": 1, "x": 14.5, "y": 0.375 }, + { "label": "L31", "matrix": [2, 1], "x": 1.5, "y": 3.375 }, + { "label": "L32", "matrix": [2, 2], "x": 2.5, "y": 3.125 }, + { "label": "L33", "matrix": [2, 3], "x": 3.5, "y": 3 }, + { "label": "L34", "matrix": [2, 4], "x": 4.5, "y": 3.125 }, + { "label": "L35", "matrix": [2, 5], "x": 5.5, "y": 3.25 }, + { "label": "L36", "matrix": [2, 6], "x": 6.5, "y": 2.75, "h": 1.5 }, + + { "label": "L40", "matrix": [1, 0], "x": 0.5, "y": 4.375 }, + { "label": "L41", "matrix": [1, 1], "x": 1.5, "y": 4.375 }, + { "label": "L42", "matrix": [1, 2], "x": 2.5, "y": 4.125 }, + { "label": "L43", "matrix": [1, 3], "x": 3.5, "y": 4 }, + { "label": "L44", "matrix": [1, 4], "x": 4.5, "y": 4.125 }, + + { "label": "L55", "matrix": [0, 5], "x": 6, "y": 5 }, + { "label": "L56", "matrix": [0, 6], "x": 7, "y": 5 }, + { "label": "L54", "matrix": [0, 4], "x": 7, "y": 6 }, + { "label": "L53", "matrix": [0, 3], "x": 5, "y": 6, "h": 2 }, + { "label": "L52", "matrix": [0, 2], "x": 6, "y": 6, "h": 2 }, + { "label": "L51", "matrix": [0, 1], "x": 7, "y": 7 }, + + { "label": "R06", "matrix": [11, 6], "x": 9.5, "y": 0.25 }, + { "label": "R05", "matrix": [11, 5], "x": 10.5, "y": 0.25 }, + { "label": "R04", "matrix": [11, 4], "x": 11.5, "y": 0.125 }, + { "label": "R03", "matrix": [11, 3], "x": 12.5, "y": 0 }, + { "label": "R02", "matrix": [11, 2], "x": 13.5, "y": 0.125 }, + { "label": "R01", "matrix": [11, 1], "x": 14.5, "y": 0.375 }, { "label": "R00", "matrix": [11, 0], "w": 1.5, "x": 15.5, "y": 0.375 }, - { "label": "R16", "matrix": [10, 6], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 }, - { "label": "R15", "matrix": [10, 5], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "R14", "matrix": [10, 4], "w": 1, "x": 11.5, "y": 1.125 }, - { "label": "R13", "matrix": [10, 3], "w": 1, "x": 12.5, "y": 1 }, - { "label": "R12", "matrix": [10, 2], "w": 1, "x": 13.5, "y": 1.125 }, - { "label": "R11", "matrix": [10, 1], "w": 1, "x": 14.5, "y": 1.375 }, + { "label": "R16", "matrix": [10, 6], "x": 9.5, "y": 1.25, "h": 1.5 }, + { "label": "R15", "matrix": [10, 5], "x": 10.5, "y": 1.25 }, + { "label": "R14", "matrix": [10, 4], "x": 11.5, "y": 1.125 }, + { "label": "R13", "matrix": [10, 3], "x": 12.5, "y": 1 }, + { "label": "R12", "matrix": [10, 2], "x": 13.5, "y": 1.125 }, + { "label": "R11", "matrix": [10, 1], "x": 14.5, "y": 1.375 }, { "label": "R10", "matrix": [10, 0], "w": 1.5, "x": 15.5, "y": 1.375 }, - { "label": "R25", "matrix": [9, 5], "w": 1, "x": 10.5, "y": 2.25 }, - { "label": "R24", "matrix": [9, 4], "w": 1, "x": 11.5, "y": 2.125 }, - { "label": "R23", "matrix": [9, 3], "w": 1, "x": 12.5, "y": 2 }, - { "label": "R22", "matrix": [9, 2], "w": 1, "x": 13.5, "y": 2.125 }, - { "label": "R21", "matrix": [9, 1], "w": 1, "x": 14.5, "y": 2.375 }, + { "label": "R25", "matrix": [9, 5], "x": 10.5, "y": 2.25 }, + { "label": "R24", "matrix": [9, 4], "x": 11.5, "y": 2.125 }, + { "label": "R23", "matrix": [9, 3], "x": 12.5, "y": 2 }, + { "label": "R22", "matrix": [9, 2], "x": 13.5, "y": 2.125 }, + { "label": "R21", "matrix": [9, 1], "x": 14.5, "y": 2.375 }, { "label": "R20", "matrix": [9, 0], "w": 1.5, "x": 15.5, "y": 2.375 }, - { "label": "R36", "matrix": [8, 6], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 }, - { "label": "R35", "matrix": [8, 5], "w": 1, "x": 10.5, "y": 3.25 }, - { "label": "R34", "matrix": [8, 4], "w": 1, "x": 11.5, "y": 3.125 }, - { "label": "R33", "matrix": [8, 3], "w": 1, "x": 12.5, "y": 3 }, - { "label": "R32", "matrix": [8, 2], "w": 1, "x": 13.5, "y": 3.125 }, - { "label": "R31", "matrix": [8, 1], "w": 1, "x": 14.5, "y": 3.375 }, + { "label": "R36", "matrix": [8, 6], "x": 9.5, "y": 2.75, "h": 1.5 }, + { "label": "R35", "matrix": [8, 5], "x": 10.5, "y": 3.25 }, + { "label": "R34", "matrix": [8, 4], "x": 11.5, "y": 3.125 }, + { "label": "R33", "matrix": [8, 3], "x": 12.5, "y": 3 }, + { "label": "R32", "matrix": [8, 2], "x": 13.5, "y": 3.125 }, + { "label": "R31", "matrix": [8, 1], "x": 14.5, "y": 3.375 }, { "label": "R30", "matrix": [8, 0], "w": 1.5, "x": 15.5, "y": 3.375 }, - { "label": "R44", "matrix": [7, 4], "w": 1, "x": 11.5, "y": 4.125 }, - { "label": "R43", "matrix": [7, 3], "w": 1, "x": 12.5, "y": 4 }, - { "label": "R42", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 4.125 }, - { "label": "R41", "matrix": [7, 1], "w": 1, "x": 14.5, "y": 4.375 }, - { "label": "R40", "matrix": [7, 0], "w": 1, "x": 15.5, "y": 4.375 }, - - { "label": "R56", "matrix": [6, 6], "w": 1, "x": 9, "y": 5 }, - { "label": "R55", "matrix": [6, 5], "w": 1, "x": 10, "y": 5 }, - { "label": "R54", "matrix": [6, 4], "w": 1, "x": 9, "y": 6 }, - { "label": "R51", "matrix": [6, 1], "w": 1, "x": 9, "y": 7 }, - { "label": "R52", "matrix": [6, 2], "w": 1, "x": 11, "y": 6, "h": 2 }, - { "label": "R53", "matrix": [6, 3], "w": 1, "x": 10, "y": 6, "h": 2 } + { "label": "R44", "matrix": [7, 4], "x": 11.5, "y": 4.125 }, + { "label": "R43", "matrix": [7, 3], "x": 12.5, "y": 4 }, + { "label": "R42", "matrix": [7, 2], "x": 13.5, "y": 4.125 }, + { "label": "R41", "matrix": [7, 1], "x": 14.5, "y": 4.375 }, + { "label": "R40", "matrix": [7, 0], "x": 15.5, "y": 4.375 }, + + { "label": "R56", "matrix": [6, 6], "x": 9, "y": 5 }, + { "label": "R55", "matrix": [6, 5], "x": 10, "y": 5 }, + { "label": "R54", "matrix": [6, 4], "x": 9, "y": 6 }, + { "label": "R51", "matrix": [6, 1], "x": 9, "y": 7 }, + { "label": "R52", "matrix": [6, 2], "x": 11, "y": 6, "h": 2 }, + { "label": "R53", "matrix": [6, 3], "x": 10, "y": 6, "h": 2 } ] }, "LAYOUT_ergodox_pretty": { "layout": [ { "label": "L00", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 0.375 }, - { "label": "L01", "matrix": [5, 1], "w": 1, "x": 1.5, "y": 0.375 }, - { "label": "L02", "matrix": [5, 2], "w": 1, "x": 2.5, "y": 0.125 }, - { "label": "L03", "matrix": [5, 3], "w": 1, "x": 3.5, "y": 0 }, - { "label": "L04", "matrix": [5, 4], "w": 1, "x": 4.5, "y": 0.125 }, - { "label": "L05", "matrix": [5, 5], "w": 1, "x": 5.5, "y": 0.25 }, - { "label": "L06", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 0.25 }, - - { "label": "R06", "matrix": [11, 6], "w": 1, "x": 9.5, "y": 0.25 }, - { "label": "R05", "matrix": [11, 5], "w": 1, "x": 10.5, "y": 0.25 }, - { "label": "R04", "matrix": [11, 4], "w": 1, "x": 11.5, "y": 0.125 }, - { "label": "R03", "matrix": [11, 3], "w": 1, "x": 12.5, "y": 0 }, - { "label": "R02", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 0.125 }, - { "label": "R01", "matrix": [11, 1], "w": 1, "x": 14.5, "y": 0.375 }, + { "label": "L01", "matrix": [5, 1], "x": 1.5, "y": 0.375 }, + { "label": "L02", "matrix": [5, 2], "x": 2.5, "y": 0.125 }, + { "label": "L03", "matrix": [5, 3], "x": 3.5, "y": 0 }, + { "label": "L04", "matrix": [5, 4], "x": 4.5, "y": 0.125 }, + { "label": "L05", "matrix": [5, 5], "x": 5.5, "y": 0.25 }, + { "label": "L06", "matrix": [5, 6], "x": 6.5, "y": 0.25 }, + + { "label": "R06", "matrix": [11, 6], "x": 9.5, "y": 0.25 }, + { "label": "R05", "matrix": [11, 5], "x": 10.5, "y": 0.25 }, + { "label": "R04", "matrix": [11, 4], "x": 11.5, "y": 0.125 }, + { "label": "R03", "matrix": [11, 3], "x": 12.5, "y": 0 }, + { "label": "R02", "matrix": [11, 2], "x": 13.5, "y": 0.125 }, + { "label": "R01", "matrix": [11, 1], "x": 14.5, "y": 0.375 }, { "label": "R00", "matrix": [11, 0], "w": 1.5, "x": 15.5, "y": 0.375 }, { "label": "L10", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 1.375 }, - { "label": "L11", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 1.375 }, - { "label": "L12", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 1.125 }, - { "label": "L13", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "L14", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 1.125 }, - { "label": "L15", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "L16", "matrix": [4, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 }, - - { "label": "R16", "matrix": [10, 6], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 }, - { "label": "R15", "matrix": [10, 5], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "R14", "matrix": [10, 4], "w": 1, "x": 11.5, "y": 1.125 }, - { "label": "R13", "matrix": [10, 3], "w": 1, "x": 12.5, "y": 1 }, - { "label": "R12", "matrix": [10, 2], "w": 1, "x": 13.5, "y": 1.125 }, - { "label": "R11", "matrix": [10, 1], "w": 1, "x": 14.5, "y": 1.375 }, + { "label": "L11", "matrix": [4, 1], "x": 1.5, "y": 1.375 }, + { "label": "L12", "matrix": [4, 2], "x": 2.5, "y": 1.125 }, + { "label": "L13", "matrix": [4, 3], "x": 3.5, "y": 1 }, + { "label": "L14", "matrix": [4, 4], "x": 4.5, "y": 1.125 }, + { "label": "L15", "matrix": [4, 5], "x": 5.5, "y": 1.25 }, + { "label": "L16", "matrix": [4, 6], "x": 6.5, "y": 1.25, "h": 1.5 }, + + { "label": "R16", "matrix": [10, 6], "x": 9.5, "y": 1.25, "h": 1.5 }, + { "label": "R15", "matrix": [10, 5], "x": 10.5, "y": 1.25 }, + { "label": "R14", "matrix": [10, 4], "x": 11.5, "y": 1.125 }, + { "label": "R13", "matrix": [10, 3], "x": 12.5, "y": 1 }, + { "label": "R12", "matrix": [10, 2], "x": 13.5, "y": 1.125 }, + { "label": "R11", "matrix": [10, 1], "x": 14.5, "y": 1.375 }, { "label": "R10", "matrix": [10, 0], "w": 1.5, "x": 15.5, "y": 1.375 }, { "label": "L20", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 2.375 }, - { "label": "L21", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 2.375 }, - { "label": "L22", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 2.125 }, - { "label": "L23", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 2 }, - { "label": "L24", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 2.125 }, - { "label": "L25", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 2.25 }, - - { "label": "R25", "matrix": [9, 5], "w": 1, "x": 10.5, "y": 2.25 }, - { "label": "R24", "matrix": [9, 4], "w": 1, "x": 11.5, "y": 2.125 }, - { "label": "R23", "matrix": [9, 3], "w": 1, "x": 12.5, "y": 2 }, - { "label": "R22", "matrix": [9, 2], "w": 1, "x": 13.5, "y": 2.125 }, - { "label": "R21", "matrix": [9, 1], "w": 1, "x": 14.5, "y": 2.375 }, + { "label": "L21", "matrix": [3, 1], "x": 1.5, "y": 2.375 }, + { "label": "L22", "matrix": [3, 2], "x": 2.5, "y": 2.125 }, + { "label": "L23", "matrix": [3, 3], "x": 3.5, "y": 2 }, + { "label": "L24", "matrix": [3, 4], "x": 4.5, "y": 2.125 }, + { "label": "L25", "matrix": [3, 5], "x": 5.5, "y": 2.25 }, + + { "label": "R25", "matrix": [9, 5], "x": 10.5, "y": 2.25 }, + { "label": "R24", "matrix": [9, 4], "x": 11.5, "y": 2.125 }, + { "label": "R23", "matrix": [9, 3], "x": 12.5, "y": 2 }, + { "label": "R22", "matrix": [9, 2], "x": 13.5, "y": 2.125 }, + { "label": "R21", "matrix": [9, 1], "x": 14.5, "y": 2.375 }, { "label": "R20", "matrix": [9, 0], "w": 1.5, "x": 15.5, "y": 2.375 }, { "label": "L30", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.375 }, - { "label": "L31", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 3.375 }, - { "label": "L32", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 3.125 }, - { "label": "L33", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 3 }, - { "label": "L34", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 3.125 }, - { "label": "L35", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 3.25 }, - { "label": "L36", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 }, - - { "label": "R36", "matrix": [8, 6], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 }, - { "label": "R35", "matrix": [8, 5], "w": 1, "x": 10.5, "y": 3.25 }, - { "label": "R34", "matrix": [8, 4], "w": 1, "x": 11.5, "y": 3.125 }, - { "label": "R33", "matrix": [8, 3], "w": 1, "x": 12.5, "y": 3 }, - { "label": "R32", "matrix": [8, 2], "w": 1, "x": 13.5, "y": 3.125 }, - { "label": "R31", "matrix": [8, 1], "w": 1, "x": 14.5, "y": 3.375 }, + { "label": "L31", "matrix": [2, 1], "x": 1.5, "y": 3.375 }, + { "label": "L32", "matrix": [2, 2], "x": 2.5, "y": 3.125 }, + { "label": "L33", "matrix": [2, 3], "x": 3.5, "y": 3 }, + { "label": "L34", "matrix": [2, 4], "x": 4.5, "y": 3.125 }, + { "label": "L35", "matrix": [2, 5], "x": 5.5, "y": 3.25 }, + { "label": "L36", "matrix": [2, 6], "x": 6.5, "y": 2.75, "h": 1.5 }, + + { "label": "R36", "matrix": [8, 6], "x": 9.5, "y": 2.75, "h": 1.5 }, + { "label": "R35", "matrix": [8, 5], "x": 10.5, "y": 3.25 }, + { "label": "R34", "matrix": [8, 4], "x": 11.5, "y": 3.125 }, + { "label": "R33", "matrix": [8, 3], "x": 12.5, "y": 3 }, + { "label": "R32", "matrix": [8, 2], "x": 13.5, "y": 3.125 }, + { "label": "R31", "matrix": [8, 1], "x": 14.5, "y": 3.375 }, { "label": "R30", "matrix": [8, 0], "w": 1.5, "x": 15.5, "y": 3.375 }, - { "label": "L40", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 4.375 }, - { "label": "L41", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 4.375 }, - { "label": "L42", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 4.125 }, - { "label": "L43", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 4 }, - { "label": "L44", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 4.125 }, + { "label": "L40", "matrix": [1, 0], "x": 0.5, "y": 4.375 }, + { "label": "L41", "matrix": [1, 1], "x": 1.5, "y": 4.375 }, + { "label": "L42", "matrix": [1, 2], "x": 2.5, "y": 4.125 }, + { "label": "L43", "matrix": [1, 3], "x": 3.5, "y": 4 }, + { "label": "L44", "matrix": [1, 4], "x": 4.5, "y": 4.125 }, - { "label": "R44", "matrix": [7, 4], "w": 1, "x": 11.5, "y": 4.125 }, - { "label": "R43", "matrix": [7, 3], "w": 1, "x": 12.5, "y": 4 }, - { "label": "R42", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 4.125 }, - { "label": "R41", "matrix": [7, 1], "w": 1, "x": 14.5, "y": 4.375 }, - { "label": "R40", "matrix": [7, 0], "w": 1, "x": 15.5, "y": 4.375 }, + { "label": "R44", "matrix": [7, 4], "x": 11.5, "y": 4.125 }, + { "label": "R43", "matrix": [7, 3], "x": 12.5, "y": 4 }, + { "label": "R42", "matrix": [7, 2], "x": 13.5, "y": 4.125 }, + { "label": "R41", "matrix": [7, 1], "x": 14.5, "y": 4.375 }, + { "label": "R40", "matrix": [7, 0], "x": 15.5, "y": 4.375 }, - { "label": "L55", "matrix": [0, 5], "w": 1, "x": 6, "y": 5 }, - { "label": "L56", "matrix": [0, 6], "w": 1, "x": 7, "y": 5 }, + { "label": "L55", "matrix": [0, 5], "x": 6, "y": 5 }, + { "label": "L56", "matrix": [0, 6], "x": 7, "y": 5 }, - { "label": "R56", "matrix": [6, 6], "w": 1, "x": 9, "y": 5 }, - { "label": "R55", "matrix": [6, 5], "w": 1, "x": 10, "y": 5 }, + { "label": "R56", "matrix": [6, 6], "x": 9, "y": 5 }, + { "label": "R55", "matrix": [6, 5], "x": 10, "y": 5 }, - { "label": "L54", "matrix": [0, 4], "w": 1, "x": 7, "y": 6 }, + { "label": "L54", "matrix": [0, 4], "x": 7, "y": 6 }, - { "label": "R54", "matrix": [6, 4], "w": 1, "x": 9, "y": 6 }, + { "label": "R54", "matrix": [6, 4], "x": 9, "y": 6 }, - { "label": "L53", "matrix": [0, 3], "w": 1, "x": 5, "y": 6,"h": 2 }, - { "label": "L52", "matrix": [0, 2], "w": 1, "x": 6, "y": 6,"h": 2 }, - { "label": "L51", "matrix": [0, 1], "w": 1, "x": 7, "y": 7 }, + { "label": "L53", "matrix": [0, 3], "x": 5, "y": 6,"h": 2 }, + { "label": "L52", "matrix": [0, 2], "x": 6, "y": 6,"h": 2 }, + { "label": "L51", "matrix": [0, 1], "x": 7, "y": 7 }, - { "label": "R51", "matrix": [6, 1], "w": 1, "x": 9, "y": 7 }, - { "label": "R52", "matrix": [6, 2], "w": 1, "x": 11, "y": 6, "h": 2 }, - { "label": "R53", "matrix": [6, 3], "w": 1, "x": 10, "y": 6, "h": 2 } + { "label": "R51", "matrix": [6, 1], "x": 9, "y": 7 }, + { "label": "R52", "matrix": [6, 2], "x": 11, "y": 6, "h": 2 }, + { "label": "R53", "matrix": [6, 3], "x": 10, "y": 6, "h": 2 } ] } } diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h index 37e578dfea..c02ea1f913 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h @@ -18,31 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, A10 can be ignored. -// On this keyboard the pins are ordered in the following way: (top/bottom meaning where the trace is routed on the membranes) -// top, top, top, top, top, top, top, top, bottom, top, bottom, top, bottom, top, bottom, top, bottom, bottom, top, top, top, top, bottom, bottom - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, C4, B0, B10, B13, C6, C7, C8, C9 } -#define MATRIX_ROW_PINS { A7, C5, B1, B12, B14, B15, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json index 2aebd925ee..95a572bd17 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"], + "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h deleted file mode 100644 index c414e3254c..0000000000 --- a/keyboards/ibnuda/alicia_cook/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 Ibnu D. Aji - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D3, F4, F5 } -#define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index 9e34484de5..137c6bc7de 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -8,6 +8,11 @@ "pid": "0x6955", "device_version": "8.9.9" }, + "matrix_pins": { + "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D2", "D3", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index bf563918c9..2521d16e8c 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2} -#define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 7b3c71aa88..3fd6dfe21a 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,11 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h index f943c2c053..10887bdf18 100644 --- a/keyboards/ibnuda/squiggle/rev1/config.h +++ b/keyboards/ibnuda/squiggle/rev1/config.h @@ -1,19 +1,3 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MASTER_LEFT diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 7f48b11c76..e2e2b4a3f7 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -145,15 +150,15 @@ {"label":".", "x":8, "y":2.2}, {"label":"/", "x":9, "y":2.9}, - {"label":"bspc", "x":3, "y":3.6, "h":1}, - {"label":"esc/sft", "x":4, "y":3.65, "h":1}, - {"label":"ent/alt", "x":5, "y":3.65, "h":1}, - {"label":"spc", "x":6, "y":3.6, "h":1}, + {"label":"bspc", "x":3, "y":3.6}, + {"label":"esc/sft", "x":4, "y":3.65}, + {"label":"ent/alt", "x":5, "y":3.65}, + {"label":"spc", "x":6, "y":3.6}, - {"label":"lower", "x":3, "y":4.6, "h":1}, - {"label":"gui", "x":4, "y":4.65, "h":1}, - {"label":"tab", "x":5, "y":4.65, "h":1}, - {"label":"raise", "x":6, "y":4.6, "h":1} + {"label":"lower", "x":3, "y":4.6}, + {"label":"gui", "x":4, "y":4.65}, + {"label":"tab", "x":5, "y":4.65}, + {"label":"raise", "x":6, "y":4.6} ] } } diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h index 90077d2361..baf09cebb5 100644 --- a/keyboards/idb/idb_60/config.h +++ b/keyboards/idb/idb_60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C2, D0, D1, D2, D3, D4, D5, D6, B0, B1 } -#define MATRIX_COL_PINS { B2, B3, B4, C6, B6, B7, C7, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json index 1114abd5bd..a7035245f0 100644 --- a/keyboards/idb/idb_60/info.json +++ b/keyboards/idb/idb_60/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B4", "C6", "B6", "B7", "C7", "B5"], + "rows": ["C2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "B0", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 54f0fc0c7c..4f15181dfd 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index a192072701..b0d2c6f712 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B3", "C7", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h index d44e54d32c..707f040992 100644 --- a/keyboards/idobao/id75/v2/config.h +++ b/keyboards/idobao/id75/v2/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #undef RGB_DI_PIN #define RGB_DI_PIN F0 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 558cbda3c8..599e02ab59 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0075", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B3", "C7", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index d3eb71dc92..fc65958e3e 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -17,37 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - * The matrix description in the vendor-supplied JSON file for kbfirmware.com - * had 9 columns: - * { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - * and 12 rows: - * { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } - * However, the row 6 was completely empty, and the pin F0 was not actually - * routed anywhere on the PCB, therefore this row was removed to save some - * resources (the EEPROM space for dynamic keymaps is especially scarce). - * - * After doing the above change, the matrix was transposed (rows and columns - * were swapped), because a matrix with the COL2ROW layout can be scanned much - * more efficiently than a matrix with the ROW2COL layout (depending on various - * optimizations, the difference in scan rate can be over 2 times). Because of - * this, the "columns" in the matrix layout now mostly correspond to physical - * rows, and the "rows" have mostly vertical physical orientation. - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index 89b64f3951..c8ee450e44 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -6,6 +6,11 @@ "vid": "0x6964", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 2f4ebd7744..881174152c 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -14,25 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } - -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index ca39654575..ea98558455 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 7f48dc7752..1d968410b1 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -18,14 +18,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 2046283d8e..5acdaba228 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -8,6 +8,11 @@ "pid": "0x0096", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 7, diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 5c612855fb..0cb9bb1f19 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index 725ddc0c4d..e5c423e527 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index a3b2a5ef92..4851844dad 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -3,21 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B1 #if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index 75add6a896..f77698554d 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -6,6 +6,11 @@ "pid": "0x0127", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x5"], diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h index f7f6409149..50001e978c 100644 --- a/keyboards/illuminati/is0/config.h +++ b/keyboards/illuminati/is0/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D2 } -#define MATRIX_COL_PINS { D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json index 1d201e3535..c1816b5e2a 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0"], + "rows": ["D2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h index b83ebd140a..7b9007c1f6 100644 --- a/keyboards/illusion/rosa/config.h +++ b/keyboards/illusion/rosa/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { D1, D4, F0, B0, B1 } -#define MATRIX_COL_PINS { D0, D2, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json index bb533bfb2f..4432fbca49 100644 --- a/keyboards/illusion/rosa/info.json +++ b/keyboards/illusion/rosa/info.json @@ -8,6 +8,11 @@ "pid": "0x6952", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D2", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["D1", "D4", "F0", "B0", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "on_state": 0 diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h index 5e8abdf2e0..0e5e8b9d25 100644 --- a/keyboards/ilumkb/primus75/config.h +++ b/keyboards/ilumkb/primus75/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json index 9b665dda74..7f447ff1ae 100644 --- a/keyboards/ilumkb/primus75/info.json +++ b/keyboards/ilumkb/primus75/info.json @@ -8,6 +8,11 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], + "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h index 6c6326b3cd..151eba96c9 100644 --- a/keyboards/ilumkb/simpler61/config.h +++ b/keyboards/ilumkb/simpler61/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_LED_PROCESS_LIMIT 4 diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json index 867152f295..e9f4488dc7 100644 --- a/keyboards/ilumkb/simpler61/info.json +++ b/keyboards/ilumkb/simpler61/info.json @@ -8,6 +8,11 @@ "pid": "0xC361", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h index f6fcafb749..5554f56bd1 100644 --- a/keyboards/ilumkb/simpler64/config.h +++ b/keyboards/ilumkb/simpler64/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_LED_PROCESS_LIMIT 4 diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json index 15d17d3540..40371b7a28 100644 --- a/keyboards/ilumkb/simpler64/info.json +++ b/keyboards/ilumkb/simpler64/info.json @@ -8,6 +8,11 @@ "pid": "0xC364", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h index c63b26264e..fdd1846753 100644 --- a/keyboards/ilumkb/volcano660/config.h +++ b/keyboards/ilumkb/volcano660/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B6 } -#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json index 9e5ec18b67..3a725c01e8 100644 --- a/keyboards/ilumkb/volcano660/info.json +++ b/keyboards/ilumkb/volcano660/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h index 4ef09efc37..a194f0e444 100644 --- a/keyboards/inett_studio/sqx/hotswap/config.h +++ b/keyboards/inett_studio/sqx/hotswap/config.h @@ -18,11 +18,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4, B7, D6} -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 } -#define DIODE_DIRECTION ROW2COL - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json index 1d9014bdbd..54c18859f2 100644 --- a/keyboards/inett_studio/sqx/hotswap/info.json +++ b/keyboards/inett_studio/sqx/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], + "rows": ["F0", "F1", "F4", "B7", "D6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_tsangan_hhkb"], diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h index be6d4a8e65..21929f17f3 100644 --- a/keyboards/inett_studio/sqx/universal/config.h +++ b/keyboards/inett_studio/sqx/universal/config.h @@ -18,11 +18,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4, B7, D6} -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 } -#define DIODE_DIRECTION ROW2COL - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json index 7da0598d91..fa6fa373f9 100644 --- a/keyboards/inett_studio/sqx/universal/info.json +++ b/keyboards/inett_studio/sqx/universal/info.json @@ -8,6 +8,11 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], + "rows": ["F0", "F1", "F4", "B7", "D6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index fdadcd5642..6ebc0f4083 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -39,13 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -// For some reason, the rows are colums in the schematic, and vice versa -#define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 } -#define MATRIX_COL_PINS { D1, D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Serial config (for communication between halves) */ #define SERIAL_USART_DRIVER SD1 // Only true for the master half #define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index 635355d490..c751cfe3f2 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -6,6 +6,11 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D4", "D5", "D6", "D7"], + "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"] + }, + "diode_direction": "ROW2COL", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h deleted file mode 100644 index c4ec6a4a7d..0000000000 --- a/keyboards/input_club/infinity60/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h deleted file mode 100644 index 301003e8b9..0000000000 --- a/keyboards/input_club/infinity60/led/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/info.json new file mode 100644 index 0000000000..7a9b924a71 --- /dev/null +++ b/keyboards/input_club/infinity60/led/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"], + "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/input_club/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h deleted file mode 100644 index 1207dffc78..0000000000 --- a/keyboards/input_club/infinity60/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 } - - diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/info.json new file mode 100644 index 0000000000..a5afb37751 --- /dev/null +++ b/keyboards/input_club/infinity60/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B16", "B17", "C4", "C5", "D0"], + "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h index aa7dca86d3..2a4c7d057c 100644 --- a/keyboards/input_club/k_type/config.h +++ b/keyboards/input_club/k_type/config.h @@ -18,22 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once /* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 } -#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* * Feature disable options * These options are also useful to firmware size reduction. */ diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json index 60522333d7..c05785ac69 100644 --- a/keyboards/input_club/k_type/info.json +++ b/keyboards/input_club/k_type/info.json @@ -8,6 +8,11 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"], + "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h index 7567d0ef50..067b7f4e59 100644 --- a/keyboards/input_club/whitefox/config.h +++ b/keyboards/input_club/whitefox/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D4, D5, D6, D7, C1, C2 } -#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LED_BRIGHTNESS_LO 100 #define LED_BRIGHTNESS_HI 255 diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json index 0cd34f8312..80853b4847 100644 --- a/keyboards/input_club/whitefox/info.json +++ b/keyboards/input_club/whitefox/info.json @@ -7,6 +7,11 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"], + "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/io_mini1800/config.h b/keyboards/io_mini1800/config.h deleted file mode 100644 index 95251ca8f8..0000000000 --- a/keyboards/io_mini1800/config.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2022 s8erdude (@jpuerto96) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4, E6, B3, D2, D5, D3 } -#define MATRIX_COL_PINS { D1, D0, B7, B2, F0, F1, F7, F6, F4, F5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json index 05b346d793..270da1ea50 100644 --- a/keyboards/io_mini1800/info.json +++ b/keyboards/io_mini1800/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "B7", "B2", "F0", "F1", "F7", "F6", "F4", "F5"], + "rows": ["D6", "D7", "B4", "B5", "D4", "E6", "B3", "D2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h index eefaa897a1..9386d03e74 100644 --- a/keyboards/irene/config.h +++ b/keyboards/irene/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, F0, C7, B4, B7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B6, B5, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN # define RGBLED_NUM 23 diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index a9e943db5c..9e3a4a220d 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "F0", "C7", "B4", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h index 5616f96083..d813c012ef 100644 --- a/keyboards/iriskeyboards/config.h +++ b/keyboards/iriskeyboards/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// 0 1 2 3 4 5 6 7 8 9 A B C D -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/iriskeyboards/info.json b/keyboards/iriskeyboards/info.json index 860d9f21b7..19516e8d6e 100644 --- a/keyboards/iriskeyboards/info.json +++ b/keyboards/iriskeyboards/info.json @@ -8,6 +8,11 @@ "pid": "0x3031", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h index b47b2ccf50..f2d3a3c36f 100644 --- a/keyboards/iron180/config.h +++ b/keyboards/iron180/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 } -#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/iron180/info.json b/keyboards/iron180/info.json index 3c7798508f..e408e5321c 100644 --- a/keyboards/iron180/info.json +++ b/keyboards/iron180/info.json @@ -8,6 +8,11 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], + "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h deleted file mode 100644 index 47eac652c5..0000000000 --- a/keyboards/j80/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 JER - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, A0 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json index c57e9e3e2a..9231437bd1 100644 --- a/keyboards/j80/info.json +++ b/keyboards/j80/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "A0"], + "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index 0caf635045..cde00d1c4d 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json index ed5768bf32..c5ae580453 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -10,6 +10,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index 147dc2ade4..26e7ee3f33 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -10,6 +10,11 @@ "pid": "0x0428", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h index d7a8bf543b..7b1324e3f3 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h @@ -16,20 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json index f2e51f63ac..685504afb1 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index 1a6e9cea9e..1359eafc9a 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - * - * 0 1 2 3 4 5 6 7 8 9 A B C D E F */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0, E6 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index 639b5a3897..dac233ecc1 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 15 diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h deleted file mode 100644 index 0c4b365932..0000000000 --- a/keyboards/jadookb/jkb2/config.h +++ /dev/null @@ -1,21 +0,0 @@ - /* Copyright 2021 Wizard-GG - * - * 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 <http://www.gnu.org/licenses/>. - */ -#pragma once - -#define MATRIX_ROW_PINS { B1 } -#define MATRIX_COL_PINS { B3 ,B2} - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json index 0a72e6b7bc..b0b1c9792c 100644 --- a/keyboards/jadookb/jkb2/info.json +++ b/keyboards/jadookb/jkb2/info.json @@ -8,6 +8,11 @@ "pid": "0x3225", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2"], + "rows": ["B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index 00bc0c3488..2ef7a6cf7b 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -16,9 +16,6 @@ #pragma once - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #define RGB_MATRIX_LED_COUNT 67 diff --git a/keyboards/jadookb/jkb65/r1/config.h b/keyboards/jadookb/jkb65/r1/config.h deleted file mode 100644 index 78f13414c9..0000000000 --- a/keyboards/jadookb/jkb65/r1/config.h +++ /dev/null @@ -1,20 +0,0 @@ - /* Copyright 2022 Wizad-GG - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/info.json index 4bfe3aa763..9cf153f928 100644 --- a/keyboards/jadookb/jkb65/r1/info.json +++ b/keyboards/jadookb/jkb65/r1/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "JKB65 RGB R1", + "matrix_pins": { + "cols": ["F6", "B1", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "B3", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "usb": { "device_version": "0.0.1" } diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h deleted file mode 100644 index 5db93f75cb..0000000000 --- a/keyboards/jadookb/jkb65/r2/config.h +++ /dev/null @@ -1,20 +0,0 @@ - /* Copyright 2022 Wizad-GG - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/info.json index 8a23a21d5f..909efbd665 100644 --- a/keyboards/jadookb/jkb65/r2/info.json +++ b/keyboards/jadookb/jkb65/r2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "JKB65 RGB R2", "usb": { "device_version": "0.0.2" - } + }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h index 8afbaabca0..6b5c1ab3f9 100644 --- a/keyboards/jae/j01/config.h +++ b/keyboards/jae/j01/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS {B2, B1, B3, B0, D0} -#define MATRIX_COL_PINS {D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json index 6f0b5d485d..74bcf21b47 100644 --- a/keyboards/jae/j01/info.json +++ b/keyboards/jae/j01/info.json @@ -8,6 +8,11 @@ "pid": "0x0143", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B2", "B1", "B3", "B0", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4, diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h index 163236c90c..96c32b09f2 100644 --- a/keyboards/jagdpietr/drakon/config.h +++ b/keyboards/jagdpietr/drakon/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C7, B5, B6, B0, B1, F1 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B2, B3, B7, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json index 3aab789199..9c28b21336 100644 --- a/keyboards/jagdpietr/drakon/info.json +++ b/keyboards/jagdpietr/drakon/info.json @@ -8,6 +8,11 @@ "pid": "0x7776", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C6", "B2", "B3", "B7", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["C7", "B5", "B6", "B0", "B1", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "F0"} diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h index 62501a05d1..6abe1d446d 100644 --- a/keyboards/jc65/v32a/config.h +++ b/keyboards/jc65/v32a/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json index b9693c8e72..27ee90931d 100644 --- a/keyboards/jc65/v32a/info.json +++ b/keyboards/jc65/v32a/info.json @@ -8,6 +8,11 @@ "pid": "0x5679", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h index eca08d7d92..68e8005dec 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* QMK JC65 PCB default pin-out */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 } - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING @@ -39,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #endif - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json index e20dccdbfa..e9d3e2b897 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/jc65/v32u4/keymaps/coth/rules.mk b/keyboards/jc65/v32u4/keymaps/coth/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jc65/v32u4/keymaps/coth/rules.mk +++ /dev/null diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/rules.mk b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/rules.mk +++ /dev/null diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/rules.mk b/keyboards/jc65/v32u4/keymaps/na7thana/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jc65/v32u4/keymaps/na7thana/rules.mk +++ /dev/null diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h index 11a868ab3e..36c2f16578 100644 --- a/keyboards/jd40/config.h +++ b/keyboards/jd40/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0, F1, F5, B4 } -#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json index 9bb96326d3..924122544e 100644 --- a/keyboards/jd40/info.json +++ b/keyboards/jd40/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"], + "rows": ["F0", "F1", "F5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jd40/keymaps/vanagon/rules.mk b/keyboards/jd40/keymaps/vanagon/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jd40/keymaps/vanagon/rules.mk +++ /dev/null diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h index 25153db750..9b7700e013 100644 --- a/keyboards/jd45/config.h +++ b/keyboards/jd45/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { F0, F1, F5, B4 } -#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json index 725431c672..c401d179eb 100644 --- a/keyboards/jd45/info.json +++ b/keyboards/jd45/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2", "B0"], + "rows": ["F0", "F1", "F5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h index b03ceffba8..d78952f261 100644 --- a/keyboards/jels/jels60/config.h +++ b/keyboards/jels/jels60/config.h @@ -16,14 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS {B3, D2, F0, F4, F1} -#define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json index 3d3b59ca7e..418410c3ff 100644 --- a/keyboards/jels/jels60/info.json +++ b/keyboards/jels/jels60/info.json @@ -8,6 +8,11 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"], + "rows": ["B3", "D2", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, @@ -76,7 +81,7 @@ { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, { "x": 3.75, "y": 4, "w": 2.75 }, - { "x": 6.5, "y": 4, "w": 1 }, + { "x": 6.5, "y": 4 }, { "x": 7.5, "y": 4, "w": 2.5 }, { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 }, @@ -208,13 +213,13 @@ { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, { "x": 14, "y": 3 }, { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 4, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 4 }, { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 }, { "x": 4, "y": 4, "w": 2.75 }, { "x": 6.75, "y": 4, "w": 1.5 }, { "x": 8.25, "y": 4, "w": 2.75 }, { "label": "Alt", "x": 11, "y": 4, "w": 1.5 }, - { "label": "Win", "x": 12.5, "y": 4, "w": 1 }, + { "label": "Win", "x": 12.5, "y": 4 }, { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 } ] }, @@ -276,11 +281,11 @@ { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, { "x": 14, "y": 3 }, { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 4, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 4 }, { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 }, { "x": 4, "y": 4, "w": 7 }, { "label": "Alt", "x": 11, "y": 4, "w": 1.5 }, - { "label": "Win", "x": 12.5, "y": 4, "w": 1 }, + { "label": "Win", "x": 12.5, "y": 4 }, { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 } ] }, diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h index b655834c02..3eec23b214 100644 --- a/keyboards/jels/jels88/config.h +++ b/keyboards/jels/jels88/config.h @@ -16,13 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS \ - { B3, B2, D1, D0, E6, B0, F0, F1, B5, B4, D7, D6 } -#define MATRIX_COL_PINS \ - { C7, C6, F7, F6, F5, F4, B1, D2, D3 } - /* ws2812b RGB LEDs */ #define RGB_DI_PIN B6 @@ -43,9 +36,6 @@ #define RGBLIGHT_LIMIT_VAL 225 // keep PCB under 500mA #endif -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json index fed2fe9f4c..6542e29a08 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/info.json @@ -8,6 +8,11 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"], + "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 0] }, @@ -269,7 +274,7 @@ { "label": "L", "x": 9.75, "y": 3.25 }, { "label": ":", "x": 10.75, "y": 3.25 }, { "label": "\"", "x": 11.75, "y": 3.25 }, - { "label": "|", "x": 12.75, "y": 3.25, "w": 1 }, + { "label": "|", "x": 12.75, "y": 3.25 }, { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 }, { "label": "|", "x": 1.25, "y": 4.25 }, { "label": "Z", "x": 2.25, "y": 4.25 }, diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h deleted file mode 100644 index d968a5bf93..0000000000 --- a/keyboards/jian/handwired/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { D3, D2, B5, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json index 712c3d9b01..bd76da9e96 100644 --- a/keyboards/jian/handwired/info.json +++ b/keyboards/jian/handwired/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D3", "D2", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 3e2fa93f31..5eda1a6724 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -#define DIODE_DIRECTION COL2ROW - - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 } -#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 } - #define PHYSICAL_LEDS_ENABLE /* ws2812 RGB LED */ diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json index 74121b2fda..e51b65c501 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], + "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 5, diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 083b235a2e..a00830b7f7 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { D3, D2, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - #define USE_I2C /* Select hand configuration */ diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index fc65cb13b8..9ca0a41785 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D3", "D2", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 37e8f0458d..92b15fab65 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, B1, B3 } -#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 } - //#define EE_HANDS #define SPLIT_HAND_PIN E6 diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index 642bf83efc..6cae5556e2 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], + "rows": ["F4", "F5", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 5 diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h index 39ed4bb0c7..16a45b256b 100644 --- a/keyboards/jiran/config.h +++ b/keyboards/jiran/config.h @@ -17,13 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { B4, B5, F4, F5, F6 } -#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define MASTER_LEFT diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json index 9f04243278..6c4e4c397f 100644 --- a/keyboards/jiran/info.json +++ b/keyboards/jiran/info.json @@ -8,6 +8,11 @@ "pid": "0x3735", "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D4", "C6", "D7", "E6"], + "rows": ["B4", "B5", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h index 4967594b55..3b83277d42 100644 --- a/keyboards/jkdlab/binary_monkey/config.h +++ b/keyboards/jkdlab/binary_monkey/config.h @@ -18,10 +18,4 @@ #pragma once - -#define MATRIX_ROW_PINS { D0 } -#define MATRIX_COL_PINS { D1, D2, D3 } - -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json index c5422097ab..b7fcc584f3 100644 --- a/keyboards/jkdlab/binary_monkey/info.json +++ b/keyboards/jkdlab/binary_monkey/info.json @@ -8,6 +8,11 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3"], + "rows": ["D0"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h index f8280340e8..a0012f33b5 100644 --- a/keyboards/jkeys_design/gentleman65/config.h +++ b/keyboards/jkeys_design/gentleman65/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, D1, F7, F1 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, D5, C7, F0, B2, B1, B3, B0, B7, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json index fff5b9b752..85f73603ae 100644 --- a/keyboards/jkeys_design/gentleman65/info.json +++ b/keyboards/jkeys_design/gentleman65/info.json @@ -8,6 +8,11 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"], + "rows": ["D3", "D2", "D1", "F7", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5"} diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h index c80b64ef10..532bf95acb 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/config.h +++ b/keyboards/jkeys_design/gentleman65_se_s/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, B7, B2, B3, D4, D6, D7, C7, C6, B6, B5, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json index 2415eb5c18..3a389231a4 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/info.json @@ -8,6 +8,11 @@ "pid": "0x2322", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h index ca28364f72..4b007cf387 100644 --- a/keyboards/jm60/config.h +++ b/keyboards/jm60/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B11, B10, B2, B1, B0 } -#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, B3, B4, B5, B6, B7, B8, B9, A2, A3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jm60/info.json b/keyboards/jm60/info.json index 1dbb4c31d9..a39bf9b4b4 100644 --- a/keyboards/jm60/info.json +++ b/keyboards/jm60/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A15", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A2", "A3"], + "rows": ["B11", "B10", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h index abca51f3fa..b53df6cf7f 100644 --- a/keyboards/jolofsor/denial75/config.h +++ b/keyboards/jolofsor/denial75/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { F7, C7, C6, B5, B4, D7, D6, D4, E6, B1, B2, B3, B7, D0, D1, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json index 5bf9c1eda2..7b8a2ad030 100644 --- a/keyboards/jolofsor/denial75/info.json +++ b/keyboards/jolofsor/denial75/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"], + "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index 1936d5d256..acf9a541b3 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// Same pins for Round-Robin matrix. -#define MATRIX_ROW_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 } -#define MATRIX_COL_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 } - -#define DIODE_DIRECTION COL2ROW - /* Audio */ #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index 37f0b70087..fc690aa6cd 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x175A", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], + "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"}, diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 7e0ef17113..77316af07c 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,12 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_SPLIT { 28, 28 } #define RGBLED_NUM 56 diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index 85df8cc709..dbfa50c358 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json index a22c82c681..ec522cc82c 100644 --- a/keyboards/kbdfans/kbdpad/mk3/info.json +++ b/keyboards/kbdfans/kbdpad/mk3/info.json @@ -57,27 +57,27 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "h": 2, "label": "K23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "K40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 }, + { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 }, + { "h": 2, "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 }, + { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 }, + { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 }, { "label": "K50", "matrix": [5, 0], "w": 2, "x": 0, "y": 5 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 2, "y": 5 }, - { "h": 2, "label": "K43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 } + { "label": "K52", "matrix": [5, 2], "x": 2, "y": 5 }, + { "h": 2, "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 } ] } } diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json index 850cfb1dc2..c4b262c26c 100644 --- a/keyboards/kbdfans/odinmini/info.json +++ b/keyboards/kbdfans/odinmini/info.json @@ -54,88 +54,88 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [2, 13], "w": 2, "x": 13, "y": 0 }, - { "label": "Insert", "matrix": [0, 13], "w": 1, "x": 15.25, "y": 0 }, - { "label": "Num Lock", "matrix": [0, 14], "w": 1, "x": 16.5, "y": 0 }, - { "label": "/", "matrix": [0, 15], "w": 1, "x": 17.5, "y": 0 }, - { "label": "*", "matrix": [0, 16], "w": 1, "x": 18.5, "y": 0 }, - { "label": "-", "matrix": [0, 17], "w": 1, "x": 19.5, "y": 0 }, + { "label": "Insert", "matrix": [0, 13], "x": 15.25, "y": 0 }, + { "label": "Num Lock", "matrix": [0, 14], "x": 16.5, "y": 0 }, + { "label": "/", "matrix": [0, 15], "x": 17.5, "y": 0 }, + { "label": "*", "matrix": [0, 16], "x": 18.5, "y": 0 }, + { "label": "-", "matrix": [0, 17], "x": 19.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [3, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Delete", "matrix": [1, 13], "w": 1, "x": 15.25, "y": 1 }, - { "label": "7", "matrix": [1, 14], "w": 1, "x": 16.5, "y": 1 }, - { "label": "8", "matrix": [1, 15], "w": 1, "x": 17.5, "y": 1 }, - { "label": "9", "matrix": [1, 16], "w": 1, "x": 18.5, "y": 1 }, - { "h": 2, "label": "+", "matrix": [1, 17], "w": 1, "x": 19.5, "y": 1 }, + { "label": "Delete", "matrix": [1, 13], "x": 15.25, "y": 1 }, + { "label": "7", "matrix": [1, 14], "x": 16.5, "y": 1 }, + { "label": "8", "matrix": [1, 15], "x": 17.5, "y": 1 }, + { "label": "9", "matrix": [1, 16], "x": 18.5, "y": 1 }, + { "h": 2, "label": "+", "matrix": [1, 17], "x": 19.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "label": "4", "matrix": [2, 14], "w": 1, "x": 16.5, "y": 2 }, - { "label": "5", "matrix": [2, 15], "w": 1, "x": 17.5, "y": 2 }, - { "label": "6", "matrix": [2, 16], "w": 1, "x": 18.5, "y": 2 }, + { "label": "4", "matrix": [2, 14], "x": 16.5, "y": 2 }, + { "label": "5", "matrix": [2, 15], "x": 17.5, "y": 2 }, + { "label": "6", "matrix": [2, 16], "x": 18.5, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 10], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 11], "w": 2.75, "x": 12.25, "y": 3 }, - { "label": "1", "matrix": [3, 12], "w": 1, "x": 16.5, "y": 3 }, - { "label": "2", "matrix": [3, 14], "w": 1, "x": 17.5, "y": 3 }, - { "label": "3", "matrix": [3, 15], "w": 1, "x": 18.5, "y": 3 }, - { "h": 2, "label": "Enter", "matrix": [3, 16], "w": 1, "x": 19.5, "y": 3 }, - { "label": "\u2191", "matrix": [3, 17], "w": 1, "x": 15.25, "y": 3.25 }, + { "label": "1", "matrix": [3, 12], "x": 16.5, "y": 3 }, + { "label": "2", "matrix": [3, 14], "x": 17.5, "y": 3 }, + { "label": "3", "matrix": [3, 15], "x": 18.5, "y": 3 }, + { "h": 2, "label": "Enter", "matrix": [3, 16], "x": 19.5, "y": 3 }, + { "label": "\u2191", "matrix": [3, 17], "x": 15.25, "y": 3.25 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "label": "k45", "matrix": [4, 5], "w": 7, "x": 3.75, "y": 4 }, { "label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 10.75, "y": 4 }, { "label": "Menu", "matrix": [4, 9], "w": 1.5, "x": 12.25, "y": 4 }, - { "label": "0", "matrix": [4, 10], "w": 1, "x": 17.5, "y": 4 }, - { "label": ".", "matrix": [4, 11], "w": 1, "x": 18.5, "y": 4 }, - { "label": "\u2190", "matrix": [4, 12], "w": 1, "x": 14.25, "y": 4.25 }, - { "label": "\u2193", "matrix": [4, 14], "w": 1, "x": 15.25, "y": 4.25 }, - { "label": "\u2192", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.25 } + { "label": "0", "matrix": [4, 10], "x": 17.5, "y": 4 }, + { "label": ".", "matrix": [4, 11], "x": 18.5, "y": 4 }, + { "label": "\u2190", "matrix": [4, 12], "x": 14.25, "y": 4.25 }, + { "label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4.25 }, + { "label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4.25 } ] } } diff --git a/keyboards/keebio/iris/keymaps/mattly/rules.mk b/keyboards/keebio/iris/keymaps/mattly/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/keebio/iris/keymaps/mattly/rules.mk +++ /dev/null diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index 88cec27844..09f6dd4d36 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -20,67 +20,67 @@ "layouts": { "LAYOUT": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 3, "y": 0 }, + { "x": 4, "y": 0 }, + { "x": 5, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 12, "y": 0 }, - { "w": 1, "x": 13, "y": 0 }, - { "w": 1, "x": 14, "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 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, + { "x": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 12, "y": 1 }, - { "w": 1, "x": 13, "y": 1 }, - { "w": 1, "x": 14, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 12, "y": 1 }, + { "x": 13, "y": 1 }, + { "x": 14, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 12, "y": 2 }, - { "w": 1, "x": 13, "y": 2 }, - { "w": 1, "x": 14, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 12, "y": 2 }, + { "x": 13, "y": 2 }, + { "x": 14, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, + { "x": 5, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 }, - { "w": 1, "x": 12, "y": 3 }, - { "w": 1, "x": 13, "y": 3 }, - { "w": 1, "x": 14, "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 }, - { "w": 1, "x": 5.5, "y": 4 }, - { "w": 1, "x": 6, "y": 5 }, + { "x": 5.5, "y": 4 }, + { "x": 6, "y": 5 }, - { "w": 1, "x": 8, "y": 5 }, - { "w": 1, "x": 8.5, "y": 4 } + { "x": 8, "y": 5 }, + { "x": 8.5, "y": 4 } ] } diff --git a/keyboards/keebsforall/freebird60/info.json b/keyboards/keebsforall/freebird60/info.json index 4cd786a174..7092596e37 100644 --- a/keyboards/keebsforall/freebird60/info.json +++ b/keyboards/keebsforall/freebird60/info.json @@ -15,7 +15,7 @@ "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] }, "LAYOUT_all": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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, "w":1.75}, {"label":"Up", "x":13, "y":3, "w":1}, {"label":"Shift", "x":14, "y":3, "w":1}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Ctrl", "x":11, "y":4, "w":1}, {"label":"Left", "x":12, "y":4, "w":1}, {"label":"Down", "x":13, "y":4, "w":1}, {"label":"Right", "x":14, "y":4, "w":1}] + "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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, "w":1.75}, {"label":"Up", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Ctrl", "x":11, "y":4}, {"label":"Left", "x":12, "y":4}, {"label":"Down", "x":13, "y":4}, {"label":"Right", "x":14, "y":4}] } } } diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 5d01d25bbd..78fd4adbde 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -12,22 +12,22 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - {"w": 1,"x": 0,"y": 0}, - {"w": 1,"x": 1,"y": 0}, - {"w": 1,"x": 2,"y": 0}, - {"w": 1,"x": 3,"y": 0}, - {"w": 1,"x": 0,"y": 1}, - {"w": 1,"x": 1,"y": 1}, - {"w": 1,"x": 2,"y": 1}, - {"w": 1,"x": 3,"y": 1}, - {"w": 1,"x": 0,"y": 2}, - {"w": 1,"x": 1,"y": 2}, - {"w": 1,"x": 2,"y": 2}, - {"w": 1,"x": 3,"y": 2}, - {"w": 1,"x": 0,"y": 3}, - {"w": 1,"x": 1,"y": 3}, - {"w": 1,"x": 2,"y": 3}, - {"w": 1,"x": 3,"y": 3} + {"x": 0,"y": 0}, + {"x": 1,"y": 0}, + {"x": 2,"y": 0}, + {"x": 3,"y": 0}, + {"x": 0,"y": 1}, + {"x": 1,"y": 1}, + {"x": 2,"y": 1}, + {"x": 3,"y": 1}, + {"x": 0,"y": 2}, + {"x": 1,"y": 2}, + {"x": 2,"y": 2}, + {"x": 3,"y": 2}, + {"x": 0,"y": 3}, + {"x": 1,"y": 3}, + {"x": 2,"y": 3}, + {"x": 3,"y": 3} ] } } diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/info.json index e2b2d4305a..a864057a1c 100644 --- a/keyboards/ktec/ergodone/info.json +++ b/keyboards/ktec/ergodone/info.json @@ -25,329 +25,329 @@ "LAYOUT_ergodox": { "layout": [ { "label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 }, + { "label": "k01", "matrix": [0, 1], "x": 1.5, "y": 0.375 }, + { "label": "k02", "matrix": [0, 2], "x": 2.5, "y": 0.125 }, + { "label": "k03", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0.125 }, + { "label": "k05", "matrix": [0, 5], "x": 5.5, "y": 0.25 }, + { "label": "k06", "matrix": [0, 6], "x": 6.5, "y": 0.25 }, { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 }, + { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1.375 }, + { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1.125 }, + { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1.125 }, + { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 }, { "label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 }, + { "label": "k21", "matrix": [2, 1], "x": 1.5, "y": 2.375 }, + { "label": "k22", "matrix": [2, 2], "x": 2.5, "y": 2.125 }, + { "label": "k23", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2.125 }, + { "label": "k25", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, { "label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 }, - { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 }, - { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 }, - { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 }, - { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 }, - { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 }, - { "label": "k55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 }, - { "label": "k56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 }, - { "label": "k54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 }, - { "label": "k53", "matrix": [5, 3], "w": 1, "x": 5, "y": 6, "h": 2 }, - { "label": "k52", "matrix": [5, 2], "w": 1, "x": 6, "y": 6, "h": 2 }, - { "label": "k51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 }, - { "label": "k08", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 }, - { "label": "k09", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 }, - { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 }, - { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 }, - { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 }, + { "label": "k31", "matrix": [3, 1], "x": 1.5, "y": 3.375 }, + { "label": "k32", "matrix": [3, 2], "x": 2.5, "y": 3.125 }, + { "label": "k33", "matrix": [3, 3], "x": 3.5, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3.125 }, + { "label": "k35", "matrix": [3, 5], "x": 5.5, "y": 3.25 }, + { "label": "k36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 }, + { "label": "k40", "matrix": [4, 0], "x": 0.5, "y": 4.375 }, + { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4.375 }, + { "label": "k42", "matrix": [4, 2], "x": 2.5, "y": 4.125 }, + { "label": "k43", "matrix": [4, 3], "x": 3.5, "y": 4 }, + { "label": "k44", "matrix": [4, 4], "x": 4.5, "y": 4.125 }, + { "label": "k55", "matrix": [5, 5], "x": 6, "y": 5 }, + { "label": "k56", "matrix": [5, 6], "x": 7, "y": 5 }, + { "label": "k54", "matrix": [5, 4], "x": 7, "y": 6 }, + { "label": "k53", "matrix": [5, 3], "x": 5, "y": 6, "h": 2 }, + { "label": "k52", "matrix": [5, 2], "x": 6, "y": 6, "h": 2 }, + { "label": "k51", "matrix": [5, 1], "x": 7, "y": 7 }, + { "label": "k07", "matrix": [0, 7], "x": 9.5, "y": 0.25 }, + { "label": "k08", "matrix": [0, 8], "x": 10.5, "y": 0.25 }, + { "label": "k09", "matrix": [0, 9], "x": 11.5, "y": 0.125 }, + { "label": "k0A", "matrix": [0, 10], "x": 12.5, "y": 0 }, + { "label": "k0B", "matrix": [0, 11], "x": 13.5, "y": 0.125 }, + { "label": "k0C", "matrix": [0, 12], "x": 14.5, "y": 0.375 }, { "label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 }, - { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 }, - { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 }, - { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 }, + { "label": "k17", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 }, + { "label": "k18", "matrix": [1, 8], "x": 10.5, "y": 1.25 }, + { "label": "k19", "matrix": [1, 9], "x": 11.5, "y": 1.125 }, + { "label": "k1A", "matrix": [1, 10], "x": 12.5, "y": 1 }, + { "label": "k1B", "matrix": [1, 11], "x": 13.5, "y": 1.125 }, + { "label": "k1C", "matrix": [1, 12], "x": 14.5, "y": 1.375 }, { "label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 }, - { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 }, - { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 }, - { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 }, + { "label": "k28", "matrix": [2, 8], "x": 10.5, "y": 2.25 }, + { "label": "k29", "matrix": [2, 9], "x": 11.5, "y": 2.125 }, + { "label": "k2A", "matrix": [2, 10], "x": 12.5, "y": 2 }, + { "label": "k2B", "matrix": [2, 11], "x": 13.5, "y": 2.125 }, + { "label": "k2C", "matrix": [2, 12], "x": 14.5, "y": 2.375 }, { "label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 }, - { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 }, - { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 }, - { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 }, + { "label": "k37", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 }, + { "label": "k38", "matrix": [3, 8], "x": 10.5, "y": 3.25 }, + { "label": "k39", "matrix": [3, 9], "x": 11.5, "y": 3.125 }, + { "label": "k3A", "matrix": [3, 10], "x": 12.5, "y": 3 }, + { "label": "k3B", "matrix": [3, 11], "x": 13.5, "y": 3.125 }, + { "label": "k3C", "matrix": [3, 12], "x": 14.5, "y": 3.375 }, { "label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 }, - { "label": "k49", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 }, - { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 }, - { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 }, - { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 }, - { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 }, - { "label": "k58", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 }, - { "label": "k59", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 }, - { "label": "k5C", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 }, - { "label": "k5B", "matrix": [5, 11], "w": 1, "x": 10, "y": 6, "h": 2 }, - { "label": "k5A", "matrix": [5, 10], "w": 1, "x": 11, "y": 6, "h": 2 } + { "label": "k49", "matrix": [4, 9], "x": 11.5, "y": 4.125 }, + { "label": "k4A", "matrix": [4, 10], "x": 12.5, "y": 4 }, + { "label": "k4B", "matrix": [4, 11], "x": 13.5, "y": 4.125 }, + { "label": "k4C", "matrix": [4, 12], "x": 14.5, "y": 4.375 }, + { "label": "k4D", "matrix": [4, 13], "x": 15.5, "y": 4.375 }, + { "label": "k57", "matrix": [5, 7], "x": 9, "y": 5 }, + { "label": "k58", "matrix": [5, 8], "x": 10, "y": 5 }, + { "label": "k59", "matrix": [5, 9], "x": 9, "y": 6 }, + { "label": "k5C", "matrix": [5, 12], "x": 9, "y": 7 }, + { "label": "k5B", "matrix": [5, 11], "x": 10, "y": 6, "h": 2 }, + { "label": "k5A", "matrix": [5, 10], "x": 11, "y": 6, "h": 2 } ] }, "LAYOUT_ergodox_80": { "layout": [ { "label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 }, + { "label": "k01", "matrix": [0, 1], "x": 1.5, "y": 0.375 }, + { "label": "k02", "matrix": [0, 2], "x": 2.5, "y": 0.125 }, + { "label": "k03", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0.125 }, + { "label": "k05", "matrix": [0, 5], "x": 5.5, "y": 0.25 }, + { "label": "k06", "matrix": [0, 6], "x": 6.5, "y": 0.25 }, { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 }, + { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1.375 }, + { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1.125 }, + { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1.125 }, + { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 }, { "label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 }, + { "label": "k21", "matrix": [2, 1], "x": 1.5, "y": 2.375 }, + { "label": "k22", "matrix": [2, 2], "x": 2.5, "y": 2.125 }, + { "label": "k23", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2.125 }, + { "label": "k25", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, { "label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 }, - { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 }, - { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 }, - { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 }, - { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 }, - { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 }, - { "label": "k55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 }, - { "label": "k56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 }, - { "label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 6 }, - { "label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 6 }, - { "label": "k54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 }, - { "label": "k53", "matrix": [5, 3], "w": 1, "x": 5, "y": 7 }, - { "label": "k52", "matrix": [5, 2], "w": 1, "x": 6, "y": 7 }, - { "label": "k51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 }, - { "label": "k08", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 }, - { "label": "k09", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 }, - { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 }, - { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 }, - { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 }, + { "label": "k31", "matrix": [3, 1], "x": 1.5, "y": 3.375 }, + { "label": "k32", "matrix": [3, 2], "x": 2.5, "y": 3.125 }, + { "label": "k33", "matrix": [3, 3], "x": 3.5, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3.125 }, + { "label": "k35", "matrix": [3, 5], "x": 5.5, "y": 3.25 }, + { "label": "k36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 }, + { "label": "k40", "matrix": [4, 0], "x": 0.5, "y": 4.375 }, + { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4.375 }, + { "label": "k42", "matrix": [4, 2], "x": 2.5, "y": 4.125 }, + { "label": "k43", "matrix": [4, 3], "x": 3.5, "y": 4 }, + { "label": "k44", "matrix": [4, 4], "x": 4.5, "y": 4.125 }, + { "label": "k55", "matrix": [5, 5], "x": 6, "y": 5 }, + { "label": "k56", "matrix": [5, 6], "x": 7, "y": 5 }, + { "label": "k45", "matrix": [4, 5], "x": 5, "y": 6 }, + { "label": "k46", "matrix": [4, 6], "x": 6, "y": 6 }, + { "label": "k54", "matrix": [5, 4], "x": 7, "y": 6 }, + { "label": "k53", "matrix": [5, 3], "x": 5, "y": 7 }, + { "label": "k52", "matrix": [5, 2], "x": 6, "y": 7 }, + { "label": "k51", "matrix": [5, 1], "x": 7, "y": 7 }, + { "label": "k07", "matrix": [0, 7], "x": 9.5, "y": 0.25 }, + { "label": "k08", "matrix": [0, 8], "x": 10.5, "y": 0.25 }, + { "label": "k09", "matrix": [0, 9], "x": 11.5, "y": 0.125 }, + { "label": "k0A", "matrix": [0, 10], "x": 12.5, "y": 0 }, + { "label": "k0B", "matrix": [0, 11], "x": 13.5, "y": 0.125 }, + { "label": "k0C", "matrix": [0, 12], "x": 14.5, "y": 0.375 }, { "label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 }, - { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 }, - { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 }, - { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 }, + { "label": "k17", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 }, + { "label": "k18", "matrix": [1, 8], "x": 10.5, "y": 1.25 }, + { "label": "k19", "matrix": [1, 9], "x": 11.5, "y": 1.125 }, + { "label": "k1A", "matrix": [1, 10], "x": 12.5, "y": 1 }, + { "label": "k1B", "matrix": [1, 11], "x": 13.5, "y": 1.125 }, + { "label": "k1C", "matrix": [1, 12], "x": 14.5, "y": 1.375 }, { "label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 }, - { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 }, - { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 }, - { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 }, + { "label": "k28", "matrix": [2, 8], "x": 10.5, "y": 2.25 }, + { "label": "k29", "matrix": [2, 9], "x": 11.5, "y": 2.125 }, + { "label": "k2A", "matrix": [2, 10], "x": 12.5, "y": 2 }, + { "label": "k2B", "matrix": [2, 11], "x": 13.5, "y": 2.125 }, + { "label": "k2C", "matrix": [2, 12], "x": 14.5, "y": 2.375 }, { "label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 }, - { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 }, - { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 }, - { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 }, + { "label": "k37", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 }, + { "label": "k38", "matrix": [3, 8], "x": 10.5, "y": 3.25 }, + { "label": "k39", "matrix": [3, 9], "x": 11.5, "y": 3.125 }, + { "label": "k3A", "matrix": [3, 10], "x": 12.5, "y": 3 }, + { "label": "k3B", "matrix": [3, 11], "x": 13.5, "y": 3.125 }, + { "label": "k3C", "matrix": [3, 12], "x": 14.5, "y": 3.375 }, { "label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 }, - { "label": "k49", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 }, - { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 }, - { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 }, - { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 }, - { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 }, - { "label": "k57", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 }, - { "label": "k58", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 }, - { "label": "k59", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 }, - { "label": "k47", "matrix": [4, 7], "w": 1, "x": 10, "y": 6 }, - { "label": "k48", "matrix": [4, 8], "w": 1, "x": 11, "y": 6 }, - { "label": "k5C", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 }, - { "label": "k5B", "matrix": [5, 11], "w": 1, "x": 10, "y": 7 }, - { "label": "k5A", "matrix": [5, 10], "w": 1, "x": 11, "y": 7 } + { "label": "k49", "matrix": [4, 9], "x": 11.5, "y": 4.125 }, + { "label": "k4A", "matrix": [4, 10], "x": 12.5, "y": 4 }, + { "label": "k4B", "matrix": [4, 11], "x": 13.5, "y": 4.125 }, + { "label": "k4C", "matrix": [4, 12], "x": 14.5, "y": 4.375 }, + { "label": "k4D", "matrix": [4, 13], "x": 15.5, "y": 4.375 }, + { "label": "k57", "matrix": [5, 7], "x": 9, "y": 5 }, + { "label": "k58", "matrix": [5, 8], "x": 10, "y": 5 }, + { "label": "k59", "matrix": [5, 9], "x": 9, "y": 6 }, + { "label": "k47", "matrix": [4, 7], "x": 10, "y": 6 }, + { "label": "k48", "matrix": [4, 8], "x": 11, "y": 6 }, + { "label": "k5C", "matrix": [5, 12], "x": 9, "y": 7 }, + { "label": "k5B", "matrix": [5, 11], "x": 10, "y": 7 }, + { "label": "k5A", "matrix": [5, 10], "x": 11, "y": 7 } ] }, "LAYOUT_ergodox_pretty": { "layout": [ { "label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 }, - { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 }, - { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 }, - { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 }, - { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 }, - { "label": "L05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 }, - { "label": "L06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 }, - { "label": "R00", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 }, - { "label": "R01", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 }, - { "label": "R02", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 }, - { "label": "R03", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 }, - { "label": "R04", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 }, - { "label": "R05", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 }, + { "label": "L01", "matrix": [0, 1], "x": 1.5, "y": 0.375 }, + { "label": "L02", "matrix": [0, 2], "x": 2.5, "y": 0.125 }, + { "label": "L03", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "L04", "matrix": [0, 4], "x": 4.5, "y": 0.125 }, + { "label": "L05", "matrix": [0, 5], "x": 5.5, "y": 0.25 }, + { "label": "L06", "matrix": [0, 6], "x": 6.5, "y": 0.25 }, + { "label": "R00", "matrix": [0, 7], "x": 9.5, "y": 0.25 }, + { "label": "R01", "matrix": [0, 8], "x": 10.5, "y": 0.25 }, + { "label": "R02", "matrix": [0, 9], "x": 11.5, "y": 0.125 }, + { "label": "R03", "matrix": [0, 10], "x": 12.5, "y": 0 }, + { "label": "R04", "matrix": [0, 11], "x": 13.5, "y": 0.125 }, + { "label": "R05", "matrix": [0, 12], "x": 14.5, "y": 0.375 }, { "label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 }, { "label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 }, - { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 }, - { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 }, - { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 }, - { "label": "L15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "L16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 }, - { "label": "R10", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 }, - { "label": "R11", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "R12", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 }, - { "label": "R13", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 }, - { "label": "R14", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 }, - { "label": "R15", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 }, + { "label": "L11", "matrix": [1, 1], "x": 1.5, "y": 1.375 }, + { "label": "L12", "matrix": [1, 2], "x": 2.5, "y": 1.125 }, + { "label": "L13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "L14", "matrix": [1, 4], "x": 4.5, "y": 1.125 }, + { "label": "L15", "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "label": "L16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 }, + { "label": "R10", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 }, + { "label": "R11", "matrix": [1, 8], "x": 10.5, "y": 1.25 }, + { "label": "R12", "matrix": [1, 9], "x": 11.5, "y": 1.125 }, + { "label": "R13", "matrix": [1, 10], "x": 12.5, "y": 1 }, + { "label": "R14", "matrix": [1, 11], "x": 13.5, "y": 1.125 }, + { "label": "R15", "matrix": [1, 12], "x": 14.5, "y": 1.375 }, { "label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 }, { "label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 }, - { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 }, - { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 }, - { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 }, - { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 }, - { "label": "L25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 }, - { "label": "R21", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 }, - { "label": "R22", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 }, - { "label": "R23", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 }, - { "label": "R24", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 }, - { "label": "R25", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 }, + { "label": "L21", "matrix": [2, 1], "x": 1.5, "y": 2.375 }, + { "label": "L22", "matrix": [2, 2], "x": 2.5, "y": 2.125 }, + { "label": "L23", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "L24", "matrix": [2, 4], "x": 4.5, "y": 2.125 }, + { "label": "L25", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "label": "R21", "matrix": [2, 8], "x": 10.5, "y": 2.25 }, + { "label": "R22", "matrix": [2, 9], "x": 11.5, "y": 2.125 }, + { "label": "R23", "matrix": [2, 10], "x": 12.5, "y": 2 }, + { "label": "R24", "matrix": [2, 11], "x": 13.5, "y": 2.125 }, + { "label": "R25", "matrix": [2, 12], "x": 14.5, "y": 2.375 }, { "label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 }, { "label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 }, - { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 }, - { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 }, - { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 }, - { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 }, - { "label": "L35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 }, - { "label": "L36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 }, - { "label": "R30", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 }, - { "label": "R31", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 }, - { "label": "R32", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 }, - { "label": "R33", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 }, - { "label": "R34", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 }, - { "label": "R35", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 }, + { "label": "L31", "matrix": [3, 1], "x": 1.5, "y": 3.375 }, + { "label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.125 }, + { "label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3 }, + { "label": "L34", "matrix": [3, 4], "x": 4.5, "y": 3.125 }, + { "label": "L35", "matrix": [3, 5], "x": 5.5, "y": 3.25 }, + { "label": "L36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 }, + { "label": "R30", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 }, + { "label": "R31", "matrix": [3, 8], "x": 10.5, "y": 3.25 }, + { "label": "R32", "matrix": [3, 9], "x": 11.5, "y": 3.125 }, + { "label": "R33", "matrix": [3, 10], "x": 12.5, "y": 3 }, + { "label": "R34", "matrix": [3, 11], "x": 13.5, "y": 3.125 }, + { "label": "R35", "matrix": [3, 12], "x": 14.5, "y": 3.375 }, { "label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 }, - { "label": "L40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 }, - { "label": "L41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 }, - { "label": "L42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 }, - { "label": "L43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 }, - { "label": "L44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 }, - { "label": "R42", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 }, - { "label": "R43", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 }, - { "label": "R44", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 }, - { "label": "R45", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 }, - { "label": "R46", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 }, - { "label": "L55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 }, - { "label": "L56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 }, - { "label": "R50", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 }, - { "label": "R51", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 }, - { "label": "L54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 }, - { "label": "R52", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 }, - { "label": "L53", "matrix": [5, 3], "w": 1, "x": 5, "y": 6,"h": 2 }, - { "label": "L52", "matrix": [5, 2], "w": 1, "x": 6, "y": 6,"h": 2 }, - { "label": "L51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 }, - { "label": "R55", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 }, - { "label": "R54", "matrix": [5, 11], "w": 1, "x": 10, "y": 6, "h": 2 }, - { "label": "R53", "matrix": [5, 10], "w": 1, "x": 11, "y": 6, "h": 2 } + { "label": "L40", "matrix": [4, 0], "x": 0.5, "y": 4.375 }, + { "label": "L41", "matrix": [4, 1], "x": 1.5, "y": 4.375 }, + { "label": "L42", "matrix": [4, 2], "x": 2.5, "y": 4.125 }, + { "label": "L43", "matrix": [4, 3], "x": 3.5, "y": 4 }, + { "label": "L44", "matrix": [4, 4], "x": 4.5, "y": 4.125 }, + { "label": "R42", "matrix": [4, 9], "x": 11.5, "y": 4.125 }, + { "label": "R43", "matrix": [4, 10], "x": 12.5, "y": 4 }, + { "label": "R44", "matrix": [4, 11], "x": 13.5, "y": 4.125 }, + { "label": "R45", "matrix": [4, 12], "x": 14.5, "y": 4.375 }, + { "label": "R46", "matrix": [4, 13], "x": 15.5, "y": 4.375 }, + { "label": "L55", "matrix": [5, 5], "x": 6, "y": 5 }, + { "label": "L56", "matrix": [5, 6], "x": 7, "y": 5 }, + { "label": "R50", "matrix": [5, 7], "x": 9, "y": 5 }, + { "label": "R51", "matrix": [5, 8], "x": 10, "y": 5 }, + { "label": "L54", "matrix": [5, 4], "x": 7, "y": 6 }, + { "label": "R52", "matrix": [5, 9], "x": 9, "y": 6 }, + { "label": "L53", "matrix": [5, 3], "x": 5, "y": 6,"h": 2 }, + { "label": "L52", "matrix": [5, 2], "x": 6, "y": 6,"h": 2 }, + { "label": "L51", "matrix": [5, 1], "x": 7, "y": 7 }, + { "label": "R55", "matrix": [5, 12], "x": 9, "y": 7 }, + { "label": "R54", "matrix": [5, 11], "x": 10, "y": 6, "h": 2 }, + { "label": "R53", "matrix": [5, 10], "x": 11, "y": 6, "h": 2 } ] }, "LAYOUT_ergodox_pretty_80": { "layout": [ { "label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 }, - { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 }, - { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 }, - { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 }, - { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 }, - { "label": "L05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 }, - { "label": "L06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 }, - { "label": "R00", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 }, - { "label": "R01", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 }, - { "label": "R02", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 }, - { "label": "R03", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 }, - { "label": "R04", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 }, - { "label": "R05", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 }, + { "label": "L01", "matrix": [0, 1], "x": 1.5, "y": 0.375 }, + { "label": "L02", "matrix": [0, 2], "x": 2.5, "y": 0.125 }, + { "label": "L03", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "L04", "matrix": [0, 4], "x": 4.5, "y": 0.125 }, + { "label": "L05", "matrix": [0, 5], "x": 5.5, "y": 0.25 }, + { "label": "L06", "matrix": [0, 6], "x": 6.5, "y": 0.25 }, + { "label": "R00", "matrix": [0, 7], "x": 9.5, "y": 0.25 }, + { "label": "R01", "matrix": [0, 8], "x": 10.5, "y": 0.25 }, + { "label": "R02", "matrix": [0, 9], "x": 11.5, "y": 0.125 }, + { "label": "R03", "matrix": [0, 10], "x": 12.5, "y": 0 }, + { "label": "R04", "matrix": [0, 11], "x": 13.5, "y": 0.125 }, + { "label": "R05", "matrix": [0, 12], "x": 14.5, "y": 0.375 }, { "label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 }, { "label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 }, - { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 }, - { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 }, - { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 }, - { "label": "L15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 }, - { "label": "L16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 }, - { "label": "R10", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 }, - { "label": "R11", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 }, - { "label": "R12", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 }, - { "label": "R13", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 }, - { "label": "R14", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 }, - { "label": "R15", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 }, + { "label": "L11", "matrix": [1, 1], "x": 1.5, "y": 1.375 }, + { "label": "L12", "matrix": [1, 2], "x": 2.5, "y": 1.125 }, + { "label": "L13", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "L14", "matrix": [1, 4], "x": 4.5, "y": 1.125 }, + { "label": "L15", "matrix": [1, 5], "x": 5.5, "y": 1.25 }, + { "label": "L16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 }, + { "label": "R10", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 }, + { "label": "R11", "matrix": [1, 8], "x": 10.5, "y": 1.25 }, + { "label": "R12", "matrix": [1, 9], "x": 11.5, "y": 1.125 }, + { "label": "R13", "matrix": [1, 10], "x": 12.5, "y": 1 }, + { "label": "R14", "matrix": [1, 11], "x": 13.5, "y": 1.125 }, + { "label": "R15", "matrix": [1, 12], "x": 14.5, "y": 1.375 }, { "label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 }, { "label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 }, - { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 }, - { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 }, - { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 }, - { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 }, - { "label": "L25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 }, - { "label": "R21", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 }, - { "label": "R22", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 }, - { "label": "R23", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 }, - { "label": "R24", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 }, - { "label": "R25", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 }, + { "label": "L21", "matrix": [2, 1], "x": 1.5, "y": 2.375 }, + { "label": "L22", "matrix": [2, 2], "x": 2.5, "y": 2.125 }, + { "label": "L23", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "L24", "matrix": [2, 4], "x": 4.5, "y": 2.125 }, + { "label": "L25", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "label": "R21", "matrix": [2, 8], "x": 10.5, "y": 2.25 }, + { "label": "R22", "matrix": [2, 9], "x": 11.5, "y": 2.125 }, + { "label": "R23", "matrix": [2, 10], "x": 12.5, "y": 2 }, + { "label": "R24", "matrix": [2, 11], "x": 13.5, "y": 2.125 }, + { "label": "R25", "matrix": [2, 12], "x": 14.5, "y": 2.375 }, { "label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 }, { "label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 }, - { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 }, - { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 }, - { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 }, - { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 }, - { "label": "L35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 }, - { "label": "L36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 }, - { "label": "R30", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 }, - { "label": "R31", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 }, - { "label": "R32", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 }, - { "label": "R33", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 }, - { "label": "R34", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 }, - { "label": "R35", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 }, + { "label": "L31", "matrix": [3, 1], "x": 1.5, "y": 3.375 }, + { "label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.125 }, + { "label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3 }, + { "label": "L34", "matrix": [3, 4], "x": 4.5, "y": 3.125 }, + { "label": "L35", "matrix": [3, 5], "x": 5.5, "y": 3.25 }, + { "label": "L36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 }, + { "label": "R30", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 }, + { "label": "R31", "matrix": [3, 8], "x": 10.5, "y": 3.25 }, + { "label": "R32", "matrix": [3, 9], "x": 11.5, "y": 3.125 }, + { "label": "R33", "matrix": [3, 10], "x": 12.5, "y": 3 }, + { "label": "R34", "matrix": [3, 11], "x": 13.5, "y": 3.125 }, + { "label": "R35", "matrix": [3, 12], "x": 14.5, "y": 3.375 }, { "label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 }, - { "label": "L40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 }, - { "label": "L41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 }, - { "label": "L42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 }, - { "label": "L43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 }, - { "label": "L44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 }, - { "label": "R42", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 }, - { "label": "R43", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 }, - { "label": "R44", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 }, - { "label": "R45", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 }, - { "label": "R46", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 }, - { "label": "L55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 }, - { "label": "L56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 }, - { "label": "R50", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 }, - { "label": "R51", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 }, - { "label": "L45", "matrix": [4, 5], "w": 1, "x": 5, "y": 6 }, - { "label": "L46", "matrix": [4, 6], "w": 1, "x": 6, "y": 6 }, - { "label": "L54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 }, - { "label": "R52", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 }, - { "label": "R40", "matrix": [4, 7], "w": 1, "x": 10, "y": 6 }, - { "label": "R41", "matrix": [4, 8], "w": 1, "x": 11, "y": 6 }, - { "label": "L53", "matrix": [5, 3], "w": 1, "x": 5, "y": 7 }, - { "label": "L52", "matrix": [5, 2], "w": 1, "x": 6, "y": 7 }, - { "label": "L51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 }, - { "label": "R55", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 }, - { "label": "R54", "matrix": [5, 11], "w": 1, "x": 10, "y": 7 }, - { "label": "R53", "matrix": [5, 10], "w": 1, "x": 11, "y": 7 } + { "label": "L40", "matrix": [4, 0], "x": 0.5, "y": 4.375 }, + { "label": "L41", "matrix": [4, 1], "x": 1.5, "y": 4.375 }, + { "label": "L42", "matrix": [4, 2], "x": 2.5, "y": 4.125 }, + { "label": "L43", "matrix": [4, 3], "x": 3.5, "y": 4 }, + { "label": "L44", "matrix": [4, 4], "x": 4.5, "y": 4.125 }, + { "label": "R42", "matrix": [4, 9], "x": 11.5, "y": 4.125 }, + { "label": "R43", "matrix": [4, 10], "x": 12.5, "y": 4 }, + { "label": "R44", "matrix": [4, 11], "x": 13.5, "y": 4.125 }, + { "label": "R45", "matrix": [4, 12], "x": 14.5, "y": 4.375 }, + { "label": "R46", "matrix": [4, 13], "x": 15.5, "y": 4.375 }, + { "label": "L55", "matrix": [5, 5], "x": 6, "y": 5 }, + { "label": "L56", "matrix": [5, 6], "x": 7, "y": 5 }, + { "label": "R50", "matrix": [5, 7], "x": 9, "y": 5 }, + { "label": "R51", "matrix": [5, 8], "x": 10, "y": 5 }, + { "label": "L45", "matrix": [4, 5], "x": 5, "y": 6 }, + { "label": "L46", "matrix": [4, 6], "x": 6, "y": 6 }, + { "label": "L54", "matrix": [5, 4], "x": 7, "y": 6 }, + { "label": "R52", "matrix": [5, 9], "x": 9, "y": 6 }, + { "label": "R40", "matrix": [4, 7], "x": 10, "y": 6 }, + { "label": "R41", "matrix": [4, 8], "x": 11, "y": 6 }, + { "label": "L53", "matrix": [5, 3], "x": 5, "y": 7 }, + { "label": "L52", "matrix": [5, 2], "x": 6, "y": 7 }, + { "label": "L51", "matrix": [5, 1], "x": 7, "y": 7 }, + { "label": "R55", "matrix": [5, 12], "x": 9, "y": 7 }, + { "label": "R54", "matrix": [5, 11], "x": 10, "y": 7 }, + { "label": "R53", "matrix": [5, 10], "x": 11, "y": 7 } ] } } diff --git a/keyboards/kudox/rev1/keymaps/jis/rules.mk b/keyboards/kudox/rev1/keymaps/jis/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/kudox/rev1/keymaps/jis/rules.mk +++ /dev/null diff --git a/keyboards/kudox/rev1/keymaps/x1/rules.mk b/keyboards/kudox/rev1/keymaps/x1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/kudox/rev1/keymaps/x1/rules.mk +++ /dev/null diff --git a/keyboards/kudox/rev2/keymaps/jis/rules.mk b/keyboards/kudox/rev2/keymaps/jis/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/kudox/rev2/keymaps/jis/rules.mk +++ /dev/null diff --git a/keyboards/lets_split/keymaps/DE_programming/rules.mk b/keyboards/lets_split/keymaps/DE_programming/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/lets_split/keymaps/DE_programming/rules.mk +++ /dev/null diff --git a/keyboards/lets_split/keymaps/DE_simple/rules.mk b/keyboards/lets_split/keymaps/DE_simple/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/lets_split/keymaps/DE_simple/rules.mk +++ /dev/null diff --git a/keyboards/lets_split/keymaps/poker/rules.mk b/keyboards/lets_split/keymaps/poker/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/lets_split/keymaps/poker/rules.mk +++ /dev/null diff --git a/keyboards/lets_split/keymaps/vim-mode/rules.mk b/keyboards/lets_split/keymaps/vim-mode/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/lets_split/keymaps/vim-mode/rules.mk +++ /dev/null diff --git a/keyboards/lets_split/keymaps/waples/rules.mk b/keyboards/lets_split/keymaps/waples/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/lets_split/keymaps/waples/rules.mk +++ /dev/null diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json index a2aea08829..f82af456ff 100644 --- a/keyboards/lfkeyboards/lfk65_hs/info.json +++ b/keyboards/lfkeyboards/lfk65_hs/info.json @@ -14,7 +14,7 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT_all": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "","x": 13,"y": 0,"w": 1},{"label": "","x": 14,"y": 0,"w": 1},{"label": "Home","x": 15,"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": "Page Up","x": 15,"y": 1},{"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": "","x": 12.75,"y": 2},{"label": "Enter","x": 13.75,"y": 2,"w": 1.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 1.25},{"label": "","x": 1.25,"y": 3},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "←","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]}, + "LAYOUT_all": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "","x": 13,"y": 0},{"label": "","x": 14,"y": 0},{"label": "Home","x": 15,"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": "Page Up","x": 15,"y": 1},{"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": "","x": 12.75,"y": 2},{"label": "Enter","x": 13.75,"y": 2,"w": 1.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 1.25},{"label": "","x": 1.25,"y": 3},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "←","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]}, "LAYOUT_ansi": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "Backspace","x": 13,"y": 0,"w": 2},{"label": "Home","x": 15,"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": "Page Up","x": 15,"y": 1},{"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},{"label": "A","x": 1.75,"y": 2},{"label": "S","x": 2.75,"y": 2},{"label": "D","x": 3.75,"y": 2},{"label": "F","x": 4.75,"y": 2},{"label": "G","x": 5.75,"y": 2},{"label": "H","x": 6.75,"y": 2},{"label": "J","x": 7.75,"y": 2},{"label": "K","x": 8.75,"y": 2},{"label": "L","x": 9.75,"y": 2},{"label": ":","x": 10.75,"y": 2},{"label": "\"","x": 11.75,"y": 2},{"label": "Enter","x": 12.75,"y": 2,"w": 2.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 2.25},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "←","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]} } } diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c index 3d273e8aec..47ad655ddc 100644 --- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c +++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c @@ -2,7 +2,6 @@ #include <avr/timer_avr.h> #include <avr/wdt.h> #include "lfk65_hs.h" -#include "keymap.h" bool process_record_kb(uint16_t keycode, keyrecord_t* record) { diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c index ce81aa7d27..58dcfde46d 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.c +++ b/keyboards/lfkeyboards/lfk87/lfk87.c @@ -3,7 +3,6 @@ #include <avr/timer_avr.h> #include <avr/wdt.h> #include "lfk87.h" -#include "keymap.h" #include "issi.h" #include "TWIlib.h" #include "lighting.h" diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index f435f55677..adccd8c278 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -3,7 +3,6 @@ #include <avr/timer_avr.h> #include <avr/wdt.h> #include "mini1800.h" -#include "keymap.h" #include "issi.h" #include "TWIlib.h" #include "lighting.h" diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c index 858305244a..a1d9f61284 100644 --- a/keyboards/lfkeyboards/smk65/revb/revb.c +++ b/keyboards/lfkeyboards/smk65/revb/revb.c @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <avr/timer_avr.h> #include <avr/wdt.h> #include "smk65.h" -#include "keymap.h" #include "debug.h" #include "issi.h" #include "TWIlib.h" diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json index 4abcb323a4..f501b5e52c 100644 --- a/keyboards/linworks/em8/info.json +++ b/keyboards/linworks/em8/info.json @@ -107,12 +107,12 @@ {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] }, {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] }, {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] }, - {"x":8, "y":4, "w":1, "matrix":[4,6] }, + {"x":8, "y":4, "matrix":[4,6] }, {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] }, {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] }, - {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] }, - {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] }, - {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] } + {"x":16.5, "y":4.25, "matrix":[4,12] }, + {"x":17.5, "y":4.25, "matrix":[4,13] }, + {"x":18.5, "y":4.25, "matrix":[4,14] } ] }, @@ -186,12 +186,12 @@ {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] }, {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] }, {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] }, - {"x":8, "y":4, "w":1, "matrix":[4,6] }, + {"x":8, "y":4, "matrix":[4,6] }, {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] }, {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] }, - {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] }, - {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] }, - {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] } + {"x":16.5, "y":4.25, "matrix":[4,12] }, + {"x":17.5, "y":4.25, "matrix":[4,13] }, + {"x":18.5, "y":4.25, "matrix":[4,14] } ] } } diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json index 70c22a5dd2..735ba9272d 100644 --- a/keyboards/lucid/kbd8x_hs/info.json +++ b/keyboards/lucid/kbd8x_hs/info.json @@ -199,7 +199,7 @@ {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, - {"label":"Win", "x":12.5, "y":5.25, "w":1}, + {"label":"Win", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk +++ /dev/null diff --git a/keyboards/masterworks/classy_tkl/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json index 5a3c567bc9..89f227fbf7 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/info.json +++ b/keyboards/masterworks/classy_tkl/rev_a/info.json @@ -90,14 +90,14 @@ { "label": ">", "x": 10.25, "y": 4.5 }, { "label": "?", "x": 11.25, "y": 4.5 }, { "label": "Shift", "x": 12.25, "y": 4.5, "w": 1.75 }, - { "label": "Shift2", "x": 14, "y": 4.5, "w": 1 }, + { "label": "Shift2", "x": 14, "y": 4.5 }, { "label": "Up", "x": 16.25, "y": 4.5 }, { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.5, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.5 }, { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, - { "label": "Win", "x": 12.5, "y": 5.5, "w": 1 }, + { "label": "Win", "x": 12.5, "y": 5.5 }, { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, { "label": "Left", "x": 15.25, "y": 5.5 }, { "label": "Down", "x": 16.25, "y": 5.5 }, diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json index 12d53bb0f6..62a9702953 100644 --- a/keyboards/maxr1998/phoebe/info.json +++ b/keyboards/maxr1998/phoebe/info.json @@ -24,267 +24,214 @@ "LAYOUT": { "layout": [ { - "w": 1, "x": 0, "y": 0 }, { - "w": 1, "x": 1, "y": 0 }, { - "w": 1, "x": 2, "y": 0 }, { - "w": 1, "x": 3, "y": 0 }, { - "w": 1, "x": 4, "y": 0 }, { - "w": 1, "x": 5, "y": 0 }, { - "w": 1, "x": 6, "y": 0 }, { - "w": 1, "x": 7, "y": 0 }, { - "w": 1, "x": 8, "y": 0 }, { - "w": 1, "x": 9, "y": 0 }, { - "w": 1, "x": 10, "y": 0 }, { - "w": 1, "x": 11, "y": 0 }, { - "w": 1, "x": 0, "y": 1 }, { - "w": 1, "x": 1, "y": 1 }, { - "w": 1, "x": 2, "y": 1 }, { - "w": 1, "x": 3, "y": 1 }, { - "w": 1, "x": 4, "y": 1 }, { - "w": 1, "x": 5, "y": 1 }, { - "w": 1, "x": 6, "y": 1 }, { - "w": 1, "x": 7, "y": 1 }, { - "w": 1, "x": 8, "y": 1 }, { - "w": 1, "x": 9, "y": 1 }, { - "w": 1, "x": 10, "y": 1 }, { - "w": 1, "x": 11, "y": 1 }, { - "w": 1, "x": 0, "y": 2 }, { - "w": 1, "x": 1, "y": 2 }, { - "w": 1, "x": 2, "y": 2 }, { - "w": 1, "x": 3, "y": 2 }, { - "w": 1, "x": 4, "y": 2 }, { - "w": 1, "x": 5, "y": 2 }, { - "w": 1, "x": 6, "y": 2 }, { - "w": 1, "x": 7, "y": 2 }, { - "w": 1, "x": 8, "y": 2 }, { - "w": 1, "x": 9, "y": 2 }, { - "w": 1, "x": 10, "y": 2 }, { - "w": 1, "x": 11, "y": 2 }, { - "w": 1, "x": 0, "y": 3 }, { - "w": 1, "x": 1, "y": 3 }, { - "w": 1, "x": 2, "y": 3 }, { - "w": 1, "x": 3, "y": 3 }, { - "w": 1, "x": 4, "y": 3 }, { - "w": 1, "x": 5, "y": 3 }, { - "w": 1, "x": 6, "y": 3 }, { - "w": 1, "x": 7, "y": 3 }, { - "w": 1, "x": 8, "y": 3 }, { - "w": 1, "x": 9, "y": 3 }, { - "w": 1, "x": 10, "y": 3 }, { - "w": 1, "x": 11, "y": 3 }, { - "w": 1, "x": 0, "y": 4 }, { - "w": 1, "x": 1, "y": 4 }, { - "w": 1, "x": 2, "y": 4 }, { - "w": 1, "x": 3, "y": 4 }, { - "w": 1, "x": 4, "y": 4 }, @@ -294,27 +241,22 @@ "y": 4 }, { - "w": 1, "x": 7, "y": 4 }, { - "w": 1, "x": 8, "y": 4 }, { - "w": 1, "x": 9, "y": 4 }, { - "w": 1, "x": 10, "y": 4 }, { - "w": 1, "x": 11, "y": 4 } diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json index 9db0307940..93827a1a64 100644 --- a/keyboards/maxr1998/pulse4k/info.json +++ b/keyboards/maxr1998/pulse4k/info.json @@ -19,12 +19,12 @@ "layouts": { "LAYOUT": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 } ] + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 } ] } } } diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/info.json index ae12912f00..ba389e31f1 100644 --- a/keyboards/metamechs/timberwolf/info.json +++ b/keyboards/metamechs/timberwolf/info.json @@ -119,9 +119,9 @@ {"label":"Win", "x":2.75, "y":5.25}, {"label":"Alt", "x":3.75, "y":5.25, "w":1.5}, {"x":5.25, "y":5.25, "w":5.5}, - {"label":"Alt", "x":10.75, "y":5.25, "w":1}, + {"label":"Alt", "x":10.75, "y":5.25}, {"label":"Win", "x":11.75, "y":5.25}, - {"label":"Ctrl", "x":12.75, "y":5.25, "w":1}, + {"label":"Ctrl", "x":12.75, "y":5.25}, {"label":"Left", "x":13.75, "y":5.5}, {"label":"Left", "x":14.75, "y":5.5}, {"label":"Down", "x":15.75, "y":5.5}, diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json index 23d5666a4d..1e540bd58c 100644 --- a/keyboards/ms_sculpt/info.json +++ b/keyboards/ms_sculpt/info.json @@ -32,13 +32,13 @@ "layouts": { "LAYOUT_iso": { "layout": [ - {"label":"Esc", "x":0, "y":0, "w":1, "h":0.8}, - {"label":"F1", "x":1, "y":0, "w":1, "h":0.8}, - {"label":"F2", "x":2, "y":0, "w":1, "h":0.8}, - {"label":"F3", "x":3, "y":0, "w":1, "h":0.8}, - {"label":"F4", "x":4, "y":0, "w":1, "h":0.8}, - {"label":"F5", "x":5, "y":0, "w":1, "h":0.8}, - {"label":"F6", "x":6, "y":0, "w":1, "h":0.8}, + {"label":"Esc", "x":0, "y":0, "h":0.8}, + {"label":"F1", "x":1, "y":0, "h":0.8}, + {"label":"F2", "x":2, "y":0, "h":0.8}, + {"label":"F3", "x":3, "y":0, "h":0.8}, + {"label":"F4", "x":4, "y":0, "h":0.8}, + {"label":"F5", "x":5, "y":0, "h":0.8}, + {"label":"F6", "x":6, "y":0, "h":0.8}, {"label":"F7", "x":8, "y":0, "w":0.975, "h":0.8}, {"label":"F8", "x":8.975, "y":0, "w":0.975, "h":0.8}, {"label":"F9", "x":9.95, "y":0, "w":0.975, "h":0.8}, diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json index e97d70bf3b..38a7b38e4a 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/info.json @@ -23,7 +23,7 @@ "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] }, "LAYOUT_iso": { - "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4, "w":1}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] + "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] } } } diff --git a/keyboards/nemui/info.json b/keyboards/nemui/info.json index 3ac29f519c..fec7ac2fcb 100644 --- a/keyboards/nemui/info.json +++ b/keyboards/nemui/info.json @@ -67,13 +67,11 @@ }, { "x": 13, - "y": 0, - "w": 1 + "y": 0 }, { "x": 14, - "y": 0, - "w": 1 + "y": 0 }, { "x": 0, diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json index 4742e2f9bd..002c82f6b7 100644 --- a/keyboards/nyhxis/nfr_70/info.json +++ b/keyboards/nyhxis/nfr_70/info.json @@ -172,11 +172,11 @@ { "label": "/", "x": 11.25, "y": 4.25 }, { "x": 10, "y": 5.25 }, { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "LWIN", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "LWIN", "x": 1.5, "y": 5.25 }, { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "SPACE", "x": 4, "y": 5.25, "w": 7 }, { "label": "RALT", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "RWIN", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "RWIN", "x": 12.5, "y": 5.25 }, { "label": "RCTRL", "x": 13.5, "y": 5.25, "w": 1.5 } ] } diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json index cf87e52e48..5ba2551f4a 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/info.json @@ -16,128 +16,128 @@ "layouts": { "LAYOUT_ortho_5x12_1x2uC": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 }, - { "w": 1, "x": 0, "y": 4 }, - { "w": 1, "x": 1, "y": 4 }, - { "w": 1, "x": 2, "y": 4 }, - { "w": 1, "x": 3, "y": 4 }, - { "w": 1, "x": 4, "y": 4 }, + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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": 0, "y": 4 }, + { "x": 1, "y": 4 }, + { "x": 2, "y": 4 }, + { "x": 3, "y": 4 }, + { "x": 4, "y": 4 }, { "w": 2, "x": 5, "y": 4 }, - { "w": 1, "x": 7, "y": 4 }, - { "w": 1, "x": 8, "y": 4 }, - { "w": 1, "x": 9, "y": 4 }, - { "w": 1, "x": 10, "y": 4 }, - { "w": 1, "x": 11, "y": 4 } ] + { "x": 7, "y": 4 }, + { "x": 8, "y": 4 }, + { "x": 9, "y": 4 }, + { "x": 10, "y": 4 }, + { "x": 11, "y": 4 } ] }, "LAYOUT_ortho_5x12": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 }, - { "w": 1, "x": 0, "y": 4 }, - { "w": 1, "x": 1, "y": 4 }, - { "w": 1, "x": 2, "y": 4 }, - { "w": 1, "x": 3, "y": 4 }, - { "w": 1, "x": 4, "y": 4 }, - { "w": 1, "x": 5, "y": 4 }, - { "w": 1, "x": 6, "y": 4 }, - { "w": 1, "x": 7, "y": 4 }, - { "w": 1, "x": 8, "y": 4 }, - { "w": 1, "x": 9, "y": 4 }, - { "w": 1, "x": 10, "y": 4 }, - { "w": 1, "x": 11, "y": 4 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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": 0, "y": 4 }, + { "x": 1, "y": 4 }, + { "x": 2, "y": 4 }, + { "x": 3, "y": 4 }, + { "x": 4, "y": 4 }, + { "x": 5, "y": 4 }, + { "x": 6, "y": 4 }, + { "x": 7, "y": 4 }, + { "x": 8, "y": 4 }, + { "x": 9, "y": 4 }, + { "x": 10, "y": 4 }, + { "x": 11, "y": 4 } ] } } } diff --git a/keyboards/orthodox/keymaps/rfvizarra/rules.mk b/keyboards/orthodox/keymaps/rfvizarra/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/orthodox/keymaps/rfvizarra/rules.mk +++ /dev/null diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index 703a3b1f80..088b7ce324 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -14,46 +14,46 @@ "layouts": { "LAYOUT_ortho_4x10": { "layout": [ - {"w":1, "x":0, "y":0}, - {"w":1, "x":1, "y":0}, - {"w":1, "x":2, "y":0}, - {"w":1, "x":3, "y":0}, - {"w":1, "x":4, "y":0}, - {"w":1, "x":5, "y":0}, - {"w":1, "x":6, "y":0}, - {"w":1, "x":7, "y":0}, - {"w":1, "x":8, "y":0}, - {"w":1, "x":9, "y":0}, - {"w":1, "x":0.25, "y":1}, - {"w":1, "x":1.25, "y":1}, - {"w":1, "x":2.25, "y":1}, - {"w":1, "x":3.25, "y":1}, - {"w":1, "x":4.25, "y":1}, - {"w":1, "x":5.25, "y":1}, - {"w":1, "x":6.25, "y":1}, - {"w":1, "x":7.25, "y":1}, - {"w":1, "x":8.25, "y":1}, - {"w":1, "x":9.25, "y":1}, - {"w":1, "x":0.5, "y":2}, - {"w":1, "x":1.5, "y":2}, - {"w":1, "x":2.5, "y":2}, - {"w":1, "x":3.5, "y":2}, - {"w":1, "x":4.5, "y":2}, - {"w":1, "x":5.5, "y":2}, - {"w":1, "x":6.5, "y":2}, - {"w":1, "x":7.5, "y":2}, - {"w":1, "x":8.5, "y":2}, - {"w":1, "x":9.5, "y":2}, - {"w":1, "x":0.75, "y":3}, - {"w":1, "x":1.75, "y":3}, - {"w":1, "x":2.75, "y":3}, - {"w":1, "x":3.75, "y":3}, - {"w":1, "x":4.75, "y":3}, - {"w":1, "x":5.75, "y":3}, - {"w":1, "x":6.75, "y":3}, - {"w":1, "x":7.75, "y":3}, - {"w":1, "x":8.75, "y":3}, - {"w":1, "x":9.75, "y":3}] + {"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":0.25, "y":1}, + {"x":1.25, "y":1}, + {"x":2.25, "y":1}, + {"x":3.25, "y":1}, + {"x":4.25, "y":1}, + {"x":5.25, "y":1}, + {"x":6.25, "y":1}, + {"x":7.25, "y":1}, + {"x":8.25, "y":1}, + {"x":9.25, "y":1}, + {"x":0.5, "y":2}, + {"x":1.5, "y":2}, + {"x":2.5, "y":2}, + {"x":3.5, "y":2}, + {"x":4.5, "y":2}, + {"x":5.5, "y":2}, + {"x":6.5, "y":2}, + {"x":7.5, "y":2}, + {"x":8.5, "y":2}, + {"x":9.5, "y":2}, + {"x":0.75, "y":3}, + {"x":1.75, "y":3}, + {"x":2.75, "y":3}, + {"x":3.75, "y":3}, + {"x":4.75, "y":3}, + {"x":5.75, "y":3}, + {"x":6.75, "y":3}, + {"x":7.75, "y":3}, + {"x":8.75, "y":3}, + {"x":9.75, "y":3}] } } } diff --git a/keyboards/parallel/parallel_65/hotswap/info.json b/keyboards/parallel/parallel_65/hotswap/info.json index 25a8b75f04..91b32a6c91 100644 --- a/keyboards/parallel/parallel_65/hotswap/info.json +++ b/keyboards/parallel/parallel_65/hotswap/info.json @@ -151,7 +151,7 @@ { "x":15, "y":3 }, { "x":0, "y":4, "w":1.5 }, - { "x":1.5, "y":4, "w":1 }, + { "x":1.5, "y":4 }, { "x":2.5, "y":4, "w":1.5 }, { "x":4, "y":4, "w":7 }, { "x":11, "y":4, "w":1.5 }, diff --git a/keyboards/parallel/parallel_65/soldered/info.json b/keyboards/parallel/parallel_65/soldered/info.json index 509d14b264..5ae3d5443b 100644 --- a/keyboards/parallel/parallel_65/soldered/info.json +++ b/keyboards/parallel/parallel_65/soldered/info.json @@ -228,7 +228,7 @@ { "x":15, "y":3 }, { "x":0, "y":4, "w":1.5 }, - { "x":1.5, "y":4, "w":1 }, + { "x":1.5, "y":4 }, { "x":2.5, "y":4, "w":1.5 }, { "x":4, "y":4, "w":7 }, { "x":11, "y":4, "w":1.5 }, @@ -457,7 +457,7 @@ { "x":15, "y":3 }, { "x":0, "y":4, "w":1.5 }, - { "x":1.5, "y":4, "w":1 }, + { "x":1.5, "y":4 }, { "x":2.5, "y":4, "w":1.5 }, { "x":4, "y":4, "w":7 }, { "x":11, "y":4, "w":1.5 }, diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json index cc57b6da60..a4911b999e 100644 --- a/keyboards/planck/info.json +++ b/keyboards/planck/info.json @@ -4,104 +4,104 @@ "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, { "w": 2, "x": 5, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "x": 7, "y": 3 }, + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 } ] }, "LAYOUT_ortho_4x12": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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 } ] } } } diff --git a/keyboards/planck/keymaps/andylikescandy/rules.mk b/keyboards/planck/keymaps/andylikescandy/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/andylikescandy/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/coloneljesus/rules.mk b/keyboards/planck/keymaps/coloneljesus/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/coloneljesus/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/jirgn/rules.mk b/keyboards/planck/keymaps/jirgn/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/jirgn/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/kelorean/rules.mk b/keyboards/planck/keymaps/kelorean/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/kelorean/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/mjt/rules.mk b/keyboards/planck/keymaps/mjt/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/mjt/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/mjtnumsym/rules.mk b/keyboards/planck/keymaps/mjtnumsym/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/mjtnumsym/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/motform/rules.mk b/keyboards/planck/keymaps/motform/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/motform/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/originerd/rules.mk b/keyboards/planck/keymaps/originerd/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/originerd/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/paget/rules.mk b/keyboards/planck/keymaps/paget/rules.mk deleted file mode 100755 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/paget/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/phreed/rules.mk b/keyboards/planck/keymaps/phreed/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/phreed/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/smt/rules.mk b/keyboards/planck/keymaps/smt/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/smt/rules.mk +++ /dev/null diff --git a/keyboards/planck/keymaps/tehwalris/rules.mk b/keyboards/planck/keymaps/tehwalris/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/keymaps/tehwalris/rules.mk +++ /dev/null diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index 50ee36da3b..418dda97da 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json @@ -24,105 +24,105 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 } + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 }, + { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 }, + { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 }, + { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 }, + { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 }, + { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 }, + { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 }, + { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 }, + { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 }, + { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 } ] }, "LAYOUT_planck_1x2uC": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 }, + { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 }, + { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 }, + { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 }, + { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 }, + { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 }, { "label": "k35", "matrix": [3, 6], "w": 2, "x": 5, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 } + { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 }, + { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 }, + { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 }, + { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 }, + { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 } ] } } diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json index 3cf2d0ca37..3b9404b401 100644 --- a/keyboards/ploopyco/trackball_thumb/info.json +++ b/keyboards/ploopyco/trackball_thumb/info.json @@ -23,12 +23,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix":[0,0], "x":0, "y":0, "h": 1}, + {"matrix":[0,0], "x":0, "y":0}, {"matrix":[0,2], "x":1, "y":0, "h":2}, {"matrix":[0,3],"x":2.5, "y":0.25, "h":1.5}, - {"matrix":[0,4],"x":4, "y":0, "h":2}, - {"matrix":[0,5],"x":5, "y":0.5, "h":1}, - {"matrix":[0,1],"x":0, "y":1, "h":1} + {"matrix":[0,4],"x":4, "y":0}, + {"matrix":[0,5],"x":5, "y":0.5}, + {"matrix":[0,1],"x":0, "y":1} ] } } diff --git a/keyboards/portal_66/soldered/info.json b/keyboards/portal_66/soldered/info.json index 3e7955e193..ba92bd8973 100644 --- a/keyboards/portal_66/soldered/info.json +++ b/keyboards/portal_66/soldered/info.json @@ -234,7 +234,7 @@ { "x":15, "y":3 }, { "x":0, "y":4, "w":1.5 }, - { "x":1.5, "y":4, "w":1 }, + { "x":1.5, "y":4 }, { "x":2.5, "y":4, "w":1.5 }, { "x":4, "y":4, "w":7 }, { "x":11, "y":4, "w":1.5 }, @@ -463,7 +463,7 @@ { "x":15, "y":3 }, { "x":0, "y":4, "w":1.5 }, - { "x":1.5, "y":4, "w":1 }, + { "x":1.5, "y":4 }, { "x":2.5, "y":4, "w":1.5 }, { "x":4, "y":4, "w":7 }, { "x":11, "y":4, "w":1.5 }, diff --git a/keyboards/preonic/keymaps/blake-newman/rules.mk b/keyboards/preonic/keymaps/blake-newman/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/blake-newman/rules.mk +++ /dev/null diff --git a/keyboards/preonic/keymaps/boy314/rules.mk b/keyboards/preonic/keymaps/boy314/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/boy314/rules.mk +++ /dev/null diff --git a/keyboards/preonic/keymaps/ekis_isa/rules.mk b/keyboards/preonic/keymaps/ekis_isa/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/ekis_isa/rules.mk +++ /dev/null diff --git a/keyboards/preonic/keymaps/fig-r/rules.mk b/keyboards/preonic/keymaps/fig-r/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/fig-r/rules.mk +++ /dev/null diff --git a/keyboards/preonic/keymaps/nikchi/rules.mk b/keyboards/preonic/keymaps/nikchi/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/nikchi/rules.mk +++ /dev/null diff --git a/keyboards/preonic/keymaps/pitty/rules.mk b/keyboards/preonic/keymaps/pitty/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/pitty/rules.mk +++ /dev/null diff --git a/keyboards/preonic/keymaps/smt/rules.mk b/keyboards/preonic/keymaps/smt/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/preonic/keymaps/smt/rules.mk +++ /dev/null diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index 8046f233e9..a392b70375 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -9,10 +9,10 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1}, - {"x":0,"y":1,"w":1.25,"h":1}, {"x":1.25,"y":1,"w":1,"h":1}, {"x":2.25,"y":1,"w":1,"h":1}, {"x":3.25,"y":1,"w":1,"h":1}, {"x":4.25,"y":1,"w":1,"h":1}, {"x":5.25,"y":1,"w":1,"h":1}, {"x":7.25,"y":1,"w":1,"h":1}, {"x":8.25,"y":1,"w":1,"h":1}, {"x":9.25,"y":1,"w":1,"h":1}, {"x":10.25,"y":1,"w":1,"h":1}, {"x":11.25,"y":1,"w":1,"h":1}, {"x":12.25,"y":1,"w":1.75,"h":1}, - {"x":0,"y":2,"w":1.75,"h":1}, {"x":1.75,"y":2,"w":1,"h":1}, {"x":2.75,"y":2,"w":1,"h":1}, {"x":3.75,"y":2,"w":1,"h":1}, {"x":4.75,"y":2,"w":1,"h":1}, {"x":5.75,"y":2,"w":1,"h":1}, {"x":6.75,"y":2,"w":1,"h":1}, {"x":7.75,"y":2,"w":1,"h":1}, {"x":8.75,"y":2,"w":1,"h":1}, {"x":9.75,"y":2,"w":1,"h":1}, {"x":10.75,"y":2,"w":1,"h":1}, {"x":11.75,"y":2,"w":1,"h":1}, {"x":12.75,"y":2,"w":1.25,"h":1}, - {"x":0,"y":3,"w":1.25,"h":1}, {"x":1.25,"y":3,"w":1.25,"h":1}, {"x":3.5,"y":3,"w":1.25,"h":1}, {"x":4.75,"y":3,"w":2,"h":1}, {"x":6.75,"y":3,"w":2.25,"h":1}, {"x":9,"y":3,"w":1.25,"h":1}, {"x":11.5,"y":3,"w":1.25,"h":1}, {"x":12.75,"y":3,"w":1.25,"h":1} + "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":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":0,"y":1,"w":1.25}, {"x":1.25,"y":1}, {"x":2.25,"y":1}, {"x":3.25,"y":1}, {"x":4.25,"y":1}, {"x":5.25,"y":1}, {"x":7.25,"y":1}, {"x":8.25,"y":1}, {"x":9.25,"y":1}, {"x":10.25,"y":1}, {"x":11.25,"y":1}, {"x":12.25,"y":1,"w":1.75}, + {"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,"w":1.25}, + {"x":0,"y":3,"w":1.25}, {"x":1.25,"y":3,"w":1.25}, {"x":3.5,"y":3,"w":1.25}, {"x":4.75,"y":3,"w":2}, {"x":6.75,"y":3,"w":2.25}, {"x":9,"y":3,"w":1.25}, {"x":11.5,"y":3,"w":1.25}, {"x":12.75,"y":3,"w":1.25} ] } } diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h index eea6fcc076..67553a4432 100644 --- a/keyboards/q4z/config.h +++ b/keyboards/q4z/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { D1, D0, D4, B6, B2, B3, B1, F7, F6, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json index aed372df94..3e000db2d2 100644 --- a/keyboards/q4z/info.json +++ b/keyboards/q4z/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["F4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h deleted file mode 100644 index eac213400a..0000000000 --- a/keyboards/qpockets/eggman/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Alan Lehners - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -#define MATRIX_ROW_PINS { C4, C5, C2, D0, B5, B6, D6 } -#define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json index 989402411d..58d2975169 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/info.json @@ -8,6 +8,11 @@ "pid": "0x656D", "device_version": "10.0.0" }, + "matrix_pins": { + "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"], + "rows": ["C4", "C5", "C2", "D0", "B5", "B6", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "C7"}, diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h index 22c2bc73de..3caf7fdbcb 100644 --- a/keyboards/qpockets/space_space/rev1/config.h +++ b/keyboards/qpockets/space_space/rev1/config.h @@ -16,14 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { F1, F4, F5, C7 } -#define MATRIX_COL_PINS \ - { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json index cd9dcb56a8..5b4806e832 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x7373", "device_version": "30.0.0" }, + "matrix_pins": { + "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"], + "rows": ["F1", "F4", "F5", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2", "resolution": 3}, diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h index 26b85360c4..53e42221c9 100644 --- a/keyboards/qpockets/space_space/rev2/config.h +++ b/keyboards/qpockets/space_space/rev2/config.h @@ -16,16 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B1, B0, D5, B6 } -#define MATRIX_COL_PINS \ - { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define RGB_DI_PIN F0 diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index 580ab0a4d5..aa99956be9 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x7373", "device_version": "30.0.2" }, + "matrix_pins": { + "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"], + "rows": ["B1", "B0", "D5", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "D7", "resolution": 3}, diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h deleted file mode 100644 index a811be9a74..0000000000 --- a/keyboards/qpockets/wanten/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2021 qpockets - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F7, B3, D5 } -#define MATRIX_COL_PINS { F4, F1, B5, B6, C6, C7, D4, E6, D2, B1, B2, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json index e35237a358..f9c2841a58 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/info.json @@ -8,6 +8,11 @@ "pid": "0x7774", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"], + "rows": ["F0", "F7", "B3", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"}, diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h index b3a4bf279e..25ceace965 100644 --- a/keyboards/quad_h/lb75/config.h +++ b/keyboards/quad_h/lb75/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D3, D5, F0, E6 } -#define MATRIX_COL_PINS { D2, D1, D0, F1, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index 386ba46067..6f6f5a598a 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D3", "D5", "F0", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h index bd74b09133..44c3746d29 100644 --- a/keyboards/quantrik/kyuu/config.h +++ b/keyboards/quantrik/kyuu/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, F0, B7, D0, D5, D3, D2, D1, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json index da19670161..ea8b3da4fa 100644 --- a/keyboards/quantrik/kyuu/info.json +++ b/keyboards/quantrik/kyuu/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "F0", "B7", "D0", "D5", "D3", "D2", "D1", "B3"], + "rows": ["B6", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h index 1ca7a35849..feb0b65458 100644 --- a/keyboards/quarkeys/z40/config.h +++ b/keyboards/quarkeys/z40/config.h @@ -14,10 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { E6, B3, C7, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B5, B4, D7, D6, D0, B1, B0 } #define RGB_DI_PIN F1 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 47 diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json index 57159669a4..fd152e4070 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/info.json @@ -8,6 +8,11 @@ "pid": "0x2801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"], + "rows": ["E6", "B3", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h index b23030ad5c..d6945273ef 100644 --- a/keyboards/quarkeys/z60/hotswap/config.h +++ b/keyboards/quarkeys/z60/hotswap/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 } - #define RGB_DI_PIN D6 #define RGBLED_NUM 80 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json index c142c01b7e..82a280e524 100644 --- a/keyboards/quarkeys/z60/hotswap/info.json +++ b/keyboards/quarkeys/z60/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x3C02", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h index a66ebdd550..4f45b2ba12 100644 --- a/keyboards/quarkeys/z60/solder/config.h +++ b/keyboards/quarkeys/z60/solder/config.h @@ -14,12 +14,6 @@ #pragma once - -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 } - #define RGB_DI_PIN D6 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json index e5ec227c7e..bf1cc9230f 100644 --- a/keyboards/quarkeys/z60/solder/info.json +++ b/keyboards/quarkeys/z60/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x3C01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h index 3e3ce2b0a2..74d8d069c7 100644 --- a/keyboards/quarkeys/z67/hotswap/config.h +++ b/keyboards/quarkeys/z67/hotswap/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 } - #define RGB_DI_PIN F0 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json index c31a37325d..0431f3bca6 100644 --- a/keyboards/quarkeys/z67/hotswap/info.json +++ b/keyboards/quarkeys/z67/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x4102", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h index 18ed997500..778fa5e07f 100644 --- a/keyboards/quarkeys/z67/solder/config.h +++ b/keyboards/quarkeys/z67/solder/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B5, B4 } - #define RGB_DI_PIN F0 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json index af8c81f9d2..d6dbb553ea 100644 --- a/keyboards/quarkeys/z67/solder/info.json +++ b/keyboards/quarkeys/z67/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x4101", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h index 830b5364a5..7ba4700cde 100644 --- a/keyboards/qvex/lynepad/config.h +++ b/keyboards/qvex/lynepad/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Basic matrix config */ -#define MATRIX_ROW_PINS { C7, F7, F6} -#define MATRIX_COL_PINS { F0, F1, F4, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* LEDs */ #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json index f2930137d2..93d2a04323 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/info.json @@ -8,6 +8,11 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5"], + "rows": ["C7", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h index 4de51720ea..a15f35c444 100644 --- a/keyboards/qwertlekeys/calice/config.h +++ b/keyboards/qwertlekeys/calice/config.h @@ -16,13 +16,6 @@ #pragma once -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3} -#define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json index 5a425f97a8..82a33a9559 100644 --- a/keyboards/qwertlekeys/calice/info.json +++ b/keyboards/qwertlekeys/calice/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "B4", "F7", "F6", "D1", "B7", "B3", "B2"], + "rows": ["F0", "F1", "F5", "F4", "C6", "C7", "B5", "B6", "D4", "D2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h index 346e51a157..916485e60b 100644 --- a/keyboards/qwertykeys/qk65/hotswap/config.h +++ b/keyboards/qwertykeys/qk65/hotswap/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index 9f7664ea51..5cfaaf5767 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x514B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h index 40eddea86f..6561379dbe 100644 --- a/keyboards/qwertykeys/qk65/solder/config.h +++ b/keyboards/qwertykeys/qk65/solder/config.h @@ -17,12 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO
\ No newline at end of file diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 0e85073f59..399126e10b 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x5153", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h index 5ea65094f9..44ad35a7ca 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -// wiring of each half -#define MATRIX_ROW_PINS { B6, B2, B3, B1 } -#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D6 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json index df34cd9fa7..ee61129722 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/info.json @@ -9,6 +9,11 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], + "rows": ["B6", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk +++ /dev/null diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk +++ /dev/null diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json index 3784c7232a..b41713f709 100644 --- a/keyboards/singa/info.json +++ b/keyboards/singa/info.json @@ -18,7 +18,7 @@ "bootloader": "bootloadhid", "layouts": { "LAYOUT": { - "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":1}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5, "w":1}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] + "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] }, "LAYOUT_wkl": { diff --git a/keyboards/singa/keymaps/amnesia0287/rules.mk b/keyboards/singa/keymaps/amnesia0287/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/singa/keymaps/amnesia0287/rules.mk +++ /dev/null diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index 723fe70fb9..dae35f1dc6 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/info.json @@ -34,7 +34,7 @@ {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5}, - {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25} + {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25} ] }, "LAYOUT_alice": { @@ -43,7 +43,7 @@ {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5}, - {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25} + {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25} ] } } diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json index 723b6c1054..31cd3640c1 100644 --- a/keyboards/spaceman/pancake/rev1/info.json +++ b/keyboards/spaceman/pancake/rev1/info.json @@ -14,104 +14,104 @@ "layouts": { "LAYOUT_planck_mit": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, { "w": 2, "x": 5, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "x": 7, "y": 3 }, + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 } ] }, "LAYOUT_ortho_4x12": { "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] + { "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": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "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 } ] } } } diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index 2e44803f32..b4c037caeb 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -61,14 +61,14 @@ {"label":"R25", "x":12, "y":2}, {"label":"R26", "x":13, "y":2}, - {"label":"L30", "x":0, "y":3, "w":1}, - {"label":"L34", "x":4, "y":3, "w":1}, + {"label":"L30", "x":0, "y":3}, + {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3, "h":2}, {"label":"L36", "x":6, "y":3, "h":2}, {"label":"R30", "x":7, "y":3, "h":2}, {"label":"R31", "x":8, "y":3, "h":2}, - {"label":"R32", "x":9, "y":3, "w":1}, - {"label":"R36", "x":13, "y":3, "w":1} + {"label":"R32", "x":9, "y":3}, + {"label":"R36", "x":13, "y":3} ] } } diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index a99be6bf29..71a30c5b32 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/info.json @@ -14,46 +14,46 @@ "layouts": { "LAYOUT_ortho_4x10": { "layout": [ - {"w":1, "x":0, "y":0}, - {"w":1, "x":1, "y":0}, - {"w":1, "x":2, "y":0}, - {"w":1, "x":3, "y":0}, - {"w":1, "x":4, "y":0}, - {"w":1, "x":5, "y":0}, - {"w":1, "x":6, "y":0}, - {"w":1, "x":7, "y":0}, - {"w":1, "x":8, "y":0}, - {"w":1, "x":9, "y":0}, - {"w":1, "x":0, "y":1}, - {"w":1, "x":1, "y":1}, - {"w":1, "x":2, "y":1}, - {"w":1, "x":3, "y":1}, - {"w":1, "x":4, "y":1}, - {"w":1, "x":5, "y":1}, - {"w":1, "x":6, "y":1}, - {"w":1, "x":7, "y":1}, - {"w":1, "x":8, "y":1}, - {"w":1, "x":9, "y":1}, - {"w":1, "x":0, "y":2}, - {"w":1, "x":1, "y":2}, - {"w":1, "x":2, "y":2}, - {"w":1, "x":3, "y":2}, - {"w":1, "x":4, "y":2}, - {"w":1, "x":5, "y":2}, - {"w":1, "x":6, "y":2}, - {"w":1, "x":7, "y":2}, - {"w":1, "x":8, "y":2}, - {"w":1, "x":9, "y":2}, - {"w":1, "x":0, "y":3}, - {"w":1, "x":1, "y":3}, - {"w":1, "x":2, "y":3}, - {"w":1, "x":3, "y":3}, - {"w":1, "x":4, "y":3}, - {"w":1, "x":5, "y":3}, - {"w":1, "x":6, "y":3}, - {"w":1, "x":7, "y":3}, - {"w":1, "x":8, "y":3}, - {"w":1, "x":9, "y":3}] + {"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":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1}, + {"x":6, "y":1}, + {"x":7, "y":1}, + {"x":8, "y":1}, + {"x":9, "y":1}, + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + {"x":4, "y":2}, + {"x":5, "y":2}, + {"x":6, "y":2}, + {"x":7, "y":2}, + {"x":8, "y":2}, + {"x":9, "y":2}, + {"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}] } } } diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json index 350202f29f..492165be2b 100755 --- a/keyboards/suavity/ehan/info.json +++ b/keyboards/suavity/ehan/info.json @@ -110,7 +110,7 @@ {"label":"Space", "x":5.25, "y":5.5, "w":2}, {"label":"Space", "x":8.25, "y":5.5, "w":3}, {"label":"ALT", "x":11.25, "y":5.5, "w":1.5}, - {"label":"GUI", "x":12.75, "y":5.5, "w":1}, + {"label":"GUI", "x":12.75, "y":5.5}, {"label":"Ctrl", "x":15, "y":5.5, "w":1.5}, {"label":"\u2190", "x":17.25, "y":5.5}, {"label":"\u2193", "x":18.25, "y":5.5}, @@ -210,7 +210,7 @@ {"label":"Space", "x":5.25, "y":5.5, "w":2}, {"label":"Space", "x":8.25, "y":5.5, "w":3}, {"label":"ALT", "x":11.25, "y":5.5, "w":1.5}, - {"label":"GUI", "x":12.75, "y":5.5, "w":1}, + {"label":"GUI", "x":12.75, "y":5.5}, {"label":"Ctrl", "x":15, "y":5.5, "w":1.5}, {"label":"\u2190", "x":17.25, "y":5.5}, {"label":"\u2193", "x":18.25, "y":5.5}, @@ -311,7 +311,7 @@ {"label":"Space", "x":5.25, "y":5.5, "w":2}, {"label":"Space", "x":8.25, "y":5.5, "w":3}, {"label":"ALT", "x":11.25, "y":5.5, "w":1.5}, - {"label":"GUI", "x":12.75, "y":5.5, "w":1}, + {"label":"GUI", "x":12.75, "y":5.5}, {"label":"Ctrl", "x":15, "y":5.5, "w":1.5}, {"label":"\u2190", "x":17.25, "y":5.5}, {"label":"\u2193", "x":18.25, "y":5.5}, diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json index 9c0b6bcf9a..86efe2239c 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/info.json @@ -20,19 +20,19 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"ANSIEnter", "x":15, "y":2, "w":1}, {"label":"ISOEnter", "x":16, "y":2, "w":1.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":1.25}, {"label":"\\|", "x":2.5, "y":3, "w":1}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}] + "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0}, {"label":"`~", "x":16.25, "y":0}, {"label":"M1", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"ANSIEnter", "x":15, "y":2}, {"label":"ISOEnter", "x":16, "y":2, "w":1.25}, {"label":"M3", "x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":1.25}, {"label":"\\|", "x":2.5, "y":3}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3}, {"label":"M4", "x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn2", "x":16.25, "y":4}] }, "LAYOUT_ansi_split_bs_rshift": { - "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}] + "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0}, {"label":"`~", "x":16.25, "y":0}, {"label":"M1", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3}, {"label":"M4", "x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn2", "x":16.25, "y":4}] }, "LAYOUT_ansi_split_bs": { - "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":2.75}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn", "x":16.25, "y":4, "w":1}] + "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0}, {"label":"`~", "x":16.25, "y":0}, {"label":"M1", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":2.75}, {"label":"M4", "x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn", "x":16.25, "y":4}] }, "LAYOUT_ansi_split_rshift": { - "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"\\|", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}] + "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"M1", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"\\|", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3}, {"label":"M4", "x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn2", "x":16.25, "y":4}] } } } diff --git a/keyboards/sx60/keymaps/amnobis/rules.mk b/keyboards/sx60/keymaps/amnobis/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/sx60/keymaps/amnobis/rules.mk +++ /dev/null diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index a1480dc5ff..d4865fa3e8 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -13,49 +13,49 @@ "layouts": { "LAYOUT_base_kit_all": { "layout": [ - {"label":"k01", "x":0, "y":0, "w":1}, + {"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0, "w":1.5}, - {"label":"k03", "x":2.5, "y":0, "w":1}, - {"label":"k04", "x":3.5, "y":0, "w":1}, - {"label":"k05", "x":4.5, "y":0, "w":1}, - {"label":"k06", "x":5.5, "y":0, "w":1}, - {"label":"k07", "x":6.5, "y":0, "w":1}, - {"label":"k08", "x":7.5, "y":0, "w":1}, - {"label":"k09", "x":8.5, "y":0, "w":1}, - {"label":"k010", "x":9.5, "y":0, "w":1}, - {"label":"k011", "x":10.5, "y":0, "w":1}, - {"label":"k012", "x":11.5, "y":0, "w":1}, - {"label":"k013", "x":12.5, "y":0, "w":1}, + {"label":"k03", "x":2.5, "y":0}, + {"label":"k04", "x":3.5, "y":0}, + {"label":"k05", "x":4.5, "y":0}, + {"label":"k06", "x":5.5, "y":0}, + {"label":"k07", "x":6.5, "y":0}, + {"label":"k08", "x":7.5, "y":0}, + {"label":"k09", "x":8.5, "y":0}, + {"label":"k010", "x":9.5, "y":0}, + {"label":"k011", "x":10.5, "y":0}, + {"label":"k012", "x":11.5, "y":0}, + {"label":"k013", "x":12.5, "y":0}, {"label":"k014", "x":13.5, "y":0, "w":1.5}, - {"label":"k11", "x":0, "y":1, "w":1}, + {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1, "w":1.75}, - {"label":"k13", "x":2.75, "y":1, "w":1}, - {"label":"k14", "x":3.75, "y":1, "w":1}, - {"label":"k15", "x":4.75, "y":1, "w":1}, - {"label":"k16", "x":5.75, "y":1, "w":1}, - {"label":"k17", "x":6.75, "y":1, "w":1}, - {"label":"k18", "x":7.75, "y":1, "w":1}, - {"label":"k19", "x":8.75, "y":1, "w":1}, - {"label":"k110", "x":9.75, "y":1, "w":1}, - {"label":"k111", "x":10.75, "y":1, "w":1}, - {"label":"k112", "x":11.75, "y":1, "w":1}, - {"label":"k113", "x":12.75, "y":1, "w":1}, + {"label":"k13", "x":2.75, "y":1}, + {"label":"k14", "x":3.75, "y":1}, + {"label":"k15", "x":4.75, "y":1}, + {"label":"k16", "x":5.75, "y":1}, + {"label":"k17", "x":6.75, "y":1}, + {"label":"k18", "x":7.75, "y":1}, + {"label":"k19", "x":8.75, "y":1}, + {"label":"k110", "x":9.75, "y":1}, + {"label":"k111", "x":10.75, "y":1}, + {"label":"k112", "x":11.75, "y":1}, + {"label":"k113", "x":12.75, "y":1}, {"label":"k114", "x":13.75, "y":1, "w":1.25}, - {"label":"k21", "x":0, "y":2, "w":1}, + {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2, "w":1.25}, - {"label":"k23", "x":2.25, "y":2, "w":1}, - {"label":"k24", "x":3.25, "y":2, "w":1}, - {"label":"k25", "x":4.25, "y":2, "w":1}, - {"label":"k26", "x":5.25, "y":2, "w":1}, - {"label":"k27", "x":6.25, "y":2, "w":1}, - {"label":"k28", "x":7.25, "y":2, "w":1}, - {"label":"k29", "x":8.25, "y":2, "w":1}, - {"label":"k210", "x":9.25, "y":2, "w":1}, - {"label":"k211", "x":10.25, "y":2, "w":1}, - {"label":"k212", "x":11.25, "y":2, "w":1}, - {"label":"k213", "x":12.25, "y":2, "w":1}, + {"label":"k23", "x":2.25, "y":2}, + {"label":"k24", "x":3.25, "y":2}, + {"label":"k25", "x":4.25, "y":2}, + {"label":"k26", "x":5.25, "y":2}, + {"label":"k27", "x":6.25, "y":2}, + {"label":"k28", "x":7.25, "y":2}, + {"label":"k29", "x":8.25, "y":2}, + {"label":"k210", "x":9.25, "y":2}, + {"label":"k211", "x":10.25, "y":2}, + {"label":"k212", "x":11.25, "y":2}, + {"label":"k213", "x":12.25, "y":2}, {"label":"k214", "x":13.25, "y":2, "w":1.75}, - {"label":"k31", "x":0, "y":3, "w":1}, + {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3, "w":1.5}, {"label":"k33", "x":2.5, "y":3, "w":1.25}, {"label":"k34", "x":3.75, "y":3, "w":1.5}, diff --git a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk +++ /dev/null diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json index e964fb2384..578ab1431b 100644 --- a/keyboards/tkc/candybar/righty/info.json +++ b/keyboards/tkc/candybar/righty/info.json @@ -16,7 +16,7 @@ {"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}] + {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}] } } } diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json index 1a93578325..95e3a411b0 100644 --- a/keyboards/tkc/candybar/righty_r3/info.json +++ b/keyboards/tkc/candybar/righty_r3/info.json @@ -16,7 +16,7 @@ {"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}] + {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}] } } } diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json index 6a7e10fad7..fb8ce09dff 100644 --- a/keyboards/tominabox1/le_chiffre/info.json +++ b/keyboards/tominabox1/le_chiffre/info.json @@ -9,7 +9,7 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0, "w":1}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, + "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"", "x":1.75, "y":3, "w":1.25}, {"label":"", "x":3, "y":3, "w":2}, {"label":"", "x":6, "y":3, "w":2}, {"label":"", "x":8, "y":3, "w":1.25}] diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json index d6b5b04b2a..5310884360 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/info.json @@ -16,7 +16,7 @@ }, "LAYOUT_33_split_space": { - "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1}, {"label":"", "x":1.65, "y":3, "w":1.25}, {"label":"", "x":2.9, "y":3, "w":2.25}, {"label":"", "x":5.15, "y":3, "w":2}, {"label":"", "x":7.15, "y":3, "w":1.25}, {"label":"", "x":8.4, "y":3, "w":1}] + "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3}, {"label":"", "x":1.65, "y":3, "w":1.25}, {"label":"", "x":2.9, "y":3, "w":2.25}, {"label":"", "x":5.15, "y":3, "w":2}, {"label":"", "x":7.15, "y":3, "w":1.25}, {"label":"", "x":8.4, "y":3}] } } } diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json index 2f194d658b..85eaa67060 100644 --- a/keyboards/tweetydabird/lbs4/info.json +++ b/keyboards/tweetydabird/lbs4/info.json @@ -65,11 +65,11 @@ "layout": [ { "label": "Play", "matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, - { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0, "w": 1, "h": 1 }, - { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, + { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "F3", "matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, - { "label": "F4", "matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 } + { "label": "F3", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "F4", "matrix": [1, 1], "x": 1, "y": 1 } ] } } diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json index a0612fabd6..18edcce9b9 100644 --- a/keyboards/tweetydabird/lbs6/info.json +++ b/keyboards/tweetydabird/lbs6/info.json @@ -62,15 +62,15 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, + { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, - { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }, - { "label": "F3", "matrix": [1, 2], "x": 2, "y": 1, "w": 1, "h": 1 }, + { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "F3", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "F4", "matrix": [2, 0], "x": 0, "y": 2, "w": 1, "h": 1 }, - { "label": "F5", "matrix": [2, 1], "x": 1, "y": 2, "w": 1, "h": 1 }, - { "label": "F6", "matrix": [2, 2], "x": 2, "y": 2, "w": 1, "h": 1 } + { "label": "F4", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "F5", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "F6", "matrix": [2, 2], "x": 2, "y": 2 } ] } } diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json index 14e833c5b2..58c5175cb2 100644 --- a/keyboards/tzarc/ghoul/info.json +++ b/keyboards/tzarc/ghoul/info.json @@ -26,47 +26,47 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "W", "matrix": [0, 4], "w": 1, "x": 1, "y": 0 }, - { "label": "E", "matrix": [1, 0], "w": 1, "x": 2, "y": 0 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 3, "y": 0 }, - { "label": "T", "matrix": [2, 0], "w": 1, "x": 4, "y": 0 }, - { "label": "kEC", "matrix": [5, 0], "w": 1, "x": 5.5, "y": 0 }, - { "label": "Y", "matrix": [2, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "U", "matrix": [3, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "I", "matrix": [3, 4], "w": 1, "x": 9, "y": 0 }, - { "label": "O", "matrix": [4, 0], "w": 1, "x": 10, "y": 0 }, - { "label": "P", "matrix": [4, 4], "w": 1, "x": 11, "y": 0 }, - { "label": "A", "matrix": [0, 1], "w": 1, "x": 0, "y": 1 }, - { "label": "S", "matrix": [0, 5], "w": 1, "x": 1, "y": 1 }, - { "label": "D", "matrix": [1, 1], "w": 1, "x": 2, "y": 1 }, - { "label": "F", "matrix": [1, 5], "w": 1, "x": 3, "y": 1 }, - { "label": "G", "matrix": [2, 1], "w": 1, "x": 4, "y": 1 }, - { "label": "H", "matrix": [2, 5], "w": 1, "x": 7, "y": 1 }, - { "label": "J", "matrix": [3, 1], "w": 1, "x": 8, "y": 1 }, - { "label": "K", "matrix": [3, 5], "w": 1, "x": 9, "y": 1 }, - { "label": "L", "matrix": [4, 1], "w": 1, "x": 10, "y": 1 }, - { "label": ";", "matrix": [4, 5], "w": 1, "x": 11, "y": 1 }, - { "label": "Z", "matrix": [0, 2], "w": 1, "x": 0, "y": 2 }, - { "label": "X", "matrix": [0, 6], "w": 1, "x": 1, "y": 2 }, - { "label": "C", "matrix": [1, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "V", "matrix": [1, 6], "w": 1, "x": 3, "y": 2 }, - { "label": "B", "matrix": [2, 2], "w": 1, "x": 4, "y": 2 }, - { "label": "N", "matrix": [2, 6], "w": 1, "x": 7, "y": 2 }, - { "label": "M", "matrix": [3, 2], "w": 1, "x": 8, "y": 2 }, - { "label": ",", "matrix": [3, 6], "w": 1, "x": 9, "y": 2 }, - { "label": ".", "matrix": [4, 2], "w": 1, "x": 10, "y": 2 }, - { "label": "/", "matrix": [4, 6], "w": 1, "x": 11, "y": 2 }, - { "label": "Ctrl", "matrix": [0, 3], "w": 1, "x": 0, "y": 3 }, - { "label": "Alt", "matrix": [0, 7], "w": 1, "x": 1, "y": 3 }, - { "label": "Super", "matrix": [1, 3], "w": 1, "x": 2, "y": 3 }, - { "label": "Lower", "matrix": [1, 7], "w": 1, "x": 3, "y": 3 }, - { "label": "Space", "matrix": [2, 3], "w": 1, "x": 4, "y": 3 }, - { "label": "Space", "matrix": [2, 7], "w": 1, "x": 7, "y": 3 }, - { "label": "Raise", "matrix": [3, 3], "w": 1, "x": 8, "y": 3 }, - { "label": "←", "matrix": [3, 7], "w": 1, "x": 9, "y": 3 }, - { "label": "↓", "matrix": [4, 3], "w": 1, "x": 10, "y": 3 }, - { "label": "↑", "matrix": [4, 7], "w": 1, "x": 11, "y": 3 } + { "label": "Q", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "W", "matrix": [0, 4], "x": 1, "y": 0 }, + { "label": "E", "matrix": [1, 0], "x": 2, "y": 0 }, + { "label": "R", "matrix": [1, 4], "x": 3, "y": 0 }, + { "label": "T", "matrix": [2, 0], "x": 4, "y": 0 }, + { "label": "kEC", "matrix": [5, 0], "x": 5.5, "y": 0 }, + { "label": "Y", "matrix": [2, 4], "x": 7, "y": 0 }, + { "label": "U", "matrix": [3, 0], "x": 8, "y": 0 }, + { "label": "I", "matrix": [3, 4], "x": 9, "y": 0 }, + { "label": "O", "matrix": [4, 0], "x": 10, "y": 0 }, + { "label": "P", "matrix": [4, 4], "x": 11, "y": 0 }, + { "label": "A", "matrix": [0, 1], "x": 0, "y": 1 }, + { "label": "S", "matrix": [0, 5], "x": 1, "y": 1 }, + { "label": "D", "matrix": [1, 1], "x": 2, "y": 1 }, + { "label": "F", "matrix": [1, 5], "x": 3, "y": 1 }, + { "label": "G", "matrix": [2, 1], "x": 4, "y": 1 }, + { "label": "H", "matrix": [2, 5], "x": 7, "y": 1 }, + { "label": "J", "matrix": [3, 1], "x": 8, "y": 1 }, + { "label": "K", "matrix": [3, 5], "x": 9, "y": 1 }, + { "label": "L", "matrix": [4, 1], "x": 10, "y": 1 }, + { "label": ";", "matrix": [4, 5], "x": 11, "y": 1 }, + { "label": "Z", "matrix": [0, 2], "x": 0, "y": 2 }, + { "label": "X", "matrix": [0, 6], "x": 1, "y": 2 }, + { "label": "C", "matrix": [1, 2], "x": 2, "y": 2 }, + { "label": "V", "matrix": [1, 6], "x": 3, "y": 2 }, + { "label": "B", "matrix": [2, 2], "x": 4, "y": 2 }, + { "label": "N", "matrix": [2, 6], "x": 7, "y": 2 }, + { "label": "M", "matrix": [3, 2], "x": 8, "y": 2 }, + { "label": ",", "matrix": [3, 6], "x": 9, "y": 2 }, + { "label": ".", "matrix": [4, 2], "x": 10, "y": 2 }, + { "label": "/", "matrix": [4, 6], "x": 11, "y": 2 }, + { "label": "Ctrl", "matrix": [0, 3], "x": 0, "y": 3 }, + { "label": "Alt", "matrix": [0, 7], "x": 1, "y": 3 }, + { "label": "Super", "matrix": [1, 3], "x": 2, "y": 3 }, + { "label": "Lower", "matrix": [1, 7], "x": 3, "y": 3 }, + { "label": "Space", "matrix": [2, 3], "x": 4, "y": 3 }, + { "label": "Space", "matrix": [2, 7], "x": 7, "y": 3 }, + { "label": "Raise", "matrix": [3, 3], "x": 8, "y": 3 }, + { "label": "←", "matrix": [3, 7], "x": 9, "y": 3 }, + { "label": "↓", "matrix": [4, 3], "x": 10, "y": 3 }, + { "label": "↑", "matrix": [4, 7], "x": 11, "y": 3 } ] } } diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h index 75551832f1..3922bd8251 100644 --- a/keyboards/ubest/vn/config.h +++ b/keyboards/ubest/vn/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, B0, B7, D0, D1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B5, B4, D7, D6, D4, D5, D3 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json index 348a51fc7a..aef7138b64 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/info.json @@ -8,6 +8,11 @@ "pid": "0x0868", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["E6", "B0", "B7", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index 3a9e21ea60..da31c3d933 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F3, F2, F1, F0, A0 } -#define MATRIX_COL_PINS { A2, A1, F5, F4, E6, E7, E5, E4, B7, D0, D1, D2, D3, D4, D5, D6, D7, B5, E0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json index fbbc15609c..a33a558b25 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/info.json @@ -8,6 +8,11 @@ "pid": "0x004E", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A2", "A1", "F5", "F4", "E6", "E7", "E5", "E4", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "E0"], + "rows": ["F3", "F2", "F1", "F0", "A0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h index dc63dc77bd..d72a8fd06d 100644 --- a/keyboards/ungodly/launch_pad/config.h +++ b/keyboards/ungodly/launch_pad/config.h @@ -15,16 +15,6 @@ */ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { D4, D6, D7, B4, B5 } -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Midi Slider */ #define SLIDER_PIN F6 #define MIDI_ADVANCED diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json index a6e12f3374..e3634bcad0 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/info.json @@ -8,6 +8,11 @@ "pid": "0x4C50", "device_version": "99.9.9" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3"], + "rows": ["D4", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B6", "resolution": 2} diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index dee9f85acc..4535371186 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index aa28ce85c8..44262e071c 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json index f1d47ef1b0..6b8a6cf9c7 100644 --- a/keyboards/unicomp/pc122/info.json +++ b/keyboards/unicomp/pc122/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/config.h b/keyboards/unicomp/pc122/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/config.h +++ b/keyboards/unicomp/pc122/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index c484553e89..7afe842b8a 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index 249b33fdd2..52d2849e8a 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h index c9a5d49447..b5ed9415d5 100644 --- a/keyboards/unikeyboard/diverge3/config.h +++ b/keyboards/unikeyboard/diverge3/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifndef SELECT_SOFT_SERIAL_SPEED #define SELECT_SOFT_SERIAL_SPEED 3 #endif diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index c2caaca881..4aac244492 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -8,6 +8,11 @@ "pid": "0x1257", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "C6", "levels": 5, diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h index 7f8054f183..78d133446e 100644 --- a/keyboards/unikeyboard/divergetm2/config.h +++ b/keyboards/unikeyboard/divergetm2/config.h @@ -17,23 +17,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json index e8a3ac1bb3..d97d10d118 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/info.json @@ -8,6 +8,11 @@ "pid": "0x1256", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h index a3a667d632..7bc78f68d6 100644 --- a/keyboards/unikeyboard/felix/config.h +++ b/keyboards/unikeyboard/felix/config.h @@ -1,22 +1,5 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B2, B3, B1, F7, F6 } -#define MATRIX_COL_PINS { B5, B4, E6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json index ee74cb134f..d3200e6ed1 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7"], + "rows": ["B2", "B3", "B1", "F7", "F6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "C6", "levels": 5 diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h index fc91f5138f..4c3789155e 100644 --- a/keyboards/unikorn/config.h +++ b/keyboards/unikorn/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 17 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json index b894a98dac..e916cc7674 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/info.json @@ -8,6 +8,11 @@ "pid": "0x556B", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h index 6e3ba625e2..ea285f4082 100644 --- a/keyboards/unison/v04/config.h +++ b/keyboards/unison/v04/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -/* NOTE: With Round-Robin matrix, set same pins for both. */ -#define MATRIX_ROW_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 } -#define MATRIX_COL_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 } - -#define DIODE_DIRECTION COL2ROW - /* Audio */ #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json index a772d344d2..f795fa1c90 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/info.json @@ -8,6 +8,11 @@ "pid": "0x176A", "device_version": "0.4.0" }, + "matrix_pins": { + "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], + "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"}, diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h index fb911ab60c..39bb20f2a8 100644 --- a/keyboards/uranuma/config.h +++ b/keyboards/uranuma/config.h @@ -1,22 +1,5 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D2, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // fix iPhone and iPad power adapter issue // iOS device need lessthan 100 #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index d8bc5b107d..5d3d081f73 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -8,6 +8,11 @@ "pid": "0x112D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h index 9677a8e262..ad29207062 100644 --- a/keyboards/utd80/config.h +++ b/keyboards/utd80/config.h @@ -15,15 +15,6 @@ */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B4, D5, D0, B2, B3, B0 } -#define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, C7, C6, D3, E6, D7, D6, D4, D2, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json index cf0b6530ad..ba8451a331 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/info.json @@ -8,6 +8,11 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D3", "E6", "D7", "D6", "D4", "D2", "D1"], + "rows": ["B4", "D5", "D0", "B2", "B3", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 241418bdb7..85be8c0232 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } - -// wiring of each half -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json index 1e5cda2b20..1bcb6ad5f8 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/v4n4g0rth0n/config.h b/keyboards/v4n4g0rth0n/config.h deleted file mode 100644 index 39af6344ef..0000000000 --- a/keyboards/v4n4g0rth0n/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 jpuerto - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/v4n4g0rth0n/v1/config.h b/keyboards/v4n4g0rth0n/v1/config.h deleted file mode 100644 index effd2268db..0000000000 --- a/keyboards/v4n4g0rth0n/v1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 jpuerto - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7} -#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, F0} diff --git a/keyboards/v4n4g0rth0n/v1/info.json b/keyboards/v4n4g0rth0n/v1/info.json index dab37baf04..769c35d8ca 100644 --- a/keyboards/v4n4g0rth0n/v1/info.json +++ b/keyboards/v4n4g0rth0n/v1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "F0"], + "rows": ["C7", "C6", "B6", "B5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/v4n4g0rth0n/v2/config.h b/keyboards/v4n4g0rth0n/v2/config.h deleted file mode 100644 index 2299b791ef..0000000000 --- a/keyboards/v4n4g0rth0n/v2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 jpuerto - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7} -#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, B0} diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json index 65be217368..6959188be9 100644 --- a/keyboards/v4n4g0rth0n/v2/info.json +++ b/keyboards/v4n4g0rth0n/v2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"], + "rows": ["C7", "C6", "B6", "B5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h index 3c76b77bce..8eafa8d7b5 100644 --- a/keyboards/v60_type_r/config.h +++ b/keyboards/v60_type_r/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json index e37ccc9543..f453fa1f5b 100644 --- a/keyboards/v60_type_r/info.json +++ b/keyboards/v60_type_r/info.json @@ -8,6 +8,11 @@ "pid": "0x0658", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "F7", "on_state": 0 diff --git a/keyboards/vagrant_10/config.h b/keyboards/vagrant_10/config.h index e96d154b66..195f3f617c 100755 --- a/keyboards/vagrant_10/config.h +++ b/keyboards/vagrant_10/config.h @@ -25,13 +25,6 @@ SOFTWARE. #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3, B2 } -#define MATRIX_COL_PINS { F4, F6, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json index 6c26013f60..56797aac22 100644 --- a/keyboards/vagrant_10/info.json +++ b/keyboards/vagrant_10/info.json @@ -8,6 +8,11 @@ "pid": "0x5E99", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F5"], + "rows": ["F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h index fc71e667b8..768474ba26 100644 --- a/keyboards/vertex/angler2/config.h +++ b/keyboards/vertex/angler2/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, B2, F0, D5, D1, D2 } -#define MATRIX_COL_PINS { F5, F6, F7, E2, C7, C6, B6, F1, B5, B4, D7, D6, D4, D3, D0, B1 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index 3716ddbede..ebb2609fcc 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -8,6 +8,11 @@ "pid": "0x408F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "E2", "C7", "C6", "B6", "F1", "B5", "B4", "D7", "D6", "D4", "D3", "D0", "B1"], + "rows": ["F4", "B2", "F0", "D5", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "scroll_lock": "B7", diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h index 633843021f..5cbee6426f 100644 --- a/keyboards/vertex/arc60/config.h +++ b/keyboards/vertex/arc60/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 } -#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 } -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json index bfb8e4fc3a..60758ac3b8 100644 --- a/keyboards/vertex/arc60/info.json +++ b/keyboards/vertex/arc60/info.json @@ -8,6 +8,11 @@ "pid": "0x8370", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"], + "rows": ["B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "on_state": 0 diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h index 1795f9b2ee..650d910089 100644 --- a/keyboards/vertex/arc60h/config.h +++ b/keyboards/vertex/arc60h/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 } -#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 } -#define DIODE_DIRECTION COL2ROW - #define LED_CAPS_LOCK_PIN C13 #define LED_PIN_ON_STATE 0 diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json index 9cd38dd907..1032b9880c 100644 --- a/keyboards/vertex/arc60h/info.json +++ b/keyboards/vertex/arc60h/info.json @@ -8,6 +8,11 @@ "pid": "0x9770", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"], + "rows": ["B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { @@ -70,11 +75,11 @@ {"x": 12.25, "y": 3, "w": 1.75 }, {"x": 14, "y": 3 }, {"x": 0, "y": 4, "w": 1.5 }, - {"x": 1.5, "y": 4, "w": 1 }, + {"x": 1.5, "y": 4 }, {"x": 2.5, "y": 4, "w": 1.5 }, {"x": 4, "y": 4, "w": 7 }, {"x": 11, "y": 4, "w": 1.5 }, - {"x": 12.5, "y": 4, "w": 1 }, + {"x": 12.5, "y": 4 }, {"x": 13.5, "y": 4, "w": 1.5 } ] } diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index 3036f0ac8f..97bd940cdc 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16, C17 -#define MATRIX_COL_PINS { C6 , C7 , C8 , C9 , A8 , B3 , B4 , A10, B5 , B8 , B9 , C13, C14, C15, A0 , A1 , A2 , A3 } - // R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { C3 , C2 , C1 , C0 , B14, A7 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json index 312f97e7f1..667798b4aa 100644 --- a/keyboards/viendi8l/info.json +++ b/keyboards/viendi8l/info.json @@ -8,6 +8,11 @@ "pid": "0x0877", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "C8", "C9", "A8", "B3", "B4", "A10", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"], + "rows": ["C3", "C2", "C1", "C0", "B14", "A7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B10", "pin_b": "B12", "resolution": 2} diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h index 9a469e7188..ada0ff6e76 100644 --- a/keyboards/viktus/at101_bh/config.h +++ b/keyboards/viktus/at101_bh/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, D4, F6, F5, F7, B6, B5, D5, C7, C6 } -#define MATRIX_COL_PINS { D1, D0, B7, B3, B2, B1, B0, E6, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json index aebfd08f0f..88b0c78b2d 100644 --- a/keyboards/viktus/at101_bh/info.json +++ b/keyboards/viktus/at101_bh/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"], + "rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h index 9a399518a1..d035c79a90 100644 --- a/keyboards/viktus/omnikey_bh/config.h +++ b/keyboards/viktus/omnikey_bh/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 } -#define MATRIX_COL_PINS { C2, C3, C4, C7, C1, C0, E1, E0, D7, F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json index e4730b2031..0e29960d94 100644 --- a/keyboards/viktus/omnikey_bh/info.json +++ b/keyboards/viktus/omnikey_bh/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"], + "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h index a4789be9b7..bb14ae71b1 100644 --- a/keyboards/viktus/smolka/config.h +++ b/keyboards/viktus/smolka/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7, C7, C6 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, D4, B1, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json index 3e38c540e6..e9727d48ff 100644 --- a/keyboards/viktus/smolka/info.json +++ b/keyboards/viktus/smolka/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D1"}, diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json index 1ac5d4802a..76cdbb7c03 100644 --- a/keyboards/viktus/sp111/info.json +++ b/keyboards/viktus/sp111/info.json @@ -16,9 +16,9 @@ {"label":"F13", "x":0, "y":0}, {"label":"F14", "x":1, "y":0}, {"label":"F15", "x":2, "y":0}, {"label":"F16", "x":3, "y":0}, {"label":"Esc", "x":4.5, "y":0}, {"label":"F1", "x":5.75, "y":0}, {"label":"F2", "x":6.75, "y":0}, {"label":"F3", "x":7.75, "y":0}, {"label":"F4", "x":8.75, "y":0}, {"label":"F5", "x":10, "y":0}, {"label":"F6", "x":11, "y":0}, {"label":"F7", "x":12.75, "y":0}, {"label":"F8", "x":13.75, "y":0}, {"label":"F9", "x":15, "y":0}, {"label":"F10", "x":16, "y":0}, {"label":"F11", "x":17, "y":0}, {"label":"F12", "x":18, "y":0}, {"label":"Prt Scn", "x":19.25, "y":0}, {"label":"Scl Lck", "x":20.5, "y":0}, {"label":"Pause", "x":21.5, "y":0}, {"label":"Num Lock", "x":0, "y":1.5}, {"label":"/", "x":1, "y":1.5}, {"label":"*", "x":2, "y":1.5}, {"label":"-", "x":3, "y":1.5}, {"label":"~", "x":4.5, "y":1.5}, {"label":"!", "x":5.5, "y":1.5}, {"label":"@", "x":6.5, "y":1.5}, {"label":"#", "x":7.5, "y":1.5}, {"label":"$", "x":8.5, "y":1.5}, {"label":"%", "x":9.5, "y":1.5}, {"label":"^", "x":10.5, "y":1.5}, {"label":"&", "x":12.25, "y":1.5}, {"label":"*", "x":13.25, "y":1.5}, {"label":"(", "x":14.25, "y":1.5}, {"label":")", "x":15.25, "y":1.5}, {"label":"_", "x":16.25, "y":1.5}, {"label":"+", "x":17.25, "y":1.5}, {"label":"Backspace", "x":18.25, "y":1.5}, {"label":"Backspace2", "x":19.25, "y":1.5}, {"label":"Home", "x":20.5, "y":1.5}, {"label":"Insert", "x":21.5, "y":1.5}, {"label":"7", "x":0, "y":2.5}, {"label":"8", "x":1, "y":2.5}, {"label":"9", "x":2, "y":2.5}, {"label":"+", "x":3, "y":2.5}, {"label":"Tab", "x":4.5, "y":2.5, "w":1.5}, {"label":"Q", "x":6, "y":2.5}, {"label":"W", "x":7, "y":2.5}, {"label":"E", "x":8, "y":2.5}, {"label":"R", "x":9, "y":2.5}, {"label":"T", "x":10, "y":2.5}, {"label":"Y", "x":11.75, "y":2.5}, {"label":"U", "x":12.75, "y":2.5}, {"label":"I", "x":13.75, "y":2.5}, {"label":"O", "x":14.75, "y":2.5}, {"label":"P", "x":15.75, "y":2.5}, {"label":"{", "x":16.75, "y":2.5}, {"label":"}", "x":17.75, "y":2.5}, {"label":"|", "x":18.75, "y":2.5, "w":1.5}, {"label":"End", "x":20.5, "y":2.5}, {"label":"Delete", "x":21.5, "y":2.5}, - {"label":"4", "x":0, "y":3.5}, {"label":"5", "x":1, "y":3.5}, {"label":"6", "x":2, "y":3.5}, {"label":"=", "x":3, "y":3.5}, {"label":"Caps Lock", "x":4.5, "y":3.5, "w":1.75}, {"label":"A", "x":6.25, "y":3.5}, {"label":"S", "x":7.25, "y":3.5}, {"label":"D", "x":8.25, "y":3.5}, {"label":"F", "x":9.25, "y":3.5}, {"label":"G", "x":10.25, "y":3.5}, {"label":"H", "x":12, "y":3.5}, {"label":"J", "x":13, "y":3.5}, {"label":"K", "x":14, "y":3.5}, {"label":"L", "x":15, "y":3.5}, {"label":":", "x":16, "y":3.5}, {"label":"\"", "x":17, "y":3.5}, {"label":"#", "x":18, "y":3.5, "w":1}, {"label":"Enter", "x":19, "y":3.5, "w":1.25}, {"label":"PgUp", "x":20.5, "y":3.5}, {"label":"PgDn", "x":21.5, "y":3.5}, - {"label":"1", "x":0, "y":4.5}, {"label":"2", "x":1, "y":4.5}, {"label":"3", "x":2, "y":4.5}, {"label":"Enter", "x":3, "y":4.5}, {"label":"Shift", "x":4.5, "y":4.5, "w":1.25}, {"label":"numbs", "x":5.75, "y":4.5, "w":1}, {"label":"Z", "x":6.75, "y":4.5}, {"label":"X", "x":7.75, "y":4.5}, {"label":"C", "x":8.75, "y":4.5}, {"label":"V", "x":9.75, "y":4.5}, {"label":"B", "x":10.75, "y":4.5}, {"label":"N", "x":12.5, "y":4.5}, {"label":"M", "x":13.5, "y":4.5}, {"label":"<", "x":14.5, "y":4.5}, {"label":">", "x":15.5, "y":4.5}, {"label":"?", "x":16.5, "y":4.5}, {"label":"Shift", "x":17.5, "y":4.5, "w":1.75}, {"label":"Fn", "x":19.25, "y":4.5}, {"label":"\u2191", "x":20.5, "y":4.75}, - {"label":"0", "x":0, "y":5.5}, {"label":"00", "x":1, "y":5.5}, {"label":".", "x":2, "y":5.5}, {"label":"..", "x":3, "y":5.5}, {"label":"Ctrl", "x":4.5, "y":5.5, "w":1.25}, {"label":"Code", "x":5.75, "y":5.5, "w":1.25}, {"label":"Alt", "x":7, "y":5.5, "w":1.25}, {"label":"Fn", "x":8.25, "y":5.5, "w":1}, {"label":"", "x":9.25, "y":5.5, "w":2.25}, {"label":"", "x":12.25, "y":5.5, "w":2.25}, {"label":"", "x":14.5, "y":5.5, "w":1}, {"label":"Alt", "x":15.5, "y":5.5, "w":1.25}, {"label":"Code", "x":16.75, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":18, "y":5.5, "w":1.25}, {"label":"\u2190", "x":19.5, "y":5.75}, {"label":"\u2193", "x":20.5, "y":5.75}, {"label":"\u2192", "x":21.5, "y":5.75} + {"label":"4", "x":0, "y":3.5}, {"label":"5", "x":1, "y":3.5}, {"label":"6", "x":2, "y":3.5}, {"label":"=", "x":3, "y":3.5}, {"label":"Caps Lock", "x":4.5, "y":3.5, "w":1.75}, {"label":"A", "x":6.25, "y":3.5}, {"label":"S", "x":7.25, "y":3.5}, {"label":"D", "x":8.25, "y":3.5}, {"label":"F", "x":9.25, "y":3.5}, {"label":"G", "x":10.25, "y":3.5}, {"label":"H", "x":12, "y":3.5}, {"label":"J", "x":13, "y":3.5}, {"label":"K", "x":14, "y":3.5}, {"label":"L", "x":15, "y":3.5}, {"label":":", "x":16, "y":3.5}, {"label":"\"", "x":17, "y":3.5}, {"label":"#", "x":18, "y":3.5}, {"label":"Enter", "x":19, "y":3.5, "w":1.25}, {"label":"PgUp", "x":20.5, "y":3.5}, {"label":"PgDn", "x":21.5, "y":3.5}, + {"label":"1", "x":0, "y":4.5}, {"label":"2", "x":1, "y":4.5}, {"label":"3", "x":2, "y":4.5}, {"label":"Enter", "x":3, "y":4.5}, {"label":"Shift", "x":4.5, "y":4.5, "w":1.25}, {"label":"numbs", "x":5.75, "y":4.5}, {"label":"Z", "x":6.75, "y":4.5}, {"label":"X", "x":7.75, "y":4.5}, {"label":"C", "x":8.75, "y":4.5}, {"label":"V", "x":9.75, "y":4.5}, {"label":"B", "x":10.75, "y":4.5}, {"label":"N", "x":12.5, "y":4.5}, {"label":"M", "x":13.5, "y":4.5}, {"label":"<", "x":14.5, "y":4.5}, {"label":">", "x":15.5, "y":4.5}, {"label":"?", "x":16.5, "y":4.5}, {"label":"Shift", "x":17.5, "y":4.5, "w":1.75}, {"label":"Fn", "x":19.25, "y":4.5}, {"label":"\u2191", "x":20.5, "y":4.75}, + {"label":"0", "x":0, "y":5.5}, {"label":"00", "x":1, "y":5.5}, {"label":".", "x":2, "y":5.5}, {"label":"..", "x":3, "y":5.5}, {"label":"Ctrl", "x":4.5, "y":5.5, "w":1.25}, {"label":"Code", "x":5.75, "y":5.5, "w":1.25}, {"label":"Alt", "x":7, "y":5.5, "w":1.25}, {"label":"Fn", "x":8.25, "y":5.5}, {"label":"", "x":9.25, "y":5.5, "w":2.25}, {"label":"", "x":12.25, "y":5.5, "w":2.25}, {"label":"", "x":14.5, "y":5.5}, {"label":"Alt", "x":15.5, "y":5.5, "w":1.25}, {"label":"Code", "x":16.75, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":18, "y":5.5, "w":1.25}, {"label":"\u2190", "x":19.5, "y":5.75}, {"label":"\u2193", "x":20.5, "y":5.75}, {"label":"\u2192", "x":21.5, "y":5.75} ] } } diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 8b7c6fdc7d..c9a1d1cca3 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -18,16 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F0, B5, B4, D7, D6 } -#define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5, NO_PIN } // no B7 on left hand -#define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 } -#define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 } - - -#define DIODE_DIRECTION COL2ROW - /* Split Defines */ #define SPLIT_USB_DETECT #define MASTER_LEFT diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index 33cc1f6dcb..6b287e9833 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -8,11 +8,24 @@ "pid": "0x534D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null], + "rows": ["F0", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F1", "resolution": 8} ] }, + "split": { + "matrix_pins": { + "right": { + "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"], + "rows": ["F0", "B5", "B4", "D7", "D6"] + } + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h index 5c8d52a18b..c0e0f2bef8 100644 --- a/keyboards/viktus/styrka/config.h +++ b/keyboards/viktus/styrka/config.h @@ -17,29 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {B11, B10, B2, B1, B0, A7, A6, A5, B13, B12} -#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, B14, B15, A8, A9} -//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1} -/* Unused pins, in the default layout, are: -EncA (B6) because it is not used in the default PCB -All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason; -B0, which is unconnected on the PCB -*/ - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json index 6bad0166c0..7e0c7c4c03 100644 --- a/keyboards/viktus/styrka/info.json +++ b/keyboards/viktus/styrka/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], + "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h index a3555ccd50..d035c79a90 100644 --- a/keyboards/viktus/z150_bh/config.h +++ b/keyboards/viktus/z150_bh/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C3, C2, C1, C0, E1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D7, E0, C7, C6, C5, C4, F0, F1, F2, F3, F4, F5, F6, F7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json index f1e68dedf1..f622120e9a 100644 --- a/keyboards/viktus/z150_bh/info.json +++ b/keyboards/viktus/z150_bh/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], + "rows": ["C3", "C2", "C1", "C0", "E1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "num_lock": "E7", diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index cea58affaa..9d63b82b19 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -23,12 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS -// wiring of each half -#define MATRIX_ROW_PINS { F5, F6, C7, F7 } -#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6} - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index e79f940440..7561cb5851 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "E2", "B6", "D7", "D6"], + "rows": ["F5", "F6", "C7", "F7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index 40f6312b47..0fa20e9c86 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -22,12 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SPLIT_HAND_PIN B4 -// wiring of each half -#define MATRIX_ROW_PINS { F5, F6, C7, F7 } -#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6} - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN F0 diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index 894043ef98..0098b22d14 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F1", "F4", "E2", "B6", "D7", "D6"], + "rows": ["F5", "F6", "C7", "F7"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "F5", "esc_output": "F1", diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json index cd9b8b4d63..0a0fefabd0 100644 --- a/keyboards/wuque/promise87/ansi/info.json +++ b/keyboards/wuque/promise87/ansi/info.json @@ -115,13 +115,13 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -213,11 +213,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -291,7 +291,7 @@ { "label": "L", "x": 9.75, "y": 3.25 }, { "label": ";", "x": 10.75, "y": 3.25 }, { "label": "'", "x": 11.75, "y": 3.25 }, - { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 }, + { "label": "\\", "x": 12.75, "y": 3.25 }, { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 }, { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 }, @@ -310,11 +310,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -406,13 +406,13 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -505,11 +505,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -602,11 +602,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -699,11 +699,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -797,11 +797,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json index 0a0e3b0bc5..eca78d19b5 100644 --- a/keyboards/wuque/promise87/wkl/info.json +++ b/keyboards/wuque/promise87/wkl/info.json @@ -114,7 +114,7 @@ { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 }, @@ -284,7 +284,7 @@ { "label": "L", "x": 9.75, "y": 3.25 }, { "label": ";", "x": 10.75, "y": 3.25 }, { "label": "'", "x": 11.75, "y": 3.25 }, - { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 }, + { "label": "\\", "x": 12.75, "y": 3.25 }, { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 }, { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 }, @@ -399,7 +399,7 @@ { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 }, diff --git a/keyboards/xiudi/xd60/info.json b/keyboards/xiudi/xd60/info.json index ce4274fc24..12787a72d7 100644 --- a/keyboards/xiudi/xd60/info.json +++ b/keyboards/xiudi/xd60/info.json @@ -30,8 +30,8 @@ {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, - {"label":"BS", "x":13, "y":0, "w":1}, - {"label":"BS", "x":14, "y":0, "w":1}, + {"label":"BS", "x":13, "y":0}, + {"label":"BS", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, @@ -74,7 +74,7 @@ {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"FN", "x":14, "y":3, "w":1}, + {"label":"FN", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, @@ -106,8 +106,8 @@ {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, - {"label":"BS", "x":13, "y":0, "w":1}, - {"label":"BS", "x":14, "y":0, "w":1}, + {"label":"BS", "x":13, "y":0}, + {"label":"BS", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, @@ -151,7 +151,7 @@ {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"FN", "x":14, "y":3, "w":1}, + {"label":"FN", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"GUI", "x":1.25, "y":4, "w":1.25}, diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk b/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk +++ /dev/null diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h index 00ddc347db..8aedbcf715 100644 --- a/keyboards/yampad/config.h +++ b/keyboards/yampad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B1, B3, B2, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Underlight configuration */ #define RGB_DI_PIN F4 #define RGBLED_NUM 9 diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json index 753c952b1d..d0e4b42329 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/info.json @@ -8,6 +8,11 @@ "pid": "0x8369", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "debounce": 2, diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index fe7045efad..22610f4518 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_COL_PINS { B5, B6, B7, B8, B9, C13, C14, B0, B1, B2, B10, B11, B12, A15, B3 } -#define MATRIX_ROW_PINS { A3, A4, A5, A7, C15 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B4 diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json index 07f7dbbe30..6178272b17 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/info.json @@ -6,6 +6,11 @@ "pid": "0xAA88", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"], + "rows": ["A3", "A4", "A5", "A7", "C15"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h deleted file mode 100644 index 328e3e3852..0000000000 --- a/keyboards/yandrstudio/eau87/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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 <http://www.gnu.org/licenses/>. - */ -#pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B11, B10, B2, B1, B0, A7, A6, A5, A3, A15, B3 } -#define MATRIX_ROW_PINS { B12, B5, B4, A4, B7, B6 } diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json index f09f55c76b..9477067805 100644 --- a/keyboards/yandrstudio/eau87/info.json +++ b/keyboards/yandrstudio/eau87/info.json @@ -6,6 +6,11 @@ "pid": "0xAAEB", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"], + "rows": ["B12", "B5", "B4", "A4", "B7", "B6"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index d1405b2bbf..878ac47bbc 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -15,12 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { B7, A6, B6, B5, B4, B3, A5, A10, B1, B0, A7, A9, B11, B10, B2, A15, B15 } -#define MATRIX_ROW_PINS { A3, B9, B8, A4, C14, C13 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A8 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index 74f5dd6e86..4865cecb0b 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -6,6 +6,11 @@ "pid": "0xAACD", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"], + "rows": ["A3", "B9", "B8", "A4", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "debounce": 8, "layouts": { "LAYOUT": { diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 79f37b9bde..0c091e17af 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -15,12 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { C13, C14, C15, A3, A4, A5, A6, B12, B13, B14, B15, A8, A9, A10, B8 } -#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11, B9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A7 diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json index 4f8105fae8..9c0195618d 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/info.json @@ -6,6 +6,11 @@ "pid": "0xAA87", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"], + "rows": ["B0", "B1", "B2", "B10", "B11", "B9"] + }, + "diode_direction": "ROW2COL", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 06de2f5680..b3bb28e7ae 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { A15, B3, B4, B6, B7, B5, C13, A5, A4, B14, B15, A8, A9, A10 } -#define MATRIX_ROW_PINS { C14, B13, B12, C15, A3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Fix VIA RGB_light */ #define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 5aa0c2ae68..c924055e4e 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -4,6 +4,11 @@ "pid": "0xAAAF", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"], + "rows": ["C14", "B13", "B12", "C15", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index a3d9bb74c5..9a23a64ae2 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_COL_PINS { B9, A3, A4, A5, A6, A7, B0, B2, B10, B11, B12, B13, B14, B15, A8 } -#define MATRIX_ROW_PINS { B3, B4, B6, B7, B8 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 15 /* RGB Matrix */ diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json index ed06374976..90ef04d125 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/info.json @@ -6,6 +6,11 @@ "pid": "0xAA83", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], + "rows": ["B3", "B4", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A9", "pin_b": "A10"} diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index d52452e0a2..84c1c2ae8f 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -15,13 +15,6 @@ */ #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_COL_PINS { B2, B10, B11, A8, A9, A10, B5, A15, B3, A2, A3, B4, A4, A5, A6 } -#define MATRIX_ROW_PINS { B0, B6, B1, B7, A1 } - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json index d48809128f..7bc7ea4142 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/info.json @@ -6,6 +6,11 @@ "pid": "0xAA8D", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"], + "rows": ["B0", "B6", "B1", "B7", "A1"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index ec02b66c19..46c0d6005d 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { B6, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4 } -#define MATRIX_ROW_PINS { A1, A3, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B5 diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json index 20a1e86cf4..5fbc7ecf33 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/info.json @@ -6,6 +6,11 @@ "pid": "0xAA0C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["A1", "A3", "A8", "A9", "A10"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_60_tsangan_split_rshift": { "layout": [ diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 2fa940c63a..66ec91c510 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -15,13 +15,5 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 } -#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* enable the nkro when using the VIA. */ #define FORCE_NKRO diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index d3c36ca852..7a4754cf29 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -4,6 +4,11 @@ "pid": "0xAAAD", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"], + "rows": ["A2", "A1", "B8", "B7", "C15"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "A15", "on_state": 0 diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index e53141a772..5e34888c14 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_COL_PINS \ - { A14, A15, B13, B14, B15, A13, A0, A1, A2, A3, A6, A7 } -#define MATRIX_ROW_PINS \ - { B9, B8, A10, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* I2C - required for custom i2c_init */ #define I2C1_SCL_PIN B6 #define I2C1_SDA_PIN B7 diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 85b39abe9b..017f4445b8 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -8,6 +8,11 @@ "pid": "0x0204", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A14", "A15", "B13", "B14", "B15", "A13", "A0", "A1", "A2", "A3", "A6", "A7"], + "rows": ["B9", "B8", "A10", "A9"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B10", "pin_b": "B12"}, diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h index a3fcde472f..305f37ad19 100644 --- a/keyboards/ydkb/chili/config.h +++ b/keyboards/ydkb/chili/config.h @@ -17,18 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right -/* Row pin configuration -*/ -#define MATRIX_ROW_PINS { F5, F4, F1, F0, E6, B0, D5, D3, D2, D1, D0 } -/* Column pin configuration - */ -#define MATRIX_COL_PINS { D4, F6, F7, C7, C6, B6, B5, B4, D7, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Underlight configuration */ #define RGB_DI_PIN B3 diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json index 1ef666e69f..2516744ef0 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F5", "F4", "F1", "F0", "E6", "B0", "D5", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h index bc86dc02e5..4ec059e4b5 100644 --- a/keyboards/ydkb/just60/config.h +++ b/keyboards/ydkb/just60/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { E2, C7, B3, B2, B1 } -#define MATRIX_COL_PINS { D6, D7, B4, B6, B5, B7, F7, F6, F5, F4, F1, F0, E6, B0 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json index 618f0d8eac..bea9152e0b 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/info.json @@ -8,6 +8,11 @@ "pid": "0x1960", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"], + "rows": ["E2", "C7", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "E2", "esc_output": "D6" diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h index 94c922931b..788e0e02fe 100644 --- a/keyboards/ydkb/yd68/config.h +++ b/keyboards/ydkb/yd68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B5, C6, C7, D7, B4 } -#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json index d8f1439a3f..7b15598735 100644 --- a/keyboards/ydkb/yd68/info.json +++ b/keyboards/ydkb/yd68/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B6", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B5", "C6", "C7", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D4", "on_state": 0 diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h index 9314f26bea..08303c4b13 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7} - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index 641fe31543..4cd6356298 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -8,6 +8,11 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B7", "B6", "B5", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 6 diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 1420387adb..782e711cfd 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index 074e6c0485..4688aee3a2 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -8,6 +8,11 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index ce2e688bd7..81bfa2e81a 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 5 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 9d1e375cd9..2a191a4a24 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -7,6 +7,11 @@ "pid": "0x5021", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12, diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 0524cfd563..cbb4974c09 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 } -#define MATRIX_COL_PINS { F5, F4, D3, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index dd4b532538..98d881cd4d 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,11 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "matrix_pins": { + "cols": ["F5", "F4", "D3", "D2"], + "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "levels": 31 diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index 3b21cea4a6..013df9fa12 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -15,23 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 92f019bacb..0bf2f4ca97 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -8,6 +8,11 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 055c93b327..034d338d35 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -13,23 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 80 diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index 8e72d4093a..a4984a81d7 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -8,6 +8,11 @@ "pid": "0x4975", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index 82d7484aa8..4b44082d9f 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index 84b42905c7..60ff8f7fe2 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -7,6 +7,11 @@ "vid": "0x594D", "pid": "0x604D" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h index d07a8917df..c55883abd3 100644 --- a/keyboards/ymdk/ym68/config.h +++ b/keyboards/ymdk/ym68/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 20 diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index 5d4d3913f8..e3ec6538f8 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -8,6 +8,11 @@ "pid": "0xD896", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5, diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h index 4c4ca90583..daf340e4b8 100644 --- a/keyboards/ymdk/ymd09/config.h +++ b/keyboards/ymdk/ymd09/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F5, F4, F1 } -#define MATRIX_COL_PINS { D6, D2, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json index 0e3aaba46b..8d456b3ab7 100644 --- a/keyboards/ymdk/ymd09/info.json +++ b/keyboards/ymdk/ymd09/info.json @@ -8,6 +8,11 @@ "pid": "0x4409", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D2", "D1"], + "rows": ["F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h index 36cbd93891..5f0ff7b52d 100644 --- a/keyboards/ymdk/ymd21/v2/config.h +++ b/keyboards/ymdk/ymd21/v2/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 } -#define MATRIX_COL_PINS { F5, F4, D3, D2 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 8 diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index 84badccc5a..11e85c1e2b 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0110", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "D3", "D2"], + "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ymdk/ymd40/air40/config.h b/keyboards/ymdk/ymd40/air40/config.h index db792118da..4fcbc8421c 100644 --- a/keyboards/ymdk/ymd40/air40/config.h +++ b/keyboards/ymdk/ymd40/air40/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, B3, B2, B1 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 51 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json index 3920ff6a29..b334b81717 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/info.json @@ -8,6 +8,11 @@ "pid": "0x0911", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h index 21a027eab4..a0b2e37f8f 100644 --- a/keyboards/ymdk/ymd40/v2/config.h +++ b/keyboards/ymdk/ymd40/v2/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, B3, B2, B1 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } - -#define DIODE_DIRECTION COL2ROW - #if defined(RGBLIGHT_ENABLE) #define RGB_DI_PIN E2 #define RGBLED_NUM 8 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 375f8c8480..37c51da1a5 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x4440", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index 90f4ffed24..dc7ebdc8bc 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index f66e1533dd..89cdd6b258 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h deleted file mode 100644 index d46c3bc010..0000000000 --- a/keyboards/ymdk/ymd75/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> -Modified 2017 Andrew Novak <ndrw.nvk@gmail.com> -Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json index 967dd3de95..e1c728c19d 100644 --- a/keyboards/ymdk/ymd75/rev1/info.json +++ b/keyboards/ymdk/ymd75/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12 diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h deleted file mode 100644 index 83e075b290..0000000000 --- a/keyboards/ymdk/ymd75/rev2/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json index 56435d5b27..8d71880689 100644 --- a/keyboards/ymdk/ymd75/rev2/info.json +++ b/keyboards/ymdk/ymd75/rev2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B7", "B6", "B5", "B4", "B3", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12 diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h index e3a31b5116..968045a7c9 100644 --- a/keyboards/ymdk/ymd75/rev3/config.h +++ b/keyboards/ymdk/ymd75/rev3/config.h @@ -1,6 +1,3 @@ #pragma once -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define DIODE_DIRECTION ROW2COL #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4 diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json index ce0db873cf..d4abcdd4e1 100644 --- a/keyboards/ymdk/ymd75/rev3/info.json +++ b/keyboards/ymdk/ymd75/rev3/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 12 diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index f4fc0a99c3..cc4cd0d147 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TOGGLE 3 #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index 7541e62019..f48314cfa5 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12, diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h index fb4155c48d..b8bcd08e27 100644 --- a/keyboards/yncognito/batpad/config.h +++ b/keyboards/yncognito/batpad/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, C7 } -#define MATRIX_COL_PINS { F1, F0, D5, D3 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json index 01d2032d2e..fa1efd40eb 100644 --- a/keyboards/yncognito/batpad/info.json +++ b/keyboards/yncognito/batpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "D5", "D3"], + "rows": ["F4", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h index 73de0d6c42..504d6ba541 100644 --- a/keyboards/yoichiro/lunakey_macro/config.h +++ b/keyboards/yoichiro/lunakey_macro/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Audio support */ #define AUDIO_PIN C6 diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json index f7d032a1d2..ef1402a41e 100644 --- a/keyboards/yoichiro/lunakey_macro/info.json +++ b/keyboards/yoichiro/lunakey_macro/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h index a4ddefb53c..b674473983 100644 --- a/keyboards/yoichiro/lunakey_mini/config.h +++ b/keyboards/yoichiro/lunakey_mini/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index 4baa40bda4..d32b1490d1 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h index 39c7907b48..c17ec90d8e 100644 --- a/keyboards/yosino58/rev1/config.h +++ b/keyboards/yosino58/rev1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index baf43c47a5..597c4a442e 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x01B8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h index a132e577bb..2b7fc4d157 100644 --- a/keyboards/yugo_m/model_m_101/config.h +++ b/keyboards/yugo_m/model_m_101/config.h @@ -18,25 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 } - - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost */ #define MATRIX_HAS_GHOST diff --git a/keyboards/yugo_m/model_m_101/info.json b/keyboards/yugo_m/model_m_101/info.json index 35162e1b71..3533bf6142 100644 --- a/keyboards/yugo_m/model_m_101/info.json +++ b/keyboards/yugo_m/model_m_101/info.json @@ -8,6 +8,11 @@ "pid": "0x8E81", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], + "rows": ["B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h index 7f1153299c..4a567f22b1 100644 --- a/keyboards/yushakobo/navpad/10/config.h +++ b/keyboards/yushakobo/navpad/10/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 9 diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h deleted file mode 100644 index 3e65349c87..0000000000 --- a/keyboards/yushakobo/navpad/10/rev0/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2021 yushakobo - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, D0 } -#define MATRIX_COL_PINS { F4, F5, F6, B2, B3, B1, F7 } diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json index 5baab67dba..76b579338c 100644 --- a/keyboards/yushakobo/navpad/10/rev0/info.json +++ b/keyboards/yushakobo/navpad/10/rev0/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.0" - } + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"], + "rows": ["D4", "C6", "D7", "E6", "B4", "D0"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h index d2e7829323..4c69a35dea 100644 --- a/keyboards/yushakobo/navpad/10/rev1/config.h +++ b/keyboards/yushakobo/navpad/10/rev1/config.h @@ -17,20 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 } -#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7 } - #ifdef RGB_DI_PIN # define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 } #endif diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json index 90ac25f360..5bf5ce1135 100644 --- a/keyboards/yushakobo/navpad/10/rev1/info.json +++ b/keyboards/yushakobo/navpad/10/rev1/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.1" - } + }, + "matrix_pins": { + "cols": ["F5", "F6", "B2", "B3", "B1", "F7"], + "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 5b0e667cc9..ae49a16f3b 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 } -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7, NO_PIN } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 } - #define EE_HANDS #ifdef RGB_DI_PIN @@ -44,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 34, 35, 36, 37, 38, 39, 40 } #endif -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 9+32 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 19b8c31efb..5bc055b381 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], + "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"} @@ -21,6 +26,12 @@ {"pin_a": "B6", "pin_b": "B5"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 3df5c25081..1e45541119 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, B3, B6 } -#define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #define RGBLED_NUM 18 diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 7d062aef16..e5eb64db84 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], + "rows": ["F4", "B3", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h index 4ca22e9b5d..4994ead6bc 100644 --- a/keyboards/yynmt/dozen0/config.h +++ b/keyboards/yynmt/dozen0/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, B5, B4, E6, D7, C6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json index b32291b052..0c73591326 100644 --- a/keyboards/yynmt/dozen0/info.json +++ b/keyboards/yynmt/dozen0/info.json @@ -8,6 +8,11 @@ "pid": "0xEA4F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h index 4d2fab5ace..e2bf97645b 100644 --- a/keyboards/yynmt/kagamidget/config.h +++ b/keyboards/yynmt/kagamidget/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D1, D0, F4, F5 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json index 7ffbddfd25..983b09aa79 100644 --- a/keyboards/yynmt/kagamidget/info.json +++ b/keyboards/yynmt/kagamidget/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D1", "D0", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h index 27ef3bfb87..0167811c6a 100644 --- a/keyboards/zfrontier/big_switch/config.h +++ b/keyboards/zfrontier/big_switch/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F0 } -#define MATRIX_COL_PINS { F1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB light config */ #define RGB_DI_PIN B6 #define RGBLED_NUM 4 diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json index aaf72f61b3..0e52f3a29d 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/info.json @@ -8,6 +8,11 @@ "pid": "0x0A01", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F1"], + "rows": ["F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ziggurat/config.h b/keyboards/ziggurat/config.h deleted file mode 100644 index e532c012ba..0000000000 --- a/keyboards/ziggurat/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 kb-elmo<mail@elmo.space> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { A2, A1, A0, F7, A3 } -#define MATRIX_COL_PINS { F6, F5, F4, F3, F2, F1, B5, B6, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/info.json index 0cd86b049c..c3a4a50326 100644 --- a/keyboards/ziggurat/info.json +++ b/keyboards/ziggurat/info.json @@ -8,6 +8,11 @@ "pid": "0x5258", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F3", "F2", "F1", "B5", "B6", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], + "rows": ["A2", "A1", "A0", "F7", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index efbdb02f81..2df5b9daaf 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 0c902f2468..70bba664ec 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h index 231ad6d92e..f6311ba013 100755 --- a/keyboards/zlant/config.h +++ b/keyboards/zlant/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, D4, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B7, D1, D2, D3, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json index e69956a96d..9bee3a5016 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"], + "rows": ["B0", "B1", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 739358f693..8437e42144 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C13, C14, A5, A4, A3 } -#define MATRIX_COL_PINS { A10, A9, A8, B12, A15, A13, A7, A2, A1, A0, F1, F0, B3, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 74bf17b603..a3693fdad2 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -8,6 +8,11 @@ "pid": "0xE600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B12", "A15", "A13", "A7", "A2", "A1", "A0", "F1", "F0", "B3", "B4", "B5"], + "rows": ["C13", "C14", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "breathing": true diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h index 7c0453e3ae..59d91c329d 100644 --- a/keyboards/ztboards/after/config.h +++ b/keyboards/ztboards/after/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, F6, F5, D5, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D7, D6, D4, C7, C6, B6, B5, B4, F7, F0, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json index 875478ec10..72f068d338 100644 --- a/keyboards/ztboards/after/info.json +++ b/keyboards/ztboards/after/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D7", "D6", "D4", "C7", "C6", "B6", "B5", "B4", "F7", "F0", "F4", "F1"], + "rows": ["B3", "F6", "F5", "D5", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0"} diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h index 58b8096ef8..59d91c329d 100644 --- a/keyboards/ztboards/noon/config.h +++ b/keyboards/ztboards/noon/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, D5, D3, B1, F0 } -#define MATRIX_COL_PINS { D2, D1, D0, D4, D6, B2, D7, B4, B6, C6, C7, F7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json index c7140de8de..9ebaedef16 100644 --- a/keyboards/ztboards/noon/info.json +++ b/keyboards/ztboards/noon/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "D4", "D6", "B2", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B5", "D5", "D3", "B1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index 2f8984f51a..cda1688944 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -15,25 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6 } -#define MATRIX_ROW_PINS { B15, B14, B13, B12 } -#define MATRIX_COL_PINS_RIGHT { B12, B13, B14, B15, A8, A9 } -#define MATRIX_ROW_PINS_RIGHT { B0, B1, B10, B11 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SPLIT_HAND_PIN B3 diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json index d8245be308..dff0282f16 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/info.json @@ -8,10 +8,21 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6"], + "rows": ["B15", "B14", "B13", "B12"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9"], + "rows": ["B0", "B1", "B10", "B11"] + } } }, "processor": "STM32F103", diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index 97b0393aab..c643ca5d31 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -15,25 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_COL_PINS { B15, B10, B0, A5, A4, A3 } -#define MATRIX_ROW_PINS { A10, A15, B3, B4 } -#define MATRIX_COL_PINS_RIGHT { B10, B15, A10, A15, B3, B4 } -#define MATRIX_ROW_PINS_RIGHT { B0, A5, A4, A3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SPLIT_HAND_PIN B9 diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index f3519b94f4..4206a3fa6e 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -8,6 +8,11 @@ "pid": "0x0048", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B10", "B0", "A5", "A4", "A3"], + "rows": ["A10", "A15", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "A2"} @@ -17,6 +22,12 @@ "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B10", "B15", "A10", "A15", "B3", "B4"], + "rows": ["B0", "A5", "A4", "A3"] + } } }, "community_layouts": ["ortho_4x12"], diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py index 83ab1d1e6d..501c41972f 100644 --- a/lib/python/qmk/c_parse.py +++ b/lib/python/qmk/c_parse.py @@ -213,10 +213,13 @@ def _coerce_led_token(_type, value): return value_map[value] -def _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position_raw, flags): +def _validate_led_config(matrix, matrix_rows, matrix_cols, matrix_indexes, position, position_raw, flags): # TODO: Improve crude parsing/validation if len(matrix) != matrix_rows and len(matrix) != (matrix_rows / 2): raise ValueError("Unable to parse g_led_config matrix data") + for index, row in enumerate(matrix): + if len(row) != matrix_cols: + raise ValueError(f"Number of columns in row {index} ({len(row)}) does not match matrix ({matrix_cols})") if len(position) != len(flags): raise ValueError(f"Number of g_led_config physical positions ({len(position)}) does not match number of flags ({len(flags)})") if len(matrix_indexes) and (max(matrix_indexes) >= len(flags)): @@ -230,13 +233,16 @@ def _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position def _parse_led_config(file, matrix_cols, matrix_rows): """Return any 'raw' led/rgb matrix config """ - matrix_raw = [] + matrix = [] position_raw = [] flags = [] found_led_config = False bracket_count = 0 section = 0 + current_row_index = 0 + current_row = [] + for _type, value in lex(_preprocess_c_file(file), CLexer()): # Assume g_led_config..stuff..; if value == 'g_led_config': @@ -250,12 +256,16 @@ def _parse_led_config(file, matrix_cols, matrix_rows): if bracket_count == 2: section += 1 elif value == '}': + if section == 1 and bracket_count == 3: + matrix.append(current_row) + current_row = [] + current_row_index += 1 bracket_count -= 1 else: # Assume any non whitespace value here is important enough to stash if _type in [Token.Literal.Number.Integer, Token.Literal.Number.Float, Token.Literal.Number.Hex, Token.Name]: if section == 1 and bracket_count == 3: - matrix_raw.append(_coerce_led_token(_type, value)) + current_row.append(_coerce_led_token(_type, value)) if section == 2 and bracket_count == 3: position_raw.append(_coerce_led_token(_type, value)) if section == 3 and bracket_count == 2: @@ -265,16 +275,15 @@ def _parse_led_config(file, matrix_cols, matrix_rows): return None # Slightly better intrim format - matrix = list(_get_chunks(matrix_raw, matrix_cols)) position = list(_get_chunks(position_raw, 2)) - matrix_indexes = list(filter(lambda x: x is not None, matrix_raw)) + matrix_indexes = list(filter(lambda x: x is not None, sum(matrix, []))) # If we have not found anything - bail with no error if not section: return None # Throw any validation errors - _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position_raw, flags) + _validate_led_config(matrix, matrix_rows, matrix_cols, matrix_indexes, position, position_raw, flags) return (matrix, position, flags) diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py index 17503bac63..3b69b17ed1 100644 --- a/lib/python/qmk/cli/generate/keycodes.py +++ b/lib/python/qmk/cli/generate/keycodes.py @@ -143,7 +143,7 @@ def generate_keycode_extras(cli): """ # Build the header file. - keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keymap.h"', '// clang-format off'] + keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keycodes.h"', '// clang-format off'] keycodes = load_spec(cli.args.version, cli.args.lang) diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk index ac842e8d62..525f177f9e 100644 --- a/platforms/chibios/flash.mk +++ b/platforms/chibios/flash.mk @@ -42,15 +42,7 @@ dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter $(call EXEC_DFU_UTIL) define EXEC_UF2_UTIL_DEPLOY - if ! $(UF2CONV) --deploy $(BUILD_DIR)/$(TARGET).uf2 2>/dev/null; then \ - printf "$(MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY)" ;\ - sleep $(BOOTLOADER_RETRY_TIME) ;\ - while ! $(UF2CONV) --deploy $(BUILD_DIR)/$(TARGET).uf2 2>/dev/null; do \ - printf "." ;\ - sleep $(BOOTLOADER_RETRY_TIME) ;\ - done ;\ - printf "\n" ;\ - fi + $(UF2CONV) --wait --deploy $(BUILD_DIR)/$(TARGET).uf2 endef # TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c index f1cb11c395..d68df3fa58 100644 --- a/quantum/bootmagic/magic.c +++ b/quantum/bootmagic/magic.c @@ -19,7 +19,7 @@ #include "matrix.h" #include "bootloader.h" #include "debug.h" -#include "keymap.h" +#include "keycode_config.h" #include "host.h" #include "action_layer.h" #include "eeconfig.h" diff --git a/quantum/command.c b/quantum/command.c index 84757b9b01..aa64b75064 100644 --- a/quantum/command.c +++ b/quantum/command.c @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "wait.h" #include "keycode.h" #include "host.h" -#include "keymap.h" #include "print.h" #include "debug.h" #include "util.h" diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c index c406be4585..90a0f20838 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "keymap.h" // to get keymaps[][][] +#include "keymap_introspection.h" // to get keymaps[][][] #include "eeprom.h" #include "progmem.h" // to read default from flash #include "quantum.h" // for send_string() diff --git a/quantum/keymap.h b/quantum/keymap.h index 0225f53362..1263ef188b 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -30,8 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum_keycodes.h" -// translates key to keycode -uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); +#include "keymap_common.h" #ifdef ENCODER_MAP_ENABLE // Ensure we have a forward declaration for the encoder map diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h new file mode 100644 index 0000000000..20e70263f3 --- /dev/null +++ b/quantum/keymap_common.h @@ -0,0 +1,9 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include <stdint.h> + +// translates key to keycode +uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h index 1bf9549c5a..6851c6b4e8 100644 --- a/quantum/keymap_extras/keymap_belgian.h +++ b/quantum/keymap_extras/keymap_belgian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h index 12026ce649..448727dece 100644 --- a/quantum/keymap_extras/keymap_bepo.h +++ b/quantum/keymap_extras/keymap_bepo.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_brazilian_abnt2.h b/quantum/keymap_extras/keymap_brazilian_abnt2.h index 70a09a52be..8fac7666c2 100644 --- a/quantum/keymap_extras/keymap_brazilian_abnt2.h +++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h index 44009f3aa2..5b9b03babb 100644 --- a/quantum/keymap_extras/keymap_canadian_multilingual.h +++ b/quantum/keymap_extras/keymap_canadian_multilingual.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h index 5cb86bf441..d63309f010 100644 --- a/quantum/keymap_extras/keymap_colemak.h +++ b/quantum/keymap_extras/keymap_colemak.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_croatian.h b/quantum/keymap_extras/keymap_croatian.h index 1115592e17..3e7c681ced 100644 --- a/quantum/keymap_extras/keymap_croatian.h +++ b/quantum/keymap_extras/keymap_croatian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h index 02692002e3..351c51ad41 100644 --- a/quantum/keymap_extras/keymap_czech.h +++ b/quantum/keymap_extras/keymap_czech.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_danish.h b/quantum/keymap_extras/keymap_danish.h index 18107ccd53..cea9444896 100644 --- a/quantum/keymap_extras/keymap_danish.h +++ b/quantum/keymap_extras/keymap_danish.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h index 5767530b3b..9205a72057 100644 --- a/quantum/keymap_extras/keymap_dvorak.h +++ b/quantum/keymap_extras/keymap_dvorak.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_dvorak_fr.h b/quantum/keymap_extras/keymap_dvorak_fr.h index 60675fbf13..b206767614 100644 --- a/quantum/keymap_extras/keymap_dvorak_fr.h +++ b/quantum/keymap_extras/keymap_dvorak_fr.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_dvorak_programmer.h b/quantum/keymap_extras/keymap_dvorak_programmer.h index 6e1ae17807..19187ed13b 100644 --- a/quantum/keymap_extras/keymap_dvorak_programmer.h +++ b/quantum/keymap_extras/keymap_dvorak_programmer.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_estonian.h b/quantum/keymap_extras/keymap_estonian.h index 462bcde429..ea9c56c12a 100644 --- a/quantum/keymap_extras/keymap_estonian.h +++ b/quantum/keymap_extras/keymap_estonian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_finnish.h b/quantum/keymap_extras/keymap_finnish.h index 7e94896e2e..c0dc1af81e 100644 --- a/quantum/keymap_extras/keymap_finnish.h +++ b/quantum/keymap_extras/keymap_finnish.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h index da9467a475..03dbb7bc40 100644 --- a/quantum/keymap_extras/keymap_french.h +++ b/quantum/keymap_extras/keymap_french.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_french_afnor.h b/quantum/keymap_extras/keymap_french_afnor.h index 259e0a30f4..869984c4d2 100644 --- a/quantum/keymap_extras/keymap_french_afnor.h +++ b/quantum/keymap_extras/keymap_french_afnor.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_french_mac_iso.h b/quantum/keymap_extras/keymap_french_mac_iso.h index 9a8ed72604..e5f7514a80 100644 --- a/quantum/keymap_extras/keymap_french_mac_iso.h +++ b/quantum/keymap_extras/keymap_french_mac_iso.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h index 251491fb81..38b0c685ba 100644 --- a/quantum/keymap_extras/keymap_german.h +++ b/quantum/keymap_extras/keymap_german.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_german_mac_iso.h b/quantum/keymap_extras/keymap_german_mac_iso.h index de7b60546b..efa9099f20 100644 --- a/quantum/keymap_extras/keymap_german_mac_iso.h +++ b/quantum/keymap_extras/keymap_german_mac_iso.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_greek.h b/quantum/keymap_extras/keymap_greek.h index b4f5b5c5b3..01779cf2e8 100644 --- a/quantum/keymap_extras/keymap_greek.h +++ b/quantum/keymap_extras/keymap_greek.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_hebrew.h b/quantum/keymap_extras/keymap_hebrew.h index 372d7f2e93..284562072d 100644 --- a/quantum/keymap_extras/keymap_hebrew.h +++ b/quantum/keymap_extras/keymap_hebrew.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h index 591d71c09c..fbc31ed155 100644 --- a/quantum/keymap_extras/keymap_hungarian.h +++ b/quantum/keymap_extras/keymap_hungarian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_icelandic.h b/quantum/keymap_extras/keymap_icelandic.h index 800899b515..3bd71c19f2 100644 --- a/quantum/keymap_extras/keymap_icelandic.h +++ b/quantum/keymap_extras/keymap_icelandic.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_irish.h b/quantum/keymap_extras/keymap_irish.h index 2cd63a48e3..6e161628c8 100644 --- a/quantum/keymap_extras/keymap_irish.h +++ b/quantum/keymap_extras/keymap_irish.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h index 95f3348f63..8092dc1301 100644 --- a/quantum/keymap_extras/keymap_italian.h +++ b/quantum/keymap_extras/keymap_italian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_italian_mac_ansi.h b/quantum/keymap_extras/keymap_italian_mac_ansi.h index 5e7e2a37e8..ae1281be26 100644 --- a/quantum/keymap_extras/keymap_italian_mac_ansi.h +++ b/quantum/keymap_extras/keymap_italian_mac_ansi.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_italian_mac_iso.h b/quantum/keymap_extras/keymap_italian_mac_iso.h index 1d30451376..f3f01839c3 100644 --- a/quantum/keymap_extras/keymap_italian_mac_iso.h +++ b/quantum/keymap_extras/keymap_italian_mac_iso.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_japanese.h b/quantum/keymap_extras/keymap_japanese.h index 286863deea..947317833e 100644 --- a/quantum/keymap_extras/keymap_japanese.h +++ b/quantum/keymap_extras/keymap_japanese.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_korean.h b/quantum/keymap_extras/keymap_korean.h index 073647de7f..440a6b3b4d 100644 --- a/quantum/keymap_extras/keymap_korean.h +++ b/quantum/keymap_extras/keymap_korean.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_latvian.h b/quantum/keymap_extras/keymap_latvian.h index e3ac1cd433..2f26b1d8af 100644 --- a/quantum/keymap_extras/keymap_latvian.h +++ b/quantum/keymap_extras/keymap_latvian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_lithuanian_azerty.h b/quantum/keymap_extras/keymap_lithuanian_azerty.h index 11de3ad030..f6dd94f0ca 100644 --- a/quantum/keymap_extras/keymap_lithuanian_azerty.h +++ b/quantum/keymap_extras/keymap_lithuanian_azerty.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_lithuanian_qwerty.h b/quantum/keymap_extras/keymap_lithuanian_qwerty.h index c27389971e..03c6b7a2af 100644 --- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h +++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h index e8352ffa08..bc9445892f 100644 --- a/quantum/keymap_extras/keymap_neo2.h +++ b/quantum/keymap_extras/keymap_neo2.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h index e336916713..6464966c71 100644 --- a/quantum/keymap_extras/keymap_nordic.h +++ b/quantum/keymap_extras/keymap_nordic.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_norman.h b/quantum/keymap_extras/keymap_norman.h index 1f773bb410..1a3a0bc53a 100644 --- a/quantum/keymap_extras/keymap_norman.h +++ b/quantum/keymap_extras/keymap_norman.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_norwegian.h b/quantum/keymap_extras/keymap_norwegian.h index 33193d6a4d..af16fec8d6 100644 --- a/quantum/keymap_extras/keymap_norwegian.h +++ b/quantum/keymap_extras/keymap_norwegian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_plover.h b/quantum/keymap_extras/keymap_plover.h index b51e44b8bb..c0e3311e90 100644 --- a/quantum/keymap_extras/keymap_plover.h +++ b/quantum/keymap_extras/keymap_plover.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_plover_dvorak.h b/quantum/keymap_extras/keymap_plover_dvorak.h index f8341f8cbc..7feb52a25c 100644 --- a/quantum/keymap_extras/keymap_plover_dvorak.h +++ b/quantum/keymap_extras/keymap_plover_dvorak.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_polish.h b/quantum/keymap_extras/keymap_polish.h index 6b37d77a0a..40870ec237 100644 --- a/quantum/keymap_extras/keymap_polish.h +++ b/quantum/keymap_extras/keymap_polish.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_portuguese.h b/quantum/keymap_extras/keymap_portuguese.h index 17da9a6c11..b4570ad922 100644 --- a/quantum/keymap_extras/keymap_portuguese.h +++ b/quantum/keymap_extras/keymap_portuguese.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_portuguese_mac_iso.h b/quantum/keymap_extras/keymap_portuguese_mac_iso.h index 3d34a39ae5..57a27d04e9 100644 --- a/quantum/keymap_extras/keymap_portuguese_mac_iso.h +++ b/quantum/keymap_extras/keymap_portuguese_mac_iso.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_romanian.h b/quantum/keymap_extras/keymap_romanian.h index fb48a0fda7..cf4c17125f 100644 --- a/quantum/keymap_extras/keymap_romanian.h +++ b/quantum/keymap_extras/keymap_romanian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_russian.h b/quantum/keymap_extras/keymap_russian.h index 3643718444..fd3a1604c8 100644 --- a/quantum/keymap_extras/keymap_russian.h +++ b/quantum/keymap_extras/keymap_russian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_serbian.h b/quantum/keymap_extras/keymap_serbian.h index dd1bda7533..732e2e939d 100644 --- a/quantum/keymap_extras/keymap_serbian.h +++ b/quantum/keymap_extras/keymap_serbian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_serbian_latin.h b/quantum/keymap_extras/keymap_serbian_latin.h index 83495b63be..5151696a10 100644 --- a/quantum/keymap_extras/keymap_serbian_latin.h +++ b/quantum/keymap_extras/keymap_serbian_latin.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_slovak.h b/quantum/keymap_extras/keymap_slovak.h index 10714f1be9..81a88fa25c 100644 --- a/quantum/keymap_extras/keymap_slovak.h +++ b/quantum/keymap_extras/keymap_slovak.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h index 30910530e0..1e17342c27 100644 --- a/quantum/keymap_extras/keymap_slovenian.h +++ b/quantum/keymap_extras/keymap_slovenian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h index cac16c08a5..bcdd5af0c2 100644 --- a/quantum/keymap_extras/keymap_spanish.h +++ b/quantum/keymap_extras/keymap_spanish.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_spanish_dvorak.h b/quantum/keymap_extras/keymap_spanish_dvorak.h index 1feab96b8c..fb033df770 100644 --- a/quantum/keymap_extras/keymap_spanish_dvorak.h +++ b/quantum/keymap_extras/keymap_spanish_dvorak.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h index 07d96b7465..852b2f7121 100644 --- a/quantum/keymap_extras/keymap_steno.h +++ b/quantum/keymap_extras/keymap_steno.h @@ -16,7 +16,7 @@ #pragma once -#include "keymap.h" +#include "keycodes.h" // List of keycodes for the steno keyboard. To prevent // errors, this must be <= 42 total entries in order to diff --git a/quantum/keymap_extras/keymap_swedish.h b/quantum/keymap_extras/keymap_swedish.h index 4cdf4879c3..acb49f7773 100644 --- a/quantum/keymap_extras/keymap_swedish.h +++ b/quantum/keymap_extras/keymap_swedish.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_swedish_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_mac_ansi.h index 9649f59dd0..ef48a9e493 100644 --- a/quantum/keymap_extras/keymap_swedish_mac_ansi.h +++ b/quantum/keymap_extras/keymap_swedish_mac_ansi.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_swedish_mac_iso.h b/quantum/keymap_extras/keymap_swedish_mac_iso.h index 068c81b020..2eaef5e60c 100644 --- a/quantum/keymap_extras/keymap_swedish_mac_iso.h +++ b/quantum/keymap_extras/keymap_swedish_mac_iso.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h index c0692ababd..d33a259023 100644 --- a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h +++ b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h index e01f0a7dc3..680bd1db9e 100644 --- a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h +++ b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_swiss_de.h b/quantum/keymap_extras/keymap_swiss_de.h index 0a6e6e4918..69bba7293e 100644 --- a/quantum/keymap_extras/keymap_swiss_de.h +++ b/quantum/keymap_extras/keymap_swiss_de.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_swiss_fr.h b/quantum/keymap_extras/keymap_swiss_fr.h index 05a4a4c279..1e2f833db1 100644 --- a/quantum/keymap_extras/keymap_swiss_fr.h +++ b/quantum/keymap_extras/keymap_swiss_fr.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_turkish_f.h b/quantum/keymap_extras/keymap_turkish_f.h index 0dfc0236e8..4fdcf3f746 100644 --- a/quantum/keymap_extras/keymap_turkish_f.h +++ b/quantum/keymap_extras/keymap_turkish_f.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_turkish_q.h b/quantum/keymap_extras/keymap_turkish_q.h index cc64300b18..5a9362acb4 100644 --- a/quantum/keymap_extras/keymap_turkish_q.h +++ b/quantum/keymap_extras/keymap_turkish_q.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h index ff6f8c9c2e..71e5f38f55 100644 --- a/quantum/keymap_extras/keymap_uk.h +++ b/quantum/keymap_extras/keymap_uk.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_ukrainian.h b/quantum/keymap_extras/keymap_ukrainian.h index b954bb2398..3f3ec4cec2 100644 --- a/quantum/keymap_extras/keymap_ukrainian.h +++ b/quantum/keymap_extras/keymap_ukrainian.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_us.h b/quantum/keymap_extras/keymap_us.h index 38df8c6336..6101c8d8ba 100644 --- a/quantum/keymap_extras/keymap_us.h +++ b/quantum/keymap_extras/keymap_us.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_us_extended.h b/quantum/keymap_extras/keymap_us_extended.h index c4f627c30d..90da98c756 100644 --- a/quantum/keymap_extras/keymap_us_extended.h +++ b/quantum/keymap_extras/keymap_us_extended.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_us_international.h b/quantum/keymap_extras/keymap_us_international.h index 1f2bc33476..bd5f21ec8c 100644 --- a/quantum/keymap_extras/keymap_us_international.h +++ b/quantum/keymap_extras/keymap_us_international.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_us_international_linux.h b/quantum/keymap_extras/keymap_us_international_linux.h index 16d072cc5b..4551cbe29f 100644 --- a/quantum/keymap_extras/keymap_us_international_linux.h +++ b/quantum/keymap_extras/keymap_us_international_linux.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_workman.h b/quantum/keymap_extras/keymap_workman.h index 5fe9d36b16..808caec054 100644 --- a/quantum/keymap_extras/keymap_workman.h +++ b/quantum/keymap_extras/keymap_workman.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_extras/keymap_workman_zxcvm.h b/quantum/keymap_extras/keymap_workman_zxcvm.h index 757f98e912..f8645ac4cf 100644 --- a/quantum/keymap_extras/keymap_workman_zxcvm.h +++ b/quantum/keymap_extras/keymap_workman_zxcvm.h @@ -24,7 +24,7 @@ *******************************************************************************/ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off // Aliases diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h index a8df3928a6..201de937cb 100644 --- a/quantum/keymap_introspection.h +++ b/quantum/keymap_introspection.h @@ -3,6 +3,7 @@ #pragma once #include <stdint.h> +#include <stdbool.h> //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Key mapping @@ -1,3 +1,7 @@ +# THIS IS THE DEVELOP BRANCH + +Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information. + # Quantum Mechanical Keyboard Firmware [](https://github.com/qmk/qmk_firmware/tags) diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 76daa625ad..72763d0bc0 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -22,7 +22,6 @@ extern "C" { #include "debug.h" #include "eeconfig.h" #include "keyboard.h" -#include "keymap.h" void set_time(uint32_t t); void advance_time(uint32_t ms); diff --git a/util/uf2conv.py b/util/uf2conv.py index 7f5645414a..52d3861cba 100755 --- a/util/uf2conv.py +++ b/util/uf2conv.py @@ -8,6 +8,7 @@ import os import os.path import argparse import json +from time import sleep UF2_MAGIC_START0 = 0x0A324655 # "UF2\n" @@ -276,23 +277,25 @@ def main(): parser = argparse.ArgumentParser(description='Convert to UF2 or flash directly.') parser.add_argument('input', metavar='INPUT', type=str, nargs='?', help='input file (HEX, BIN or UF2)') - parser.add_argument('-b' , '--base', dest='base', type=str, + parser.add_argument('-b', '--base', dest='base', type=str, default="0x2000", help='set base address of application for BIN format (default: 0x2000)') - parser.add_argument('-o' , '--output', metavar="FILE", dest='output', type=str, + parser.add_argument('-f', '--family', dest='family', type=str, + default="0x0", + help='specify familyID - number or name (default: 0x0)') + parser.add_argument('-o', '--output', metavar="FILE", dest='output', type=str, help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible') - parser.add_argument('-d' , '--device', dest="device_path", + parser.add_argument('-d', '--device', dest="device_path", help='select a device path to flash') - parser.add_argument('-l' , '--list', action='store_true', + parser.add_argument('-l', '--list', action='store_true', help='list connected devices') - parser.add_argument('-c' , '--convert', action='store_true', + parser.add_argument('-c', '--convert', action='store_true', help='do not flash, just convert') - parser.add_argument('-D' , '--deploy', action='store_true', + parser.add_argument('-D', '--deploy', action='store_true', help='just flash, do not convert') - parser.add_argument('-f' , '--family', dest='family', type=str, - default="0x0", - help='specify familyID - number or name (default: 0x0)') - parser.add_argument('-C' , '--carray', action='store_true', + parser.add_argument('-w', '--wait', action='store_true', + help='wait for device to flash') + parser.add_argument('-C', '--carray', action='store_true', help='convert binary file to a C array, not UF2') parser.add_argument('-i', '--info', action='store_true', help='display header information from UF2, do not convert') @@ -337,20 +340,23 @@ def main(): print("Converted to %s, output size: %d, start address: 0x%x" % (ext, len(outbuf), appstartaddr)) if args.convert or ext != "uf2": - drives = [] if args.output == None: args.output = "flash." + ext - else: - drives = get_drives() - if args.output: write_file(args.output, outbuf) - else: + if ext == "uf2" and not args.convert and not args.info: + drives = get_drives() if len(drives) == 0: - error("No drive to deploy.") - for d in drives: - print("Flashing %s (%s)" % (d, board_id(d))) - write_file(d + "/NEW.UF2", outbuf) + if args.wait: + print("Waiting for drive to deploy...") + while len(drives) == 0: + sleep(0.1) + drives = get_drives() + elif not args.output: + error("No drive to deploy.") + for d in drives: + print("Flashing %s (%s)" % (d, board_id(d))) + write_file(d + "/NEW.UF2", outbuf) if __name__ == "__main__": diff --git a/util/uf2families.json b/util/uf2families.json index fafae82a60..c2140fe351 100644 --- a/util/uf2families.json +++ b/util/uf2families.json @@ -77,7 +77,7 @@ { "id": "0x57755a57", "short_name": "STM32F4", - "description": "ST STM32F401" + "description": "ST STM32F4xx" }, { "id": "0x5a18069b", @@ -188,5 +188,20 @@ "id": "0x9af03e33", "short_name": "GD32VF103", "description": "GigaDevice GD32VF103" + }, + { + "id": "0x4f6ace52", + "short_name": "CSK4", + "description": "LISTENAI CSK300x/400x" + }, + { + "id": "0x6e7348a8", + "short_name": "CSK6", + "description": "LISTENAI CSK60xx" + }, + { + "id": "0x11de784a", + "short_name": "M0SENSE", + "description": "M0SENSE BL702" } -] +]
\ No newline at end of file diff --git a/util/vagrant/Dockerfile b/util/vagrant/Dockerfile deleted file mode 100644 index 951d4fc40d..0000000000 --- a/util/vagrant/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM qmkfm/qmk_cli - -# Basic upgrades; install sudo and SSH. -RUN apt-get update && apt-get install --no-install-recommends -y \ - sudo \ - openssh-server \ - && rm -rf /var/lib/apt/lists/* -RUN mkdir /var/run/sshd -RUN sed -i 's/PermitRootLogin yes/PermitRootLogin no/' /etc/ssh/sshd_config -RUN echo 'UseDNS no' >> /etc/ssh/sshd_config - -# Remove the policy file once we're finished installing software. -# This allows invoke-rc.d and friends to work as expected. -RUN rm /usr/sbin/policy-rc.d - -# Add the Vagrant user and necessary passwords. -RUN groupadd vagrant -RUN useradd -c "Vagrant" -g vagrant -d /home/vagrant -m -s /bin/bash vagrant -RUN echo 'root:vagrant' | chpasswd -RUN echo 'vagrant:vagrant' | chpasswd - -# Allow the vagrant user to use sudo without a password. -RUN echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant - -# Install Vagrant's insecure public key so provisioning and 'vagrant ssh' work. -RUN mkdir /home/vagrant/.ssh -ADD https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub /home/vagrant/.ssh/authorized_keys -RUN chmod 0600 /home/vagrant/.ssh/authorized_keys -RUN chown -R vagrant:vagrant /home/vagrant/.ssh -RUN chmod 0700 /home/vagrant/.ssh - -EXPOSE 22 -CMD ["/usr/sbin/sshd", "-D"] diff --git a/util/vagrant/readme.md b/util/vagrant/readme.md deleted file mode 100644 index a8396007ee..0000000000 --- a/util/vagrant/readme.md +++ /dev/null @@ -1,12 +0,0 @@ -# QMK Vagrant Utilities - -## Dockerfile -Vagrant-friendly `qmkfm/qmk_cli`. - -In order for the Docker provider and `vagrant ssh` to function the container has a few extra requirements. - -* vagrant user -* ssh server - * configured with expected public key -* sudo - * passwordless for vagrant user |