diff --git a/.github/labeler.yml b/.github/labeler.yml index 41b2475f678b..07a6c451cff8 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -5,6 +5,7 @@ core: - tests/**/* - util/**/* - platforms/**/* + - builddefs/**/* - Makefile - '*.mk' dependencies: diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index aeca9679cbd4..d98692e6d94a 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -21,9 +21,13 @@ jobs: container: qmkfm/qmk_cli steps: + - name: Disable safe.directory check + run : git config --global --add safe.directory '*' + - uses: actions/checkout@v3 with: submodules: recursive + - name: Install dependencies run: pip3 install -r requirements-dev.txt - name: Run tests diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index c671565a61cd..78aaae8a0eb3 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -22,6 +22,9 @@ jobs: container: qmkfm/qmk_cli steps: + - name: Disable safe.directory check + run : git config --global --add safe.directory '*' + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -32,7 +35,7 @@ jobs: - name: Get changed files id: file_changes - uses: tj-actions/changed-files@v34 + uses: tj-actions/changed-files@v35 - name: Run qmk formatters shell: 'bash {0}' diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml index 5469ab0faa1f..26e9f4edfb02 100644 --- a/.github/workflows/format_push.yml +++ b/.github/workflows/format_push.yml @@ -16,6 +16,9 @@ jobs: container: qmkfm/qmk_cli steps: + - name: Disable safe.directory check + run : git config --global --add safe.directory '*' + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 67d4093a0b19..6b4e266bdea4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,6 +15,9 @@ jobs: container: qmkfm/qmk_cli steps: + - name: Disable safe.directory check + run : git config --global --add safe.directory '*' + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -24,7 +27,7 @@ jobs: - name: Get changed files id: file_changes - uses: tj-actions/changed-files@v34 + uses: tj-actions/changed-files@v35 - name: Print info run: | diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml index ae25bc095ee9..f301000d55e9 100644 --- a/.github/workflows/regen.yml +++ b/.github/workflows/regen.yml @@ -16,6 +16,9 @@ jobs: container: qmkfm/qmk_cli steps: + - name: Disable safe.directory check + run : git config --global --add safe.directory '*' + - uses: actions/checkout@v3 - name: Run qmk generators diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml index 37b26d980c81..c56bc48a690c 100644 --- a/.github/workflows/regen_push.yml +++ b/.github/workflows/regen_push.yml @@ -16,6 +16,9 @@ jobs: container: qmkfm/qmk_cli steps: + - name: Disable safe.directory check + run : git config --global --add safe.directory '*' + - uses: actions/checkout@v3 - name: Run qmk generators diff --git a/.gitignore b/.gitignore index e36b9ae1307d..a2456aef1ba1 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 717f4ec98b10..000000000000 --- 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 :default - - Examples: - make planck/rev4:default:dfu - make planck/rev4:default - - EOT -end diff --git a/builddefs/converters.mk b/builddefs/converters.mk index 17b1c3b6ee95..a3548afd609f 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/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 49374e42a13a..db1eca3cc2cc 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -23,6 +23,7 @@ } }, "type": "object", + "not": { "required": [ "vendorId", "productId" ] }, // reject via keys... "properties": { "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"}, "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"}, diff --git a/docs/_summary.md b/docs/_summary.md index 01808bd67543..ce579cb07126 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/breaking_changes.md b/docs/breaking_changes.md index 6e0856d462f9..919c443123a3 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -34,7 +34,7 @@ The next Breaking Change is scheduled for May 28, 2023. ## What changes will be included? -To see a list of breaking changes merge candidates you can look at the [`core` label](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Acore+is%3Apr). This label is applied whenever a PR is raised or changed, but only if the PR includes changes to core areas of QMK Firmware. A PR with that label applied is not guaranteed to be merged in the current cycle. New changes might be added between now and when `develop` is closed, and it is generally the responsibility of the submitter to handle conflicts. There is also another label used by QMK Collaborators -- `breaking_change_YYYYqN` -- which signifies to maintainers that it is a strong candidate for inclusion, and should be prioritised for review. +To see a list of breaking changes merge candidates you can look at the [`core` label](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Acore+is%3Apr). This label is applied whenever a PR is raised or changed, but only if the PR includes changes to core areas of QMK Firmware. A PR with that label applied is not guaranteed to be merged in the current cycle. New changes might be added between now and when `develop` is closed, and it is generally the responsibility of the submitter to handle conflicts. There is also another label used by QMK Collaborators -- `breaking_change_YYYYqN` -- which signifies to maintainers that it is a strong candidate for inclusion, and should be prioritized for review. If you want your breaking change to be included in this round you need to create a PR and have it accepted by QMK Collaborators before `develop` closes. After `develop` closes, new submissions will be deferred to the next breaking changes cycle. @@ -127,12 +127,12 @@ This happens immediately after the previous `develop` branch is merged to `maste * Validate each submodule SHA1 matches the qmk fork, e.g. for ChibiOS: * Go to [qmk/ChibiOS](https://github.com/qmk/ChibiOS) * Compare the commit hash in the above output to the commit hash in the repository - * If there's a mismatch, that repository needs to have its `master` branch updated to match (otherwise Configurator won't work): + * If there's a mismatch, that repository needs to have its `qmk-master` branch updated to match (otherwise Configurator won't work): * `cd lib/chibios` * `git fetch --all` - * `git checkout master` + * `git checkout qmk-master` * `git reset --hard ` - * `git push origin master --force-with-lease` + * `git push origin qmk-master --force-with-lease` * Announce that both `master` and `develop` are now unlocked -- message `@Breaking Changes Updates` on `#qmk_firmware` in Discord: * `@Breaking Changes Updates -- Hey folks, develop has now been merged into master -- newest batch of changes are now available for everyone to use!` diff --git a/docs/chibios_upgrade_instructions.md b/docs/chibios_upgrade_instructions.md index 14afe2c74343..62f16d0d25f3 100644 --- a/docs/chibios_upgrade_instructions.md +++ b/docs/chibios_upgrade_instructions.md @@ -4,7 +4,7 @@ ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a bra ## Getting ChibiOS -* `svn` Initialisation: +* `svn` Initialization: * Only needed to be done once * You might need to separately install `git-svn` package in your OS's package manager * `git svn init --stdlayout --prefix='svn/' http://svn.osdn.net/svnroot/chibios/` @@ -21,7 +21,7 @@ ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a bra ## Getting ChibiOS-Contrib -* `git` Initialisation: +* `git` Initialization: * `git clone git@github.com:qmk/ChibiOS-Contrib` * `git remote add upstream https://github.com/ChibiOS/ChibiOS-Contrib` * `git checkout -b chibios-20.3.x upstream/chibios-20.3.x` @@ -57,3 +57,16 @@ ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a bra * `git commit -am 'Update ChibiOS to 99.9.9'` * `git push --set-upstream origin chibios-version-bump` * Make a PR to qmk_firmware with the new branch + +## When merging a PR containing an upgrade of ChibiOS/ChibiOS-Contrib: + +* Update the target branch if the merge target was `master`: + * `git checkout qmk-master` + * `git reset --hard develop_YYYY_qN` + * `git push origin qmk-master --force-with-lease` +* Update the target branch if the merge target was `develop`: + * `git checkout qmk-develop` + * `git reset --hard develop_YYYY_qN` + * `git push origin qmk-develop --force-with-lease` + +Note that when merging `develop` to `master`, the first workflow should still be followed. diff --git a/docs/getting_started_vagrant.md b/docs/getting_started_vagrant.md deleted file mode 100644 index b5b5ce1539db..000000000000 --- 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 8516a5eaaa01..e49853bfd435 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 0888b7f31170..000000000000 --- a/docs/ja/getting_started_vagrant.md +++ /dev/null @@ -1,61 +0,0 @@ -# Vagrant クイックスタート - - - -このプロジェクトは、プライマリオペレーティングシステムに大きな変更を加えることなくキーボードの新しいファームウェアを非常に簡単に構築することができる `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/pr_checklist.md b/docs/pr_checklist.md index 683685bda836..6fe94c0db143 100644 --- a/docs/pr_checklist.md +++ b/docs/pr_checklist.md @@ -145,7 +145,13 @@ Also, specific to ChibiOS: ## Core PRs :id=core-pr -- must now target `develop` branch, which will subsequently be merged back to `master` on the breaking changes timeline +- all core PRs must now target `develop` branch, which will subsequently be merged back to `master` on the breaking changes timeline +- as indicated above, the smallest set of changes to core components should be included in each PR + - PRs containing multiple areas of change will be asked to be split up and raised separately + - keyboard and keymap changes should only be included if they affect base keyboard builds, or the default-like `default`, `via`, `default_????` keymaps etc. + - keymap modifications for anything other than the default-like keymaps **should not be included in the initial PR** in order to simplify the review process + - the core PR submitter should submit a followup PR affecting other keymaps after initial PR merge + - large-scale refactoring or consolidation PRs that affect other keymaps (such as renaming keycodes) should always be raised separately - any new boards adding support for new hardware now requires a corresponding test board under `keyboards/handwired/onekey` - for new MCUs, a new "child" keyboard should be added that targets your newly-added MCU, so that builds can be verified - for new hardware support such as display panels, core-side matrix implementations, or other peripherals, an associated keymap should be provided diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index 354863f5075d..b5c9b3be9966 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -252,7 +252,6 @@ The following animations can be enabled: |Key |Description | |-----------------|--------------------------------------| -|`all` |Enable all additional animation modes.| |`alternating` |Enable alternating animation mode. | |`breathing` |Enable breathing animation mode. | |`christmas` |Enable christmas animation mode. | diff --git a/docs/support_deprecation_policy.md b/docs/support_deprecation_policy.md new file mode 100644 index 000000000000..f7107dfc89c2 --- /dev/null +++ b/docs/support_deprecation_policy.md @@ -0,0 +1,44 @@ +# Feature support policies + +## System Constraints + +In general, feature development is encouraged to support as many hardware configurations as possible. Depending on system constraints this may not always be achievable, and is usually bound by microcontroller flash and RAM capabilities. + +The most frequently-hit constraint is the amount of code that can be flashed onto an ATmega32U4 -- users almost always need to pick and choose included functionality due to the size constraints. + +!> [Squeezing AVR](https://docs.qmk.fm/#/squeezing_avr) has some steps that users can take in order to minimise the overall firmware size, which in some cases enables the ability for users to include other desired features. + +## Deprecation & Removal Policy + +QMK Firmware strives for innovation wherever possible. With ongoing feature development and other improvements made to the codebase, sometimes the retirement of outdated, under-utilised, or limited-value functionality is selected for deprecation and subsequent removal. + +The intent behind feature deprecation is to maintain and/or improve quality. As a result, perpetually supporting under-utilised features would negatively impact the QMK team's ability to improve other areas of QMK Firmware. + +There may be several motivations behind the deprecation or removal of functionality (keeping in mind that this list is not exhaustive): + +* Better alternatives have already been implemented +* Lack of adherence to standards +* Poor support from code owners or upstream maintainers +* Poor design +* Hardware constraints +* Minimal use within the QMK Firmware repository +* Copyright disputes +* Bit-rot + +When a feature is selected for deprecation, future changes to that area will cease to be developed by the QMK team, and Pull Requests submitted against those areas will be declined. + +?> As QMK does not gather metrics from its users, the only way the QMK team can gauge the level of usage is to refer to the main QMK Firmware repository -- searching through forks is not practical due to the sheer number of them. + +### How much advance notice will be given? + +Disregarding emergencies or other high-risk concerns, deprecation of large features or entire subsystems within QMK will be communicated on the `develop` branch at least one breaking changes cycle (3 months) before removal. Advance notice may be extended for higher impact features, and is at the discretion of the QMK team. + +Smaller features may be removed within a breaking changes cycle, and will generally be based on the level of use within the repository. Features with minimal use may be selected for removal at any time on the `develop` branch. + +Third-party software libraries leveraged by QMK are generally forked to mitigate disappearance upstream. If the upstream repository is removed, it will generally be replaced when practical, or dependent features will be removed as per the normal deprecation policy. + +### How will deprecation be communicated? + +Every breaking changes merge from `develop` into `master` is accompanied by a changelog document -- intended and completed deprecations will be communicated here. + +In addition, wherever possible warnings will be issued during firmware compilation when deprecated features are still being used. diff --git a/docs/zh-cn/_summary.md b/docs/zh-cn/_summary.md index 3baee6dc2efd..b8c26ac27535 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) - + diff --git a/docs/zh-cn/getting_started_vagrant.md b/docs/zh-cn/getting_started_vagrant.md deleted file mode 100644 index 5e5de4455267..000000000000 --- a/docs/zh-cn/getting_started_vagrant.md +++ /dev/null @@ -1,61 +0,0 @@ -# Vagrant快速上手指引 - - - -本工程包含一份 `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 cbb0b60774c8..7895f1497b0f 100644 --- a/drivers/led/aw20216.c +++ b/drivers/led/aw20216.c @@ -1,4 +1,5 @@ /* Copyright 2021 Jasper Chan + * 2023 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 702fb3c609dc..6023c08795ba 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 154f7bd442ce..6097a2f349b2 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 036f18fe6c29..244a5f192df0 100644 --- a/keyboards/0xc7/61key/config.h +++ b/keyboards/0xc7/61key/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 76b525a99e46..569a054daf0c 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 f77002e8ab7e..10b1f88216f1 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -16,26 +16,7 @@ along with this program. If not, see . */ #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 a18bd7b3136e..6f3b2d06f00b 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 594356466132..ee33867ec36b 100644 --- a/keyboards/10bleoledhub/config.h +++ b/keyboards/10bleoledhub/config.h @@ -16,12 +16,6 @@ along with this program. If not, see .*/ #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 dd106a74a50e..4f5cd9564a04 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 b58eef108562..edcad67b8697 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 07f35c734008..010a82cb5efe 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 ff5f010cbebc..1aa9d54fe1b5 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #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 98a908298946..383c7f652570 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 806f23075fb1..348604d71c07 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 57a014354459..b0ea1ed036a9 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 dfed1e4e6f17..858e5682d44a 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 42c0bc7b1294..10fb9c16742c 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 d8a63123cf8d..ecb38b92b27c 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 2fb271382ff4..0fb710fe5bb5 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 22afdb58a01f..f52fe1f836aa 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 7af70c5b75ca..ef1a458c9dbf 100644 --- a/keyboards/1upkeyboards/super16/config.h +++ b/keyboards/1upkeyboards/super16/config.h @@ -17,25 +17,6 @@ along with this program. If not, see . #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 d648c32f3e30..53648fbd0205 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 04f5fdd9793a..d3235d95ff41 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 13e2c55fa595..ee5ba391fb5f 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 02e856470252..bb68f2b5d40b 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 d5493389880e..c89680ba2d3b 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 eb8bd97b590f..0a8b6b948ee9 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 . #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 18023c847efe..cd86f9ddf8f7 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 e0799e65a120..56ba105e5dc2 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 . #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 9d70daf01ff0..c7e5658ec472 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 776f7f313871..b537056e6b3d 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 . //#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 fa41ed213fa0..5d9ec2d7d455 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 0a7e29a9a6a6..b537056e6b3d 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 . //#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 ec98ea65a9fb..3bf44bfe8f66 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 67a1b481577a..a1bbffcef40e 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 e4ab7f79a954..1421a7b1e038 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 23ccf24b8154..000000000000 --- 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 bbaa61f6ba42..bced976dd56e 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 6bb66fc39f6a..dca5d4a1ff82 100644 --- a/keyboards/3keyecosystem/2key2/config.h +++ b/keyboards/3keyecosystem/2key2/config.h @@ -16,14 +16,6 @@ along with this program. If not, see . */ #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 1da073d0fc3c..398a4d3439a5 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 86d1f0b90f16..20ecf9470808 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 d0544f9a2e2b..70a2749a65ea 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 ac308220e4b8..7caa265c1a1f 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 786483248460..eb066e591bd1 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 078344e34b62..7caa265c1a1f 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 76554d54e47a..b113485584e4 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 8fbc9ea06f28..20ecf9470808 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 a0892d2a7a23..9ddd475570a3 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 4107b379480a..20ecf9470808 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 ecc079f51bde..53cda10128f0 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 3d6c38ec80a4..627d9d6dbb4e 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 ee85708f1963..0f889aa04dd1 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 af2a983fb4c1..8b4ccf147931 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 . #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 6b847361dc91..0bec859a5a0e 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 844291c8df42..000000000000 --- 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 . - */ - -#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 4369a0410385..933c4f8616d3 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 d8f09b138835..000000000000 --- 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 . - */ - -#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 0b2db81c11eb..2296a578289d 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 2848c7a32c2b..2f4ce8ee176c 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 948ef091bd4c..d81a6b842a93 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 0a07934e7530..b9449c4714bf 100644 --- a/keyboards/40percentclub/mf68/config.h +++ b/keyboards/40percentclub/mf68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 2c8a4c92d6b1..eecade3b22e7 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/nori/config.h b/keyboards/40percentclub/nori/config.h index 6bdf5db3509c..60d3b4e42460 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 fa12a8ef03ba..97c793b06921 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/info.json b/keyboards/40percentclub/polyandry/promicro/info.json index 4369a0410385..a8169c93dd69 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/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json index 0b2db81c11eb..0a870332b2b0 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 357380e3a711..5e3bf27f3d43 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 cbaefde2bdf8..8877c314299a 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 fcf2f8ea44f2..1d951890cd15 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 0bf42f9a75e0..f4f163ccc190 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 5f20b5b97aa2..000000000000 --- 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 0ed57ce2f668..ade503696c50 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 f7ef22d986d4..d922c2e10f86 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 9932b6ec55e3..2c5c25df4b3c 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 b5602b1cc094..68928022181c 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 . */ #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 fe2e424999ee..92cd38952af4 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 b1743d0982ea..000000000000 --- 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 . -*/ -#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 8f3b5eb2bfa6..9ff31a1ee3f8 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 3d480a1e93f6..76bc9a6b4f38 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 . */ #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 8748b3248008..23c7496c60d2 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 eed3b708c4fe..6ecc98da2dbe 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 . */ #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 7ced2cf40ce5..b815c9bf4fad 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 2764861e9747..e033b1625935 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 . */ #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 07bd69f22eff..0710674dff47 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 f7ef22d986d4..d922c2e10f86 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 b6e9c37ba25d..cf8bfba55892 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 670c8132a16f..000000000000 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#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 0b98be4876a5..ea24fceea0ff 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 7c1e13ce84db..85521fa3b6f5 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 . */ #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 866ae5c1ace0..72a9ac953c51 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 689a515013a8..979a02217711 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 . */ #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 1a6937b09660..d7bceba39156 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 05e66f6a79bb..91a0e7f0cd21 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 . */ #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 7b09f0a0d3af..9648794a7d28 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 beb204bb2d4f..000000000000 --- 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 . -*/ -#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 dc3ea424bb78..84f375371d89 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 cb2e06921ae6..000000000000 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#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 8f9c34b56392..c920744d27bc 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 8b3dc4724700..063cfb1b3c03 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 . */ #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 13bffb7384ef..434b615f4a31 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 c86320801205..5656563fa1de 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 . */ #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 f6a835652f29..cc5829cb433b 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 959bd92622f0..b9a17d412870 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 . */ #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 b902a0d6cf47..645c408dcf0d 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 ba7016ab340e..f6b4b30cf5eb 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 ca440e9a76ed..862acea11524 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 8f721392c856..a5dd0856a337 100644 --- a/keyboards/9key/config.h +++ b/keyboards/9key/config.h @@ -17,17 +17,9 @@ along with this program. If not, see . #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 fa74573e3e63..e4109ef2aa91 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 132187db265d..d14c59f8a2a8 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/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json new file mode 100644 index 000000000000..8bea49066d36 --- /dev/null +++ b/keyboards/anavi/knobs3/info.json @@ -0,0 +1,76 @@ +{ + "keyboard_name": "Knobs 3", + "manufacturer": "ANAVI", + "url": "https://github.com/AnaviTechnology/anavi-knobs-3", + "maintainer": "leon-anavi", + "processor": "RP2040", + "bootloader": "rp2040", + "matrix_pins": { + "direct": [ + ["GP26", "GP29", "GP0"] + ] + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, + "rgblight": { + "pin": "GP12", + "led_count": 1, + "hue_steps": 10, + "saturation_steps": 17, + "brightness_steps": 17, + "max_brightness": 255, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP27", + "pin_b": "GP28", + "resolution": 2 + }, + { + "pin_a": "GP4", + "pin_b": "GP3", + "resolution": 2 + }, + { + "pin_a": "GP1", + "pin_b": "GP2", + "resolution": 2 + } + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label":"Mute", "x": 0, "y": 0, "matrix": [0, 0] }, + { "label":"RGB", "x": 0, "y": 1, "matrix": [0, 1] }, + { "label":"Animation", "x": 0, "y": 2, "matrix": [0, 2] } + ] + } + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x9A25", + "vid": "0xFEED" + } +} diff --git a/keyboards/anavi/knobs3/keymaps/default/keymap.c b/keyboards/anavi/knobs3/keymaps/default/keymap.c new file mode 100644 index 000000000000..e5eaa2f1e19c --- /dev/null +++ b/keyboards/anavi/knobs3/keymaps/default/keymap.c @@ -0,0 +1,10 @@ +// Copyright 2022 Leon Anavi +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_MUTE, RGB_TOG, RGB_MOD + ) +}; diff --git a/keyboards/anavi/knobs3/knobs3.c b/keyboards/anavi/knobs3/knobs3.c new file mode 100644 index 000000000000..efae0101636f --- /dev/null +++ b/keyboards/anavi/knobs3/knobs3.c @@ -0,0 +1,73 @@ +// Copyright 2022 Leon Anavi +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" +#include + +void keyboard_post_init_kb(void) { + // Enable RGB LED + setPinOutput(GP11); + writePinHigh(GP11); + rgblight_enable(); + + // Offload to the user func + keyboard_post_init_user(); +} + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (0 == index) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } else if (1 == index) { + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } else if (2 == index) { + if (clockwise) { + tap_code(KC_LEFT); + } else { + tap_code(KC_RIGHT); + } + } + return true; +} +#endif + +#ifdef OLED_ENABLE + +bool oled_task_kb(void) { + + if (!oled_task_user()) { + return false; + } + + // Host Keyboard Layer Status + oled_write_ln_P(PSTR("ANAVI Knobs 3"), false); + oled_write_ln_P(PSTR("Keymap: Default"), false); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_P(PSTR("Num Lock: "), false); + oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false); + oled_write_P(PSTR("Caps Lock: "), false); + oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false); + oled_write_P(PSTR("Scroll Lock: "), false); + oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false); +#ifdef RGBLIGHT_ENABLE + static char rgbStatusLine1[26] = {0}; + snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode()); + oled_write_ln(rgbStatusLine1, false); + static char rgbStatusLine2[26] = {0}; + snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val()); + oled_write_ln(rgbStatusLine2, false); +#endif + return false; +} +#endif diff --git a/keyboards/anavi/knobs3/mcuconf.h b/keyboards/anavi/knobs3/mcuconf.h new file mode 100644 index 000000000000..eb1c98372fba --- /dev/null +++ b/keyboards/anavi/knobs3/mcuconf.h @@ -0,0 +1,12 @@ +// Copyright 2022 Leon Anavi (@leon-anavi) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef RP_I2C_USE_I2C0 +#define RP_I2C_USE_I2C0 FALSE + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/anavi/knobs3/readme.md b/keyboards/anavi/knobs3/readme.md new file mode 100644 index 000000000000..09d80b72f4b8 --- /dev/null +++ b/keyboards/anavi/knobs3/readme.md @@ -0,0 +1,25 @@ +# ANAVI Knobs 3 + +Mini mechanical keyboard with 3 clickable rotary encoders, USB-C, RP2040 microcontroller and I2C slot for mini OLED display. + +* Keyboard Maintainer: [Leon Anavi](https://github.com/leon-anavi) +* Hardware Supported: ANAVI Knobs 3 +* Hardware Availability: [Crowd Supply](https://www.crowdsupply.com/anavi-technology/anavi-macro-pad-10), [GitHub repository](https://github.com/AnaviTechnology/anavi-knobs-3) + +Make example for this keyboard (after setting up your build environment): + + make anavi/knobs3:default + +Flashing example for this keyboard: + + make anavi/knobs3:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key on the left half, or top right key on the right half, and then plug in the USB cable on that keyboard half. +* **Physical reset button**: Double tap the reset button on the XIAO RP2040. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk new file mode 100644 index 000000000000..ed8acbe4ac10 --- /dev/null +++ b/keyboards/anavi/knobs3/rules.mk @@ -0,0 +1,6 @@ +WS2812_DRIVER = vendor + +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C + +OPT_DEFS += -DHAL_USE_I2C=TRUE diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json index 8e5e511aa2f3..49af28517727 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/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h index cb11ea2748ad..07c4bfc008e2 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h @@ -37,6 +37,9 @@ # undef POINTING_DEVICE_CS_PIN # define POINTING_DEVICE_CS_PIN A15 // b14 # define PMW33XX_LIFTOFF_DISTANCE 0b1111 + +# define RGB_MATRIX_LED_FLUSH_LIMIT 33 +# define RGB_MATRIX_LED_PROCESS_LIMIT 29 #endif #undef ROTATIONAL_TRANSFORM_ANGLE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c index 50a05e1b3573..85bb2bc77fc5 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c @@ -16,6 +16,7 @@ */ #include "drashna.h" +// clang-format off #define LAYOUT_charybdis_4x6_wrapper(...) LAYOUT_charybdis_4x6(__VA_ARGS__) #define LAYOUT_charybdis_4x6_base( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ @@ -26,14 +27,13 @@ KC_ESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, UC_CLUE, \ SH_TT, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, SH_TT, \ LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \ - OS_LSFT,CTL_T(K21), K22, K23, K24, K25, K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \ + OS_LSFT,CTL_T(K21),ALT_T(K22),GUI_T(K23),K24,K25, K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \ SFT_T(KC_GRV), OS_LALT, OS_LGUI, TT(_MOUSE), KC_ENT, \ KC_SPC, BK_LWER, DL_RAIS \ ) #define LAYOUT_base_wrapper(...) LAYOUT_charybdis_4x6_base(__VA_ARGS__) -// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper( _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, @@ -120,13 +120,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on - void keyboard_post_init_keymap(void) { #ifdef RGB_MATRIX_ENABLE - g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] = - g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] = - g_led_config.flags[29] = g_led_config.flags[30] = g_led_config.flags[31] = g_led_config.flags[32] = - LED_FLAG_MODIFIER; + g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] = g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] = g_led_config.flags[29] = g_led_config.flags[30] = g_led_config.flags[31] = g_led_config.flags[32] = LED_FLAG_MODIFIER; #endif } @@ -171,8 +167,8 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}}, {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}}, {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}}, - {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}, {2, 4}}, - }; + {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}, {2, 4}} +}; # ifdef ENCODER_MAP_ENABLE const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0}; diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk index 12e9cecda045..0b7759f1569b 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk @@ -37,8 +37,7 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes) NKRO_ENABLE = yes # Enable N-Key Rollover RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - KEYBOARD_SHARED_EP = yes - MOUSE_SHARED_EP = yes + MOUSE_SHARED_EP = no AUTOCORRECT_ENABLE = yes CAPS_WORD_ENABLE = yes diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c index d4aa71440d04..d80d00679662 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c @@ -133,14 +133,24 @@ bool oled_task_keymap(void) { // render_rgb_hsv(1, 13); oled_set_cursor(1, 13); - // oled_write_P(PSTR("Timer:"), false); - // oled_write(get_u8_str((uint8_t)(timer_elapsed32(oled_timer) / 1000), ' '), false); - oled_write_P(PSTR("Status: "), false); - if (is_oled_enabled) { - oled_write_P(PSTR("on "), false); - } else { - oled_write_P(PSTR("off"), false); - } + oled_write_P(PSTR("OS: "), false); + extern os_variant_t os_type; + switch (os_type) { + case OS_LINUX: + oled_write_ln_P(PSTR("Linux"), false); + break; + case OS_WINDOWS: + oled_write_ln_P(PSTR("Windows"), false); + break; + case OS_MACOS: + oled_write_ln_P(PSTR("MacOS"), false); + break; + case OS_IOS: + oled_write_ln_P(PSTR("iOS"), false); + break; + default: + break; + } render_keylogger_status(1, 14); diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h similarity index 59% rename from keyboards/40percentclub/polyandry/teensy2/config.h rename to keyboards/boardsource/lulu/keymaps/davidrambo/config.h index 8eaeb3167abd..8728002a3976 100644 --- a/keyboards/40percentclub/polyandry/teensy2/config.h +++ b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h @@ -1,4 +1,5 @@ -/* Copyright 2021 +/* Copyright 2022 Cole Smith + * Copyright 2022 David Rambo * * 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 @@ -16,15 +17,15 @@ #pragma once +#define MASTER_RIGHT +#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD +#define CAPS_WORD_IDLE_TIMEOUT 3000 // 3 seconds. -/* key matrix pins */ +#define TAPPING_TERM 210 +/*#define PERMISSIVE_HOLD*/ +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD -// 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 +#ifdef RGB_MATRIX_ENABLE + #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +#endif diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c b/keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c new file mode 100644 index 000000000000..8e5b56b943d9 --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c @@ -0,0 +1,201 @@ +/* Copyright 2022 Cole Smith + * Copyright 2022 David Rambo + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +enum custom_layers { + _COLEMAK, + _GAME, + _SYMBOL, + _NAVIGATION, + _FKEYS, +}; + +//keycode shorthands +#define SYM MO(2) +#define NAV LT(3, KC_ESC) +#define FKEY MO(4) + +//aliases for clarity in layering +#define SftEnt SFT_T(KC_ENT) // Shift when held, Enter when tapped +#define BSCTL LCTL_T(KC_BSPC) // Ctrl when held, Backspace when tapped + +//aliases for clarity in layering +#define C_TAB LCTL(KC_TAB) +#define A_TAB LALT(KC_TAB) +#define G_TAB LGUI(KC_TAB) // Mac: switch applications + +#define CBSPC LCTL(KC_BSPC) // delete whole word +#define G_LEFT LGUI(KC_LEFT) +#define G_RGHT LGUI(KC_RGHT) +#define CRGHT LCTL(KC_RGHT) +#define CLEFT LCTL(KC_LEFT) + +// Left-hand home row mods +#define HOME_A LALT_T(KC_A) +#define HOME_R LGUI_T(KC_R) +#define HOME_S LSFT_T(KC_S) +#define HOME_T LCTL_T(KC_T) + +// Right-hand home row mods +#define HOME_N RCTL_T(KC_N) +#define HOME_E RSFT_T(KC_E) +#define HOME_I LGUI_T(KC_I) +#define HOME_O LALT_T(KC_O) + +//internet browser tab shortcuts and window swapping +#define CTLPGDN LCTL(KC_PGDN) +#define CTLPGUP LCTL(KC_PGUP) + +#define G_GRV LGUI(KC_GRV) +#define SftEnt SFT_T(KC_ENT) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | `~ | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | = | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | F | P | G | | J | L | U | Y | : | BSP | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |EscNAV| A | R | S | T | D |-------. ,-------| H | N | E | I | O | ' | + * |------+------+------+------+------+------| NO | | NO |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / |EntSft| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Del | LGUI | LALT | /LCTL/BS/ \Space \ | SYM | FKEY | RALT | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + + [_COLEMAK] = LAYOUT( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, + NAV, HOME_A, HOME_R, HOME_S, HOME_T, KC_D, KC_H, HOME_N, HOME_E, HOME_I, HOME_O, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_NO, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SftEnt, + MEH_T(KC_DEL), KC_LALT, KC_LGUI, BSCTL, KC_SPC, SYM, FKEY, KC_RALT +), + +/* Gaming Layer + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | T | Q | W | E | R | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | TAB | LSFT | S | A | D | F |-------. ,-------| | | | | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | LALT | LCTL | Z | X | C | V |-------| |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + +[_GAME] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0), + KC_ESC , KC_T , KC_Q , KC_W , KC_E , KC_R , _______, _______, _______, _______, _______, _______, + KC_TAB , KC_LSFT, KC_A , KC_S , KC_D , KC_F , _______, _______, _______, _______, _______, _______, + KC_LALT, KC_LCTL, KC_Z , KC_X , KC_C , KC_V , _______, _______, _______, _______, _______, _______, _______, _______, + KC_M, KC_I, KC_B, KC_SPC , _______, _______, _______, _______ +), + +/* Symbol Layer + * ,-----------------------------------------. ,-----------------------------------------. + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | [ | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ] | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | \| | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | HOME | END | [ | ] | |-------| |-------| `~ | _ | PGUP | { | } | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | ____ | ____ | ____ | / ____ / \ ____ \ |RAISE | PGDN | ____ | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +[_SYMBOL] = LAYOUT( + KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , + KC_LBRC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_RBRC, + KC_BSLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL , + _______, KC_HOME, KC_END , KC_LBRC, KC_RBRC, _______, _______, _______, KC_GRV , KC_MINS, KC_PGUP, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_PGDN, _______ +), +/* Navigation + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | | | UP | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | |-------. ,-------| | LEFT | DOWN |RIGHT | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + +[_NAVIGATION] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_BTN2, KC_MS_U, KC_BTN1, _______, C_TAB , CLEFT , KC_UP , CRGHT , KC_DEL , _______, + _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______, + _______, _______, _______, KC_WH_U, KC_WH_D, _______, _______, _______, A_TAB , CBSPC , _______, _______, G_GRV , _______, + _______, _______, _______, _______, _______, _______, _______, _______ +), +/* Function Keys + * ,-----------------------------------------. ,-----------------------------------------. + * | BOOT | | | | | | | LALT<-->LGUI| | | | BOOT | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | |BRGHT-| SAT- | HUE- |BRGHT+| | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | |RGBMOD| SAT+ | HUE+ |RGBTOG|-------. ,-------| | | | | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | | |VOL UP|VOL DN| PLAY | |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + +[_FKEYS] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, LAG_SWP, LAG_NRM, _______, _______, _______, QK_BOOT, + _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_VAI, _______, _______, _______, _______, _______, TO(1) , + _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, RGB_TOG, _______, _______, _______, _______, _______, TO(0) , + _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ +) +}; + +#ifdef ENCODER_ENABLE +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + // Volume control + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } else if (index == 1) { + // Page up/Page down + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } + return false; +} +#endif diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/readme.org b/keyboards/boardsource/lulu/keymaps/davidrambo/readme.org new file mode 100644 index 000000000000..11ac7db365fa --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/davidrambo/readme.org @@ -0,0 +1,12 @@ +#+title: README + +This is my configuration for the Lulu received as part of Boardsource's 2022 group buy. +Since I already have a few keyboards configured with QMK, I decided to swap out KMK. +Hopefully this helps others get started. + +The base layer is colemak. + +I use this keymap on both Linux and MacOS. +To keep muscle memory between the two as similar as possible, it takes advantage of QMK's boot magic keycodes. +The ~_FKEYS~ layer provides access to a Left Alt and GUI switch. +(I use LAlt with yabai on MacOS and GUI with Pop OS's tiling.) diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk b/keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk new file mode 100644 index 000000000000..f7aa3b0bf762 --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk @@ -0,0 +1,2 @@ +CAPS_WORD_ENABLE = yes +MOUSEKEY_ENABLE = yes diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c index fff0c10ef633..c894d18602ce 100644 --- a/keyboards/capsunlocked/cu75/cu75.c +++ b/keyboards/capsunlocked/cu75/cu75.c @@ -2,7 +2,6 @@ #include #include #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 09bf2e334cb7..4f652bf86bdf 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 0c71c940c1f1..4e2cfafff520 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 a8e933d0280f..c669255cb194 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 03162625c6b1..8267dd983ce9 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 0eebbabb6d60..f2922a239adb 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 44842c0e168a..3565fba938fe 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 d89253fa3ef3..0a97eed0e053 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 ed7d39cf958c..4f9f0a164230 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 5945c2c8336f..ff8128627e74 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 4c0569622c84..fc655351fbd7 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 2c19b85d0d30..dbe3b4975625 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 afa4f8adb5a6..647ad869a91a 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 522eda3fba18..7f80684d8db9 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 24a9399923f1..bd4f6c5958cc 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 4564768c1973..5b6a208c16f6 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/contra/config.h b/keyboards/contra/config.h deleted file mode 100755 index 36a3485b9563..000000000000 --- a/keyboards/contra/config.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, 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 - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/contra/contra.c b/keyboards/contra/contra.c deleted file mode 100755 index 3ef66a9c0d5e..000000000000 --- a/keyboards/contra/contra.c +++ /dev/null @@ -1 +0,0 @@ -#include "contra.h" diff --git a/keyboards/contra/contra.h b/keyboards/contra/contra.h deleted file mode 100755 index 27a8dd2956f5..000000000000 --- a/keyboards/contra/contra.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x12( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \ -} - -#define LAYOUT_planck_mit( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k30, k31, k32, k33, k34, k35, k37, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \ -} diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json index ce1c9a86dcdb..78aefb1dbfbc 100644 --- a/keyboards/contra/info.json +++ b/keyboards/contra/info.json @@ -3,6 +3,12 @@ "manufacturer": "Cartel", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0x4354", "pid": "0x0001", @@ -10,14 +16,122 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["F6", "B3", "B2", "B6"] + }, "community_layouts": ["planck_mit", "ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { - "layout": [{"label":"Tab", "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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "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":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "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":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}] + "layout": [ + {"label":"Tab", "matrix": [0, 0], "x":0, "y":0}, + {"label":"Q", "matrix": [0, 1], "x":1, "y":0}, + {"label":"W", "matrix": [0, 2], "x":2, "y":0}, + {"label":"E", "matrix": [0, 3], "x":3, "y":0}, + {"label":"R", "matrix": [0, 4], "x":4, "y":0}, + {"label":"T", "matrix": [0, 5], "x":5, "y":0}, + {"label":"Y", "matrix": [0, 6], "x":6, "y":0}, + {"label":"U", "matrix": [0, 7], "x":7, "y":0}, + {"label":"I", "matrix": [0, 8], "x":8, "y":0}, + {"label":"O", "matrix": [0, 9], "x":9, "y":0}, + {"label":"P", "matrix": [0, 10], "x":10, "y":0}, + {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0}, + + {"label":"Esc", "matrix": [1, 0], "x":0, "y":1}, + {"label":"A", "matrix": [1, 1], "x":1, "y":1}, + {"label":"S", "matrix": [1, 2], "x":2, "y":1}, + {"label":"D", "matrix": [1, 3], "x":3, "y":1}, + {"label":"F", "matrix": [1, 4], "x":4, "y":1}, + {"label":"G", "matrix": [1, 5], "x":5, "y":1}, + {"label":"H", "matrix": [1, 6], "x":6, "y":1}, + {"label":"J", "matrix": [1, 7], "x":7, "y":1}, + {"label":"K", "matrix": [1, 8], "x":8, "y":1}, + {"label":"L", "matrix": [1, 9], "x":9, "y":1}, + {"label":";", "matrix": [1, 10], "x":10, "y":1}, + {"label":"'", "matrix": [1, 11], "x":11, "y":1}, + + {"label":"Shift", "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":"N", "matrix": [2, 6], "x":6, "y":2}, + {"label":"M", "matrix": [2, 7], "x":7, "y":2}, + {"label":",", "matrix": [2, 8], "x":8, "y":2}, + {"label":".", "matrix": [2, 9], "x":9, "y":2}, + {"label":"/", "matrix": [2, 10], "x":10, "y":2}, + {"label":"Return", "matrix": [2, 11], "x":11, "y":2}, + + {"matrix": [3, 0], "x":0, "y":3}, + {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3}, + {"label":"Alt", "matrix": [3, 2], "x":2, "y":3}, + {"label":"Super", "matrix": [3, 3], "x":3, "y":3}, + {"label":"⇓", "matrix": [3, 4], "x":4, "y":3}, + {"matrix": [3, 5], "x":5, "y":3}, + {"matrix": [3, 6], "x":6, "y":3}, + {"label":"⇑", "matrix": [3, 7], "x":7, "y":3}, + {"label":"←", "matrix": [3, 8], "x":8, "y":3}, + {"label":"↓", "matrix": [3, 9], "x":9, "y":3}, + {"label":"↑", "matrix": [3, 10], "x":10, "y":3}, + {"label":"→", "matrix": [3, 11], "x":11, "y":3} + ] }, "LAYOUT_planck_mit": { - "layout": [{"label":"Tab", "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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "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":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "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":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}] + "layout": [ + {"label":"Tab", "matrix": [0, 0], "x":0, "y":0}, + {"label":"Q", "matrix": [0, 1], "x":1, "y":0}, + {"label":"W", "matrix": [0, 2], "x":2, "y":0}, + {"label":"E", "matrix": [0, 3], "x":3, "y":0}, + {"label":"R", "matrix": [0, 4], "x":4, "y":0}, + {"label":"T", "matrix": [0, 5], "x":5, "y":0}, + {"label":"Y", "matrix": [0, 6], "x":6, "y":0}, + {"label":"U", "matrix": [0, 7], "x":7, "y":0}, + {"label":"I", "matrix": [0, 8], "x":8, "y":0}, + {"label":"O", "matrix": [0, 9], "x":9, "y":0}, + {"label":"P", "matrix": [0, 10], "x":10, "y":0}, + {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0}, + + {"label":"Esc", "matrix": [1, 0], "x":0, "y":1}, + {"label":"A", "matrix": [1, 1], "x":1, "y":1}, + {"label":"S", "matrix": [1, 2], "x":2, "y":1}, + {"label":"D", "matrix": [1, 3], "x":3, "y":1}, + {"label":"F", "matrix": [1, 4], "x":4, "y":1}, + {"label":"G", "matrix": [1, 5], "x":5, "y":1}, + {"label":"H", "matrix": [1, 6], "x":6, "y":1}, + {"label":"J", "matrix": [1, 7], "x":7, "y":1}, + {"label":"K", "matrix": [1, 8], "x":8, "y":1}, + {"label":"L", "matrix": [1, 9], "x":9, "y":1}, + {"label":";", "matrix": [1, 10], "x":10, "y":1}, + {"label":"'", "matrix": [1, 11], "x":11, "y":1}, + + {"label":"Shift", "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":"N", "matrix": [2, 6], "x":6, "y":2}, + {"label":"M", "matrix": [2, 7], "x":7, "y":2}, + {"label":",", "matrix": [2, 8], "x":8, "y":2}, + {"label":".", "matrix": [2, 9], "x":9, "y":2}, + {"label":"/", "matrix": [2, 10], "x":10, "y":2}, + {"label":"Return", "matrix": [2, 11], "x":11, "y":2}, + + {"matrix": [3, 0], "x":0, "y":3}, + {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3}, + {"label":"Alt", "matrix": [3, 2], "x":2, "y":3}, + {"label":"Super", "matrix": [3, 3], "x":3, "y":3}, + {"label":"⇓", "matrix": [3, 4], "x":4, "y":3}, + {"matrix": [3, 5], "x":5, "y":3}, + {"label":"⇑", "matrix": [3, 7], "x":7, "y":3}, + {"label":"←", "matrix": [3, 8], "x":8, "y":3}, + {"label":"↓", "matrix": [3, 9], "x":9, "y":3}, + {"label":"↑", "matrix": [3, 10], "x":10, "y":3}, + {"label":"→", "matrix": [3, 11], "x":11, "y":3} + ] } } } diff --git a/keyboards/contra/keymaps/default/config.h b/keyboards/contra/keymaps/default/config.h index 6114392f63ee..76f4aade7bf8 100644 --- a/keyboards/contra/keymaps/default/config.h +++ b/keyboards/contra/keymaps/default/config.h @@ -1,3 +1,6 @@ +// Copyright QMK Community +// SPDX-License-Identifier: GPL-2.0+ + #pragma once diff --git a/keyboards/contra/readme.md b/keyboards/contra/readme.md index 2bf1d4de3545..9be1c66460fe 100644 --- a/keyboards/contra/readme.md +++ b/keyboards/contra/readme.md @@ -1,16 +1,21 @@ -CONTRA -====== +# Contra -![CONTRA](https://cartel.ltd/wp-content/uploads/2018/01/img_3209.jpg) +Contra is a low cost 40% keyboard. -A 40% keyboard by [CARTEL](https://cartel.ltd/) - -Keyboard Maintainer: The QMK Community -Hardware Supported: CONTRA -Hardware Availability: [CARTEL](https://cartel.ltd/projects/contra/) +* Keyboard Maintainer: The QMK Community +* Hardware Supported: [Contra](https://github.com/ai03-2725/Contra) +* Hardware Availability: PCB sold by various vendors Make example for this keyboard (after setting up your build environment): - make contra:dana + make contra:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured. +* **Physical reset button**: Briefly press the reset button soldered on the PCB. +* **Bootmagic reset**: Hold down the top left key and plug in the controller. diff --git a/keyboards/contra/rules.mk b/keyboards/contra/rules.mk index 6beb28243182..6e7633bfe015 100755 --- a/keyboards/contra/rules.mk +++ b/keyboards/contra/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -LAYOUTS_HAS_RGB = no - -# Disable unsupported hardware -RGBLIGHT_SUPPORTED = no -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no +# This file intentionally left blank diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index 1b46444ba877..e88943247457 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 a0bd7ed6e46a..436e08038dc8 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 e5e43b55b6e8..e2679325c4f5 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 20d5ad2ff40c..5eeedab7002f 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 f0e3577e5f15..2854ea1481dd 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 24fad8a9fff9..d8eca7dd4ad2 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 286396776eff..c308aa77f9ff 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 364d80371864..04138d2dc24a 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 5361dbd4a01b..2b085cf8da21 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 b28edb717a6d..bce81094c201 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 a786b8689daf..338c040255e0 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/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index 9994741f2481..0a24070bd8ef 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 2864385fb0e0..a1f49342dfe0 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/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h index 152c1a512b52..f7e36e63ebee 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 . #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 8c1d73078717..62ac3b40bf36 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 d0415c48f592..a3516ccedbcd 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 085d56f91efd..465cd940a1e2 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 0d5c58df2124..84c54c9e2e54 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 5b9d5b0ecb29..5b2da811d8df 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 #include #include diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index 547ea09fdd2c..e166ba37d2f0 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 #include #include diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h index 320c49514cde..05d518efac7b 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 0a184388ae12..0fea806b6f9c 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 fdc0463e4173..97d2c078fe27 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 20163dedc586..000000000000 --- 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 . -*/ - -#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 57fe2ea13300..fe6292d80f06 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 9c6056154aff..000000000000 --- 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 . - */ - -#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 b17bc2bf6827..ad20ba2837ae 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/info.json b/keyboards/genone/g1_65/info.json index da5a1df03ad3..2e02a77ff1ed 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 4f62de8d8bb6..7410a49e598d 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 . #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 856705b4f112..617c7a4972fb 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 ad9c202933cb..6576ee9efe93 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 . #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 9e51f9226f8c..5c459d129e3f 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 b2d8ee901408..000000000000 --- 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 . - */ - -#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 35b52cb9c4dd..8963434bd942 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 6bdd3cc57cd3..000000000000 --- 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 . - */ - -#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 ebc309987c07..27b1d3684777 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 fdeb69cae262..baf09cebb5ee 100644 --- a/keyboards/gh60/revc/config.h +++ b/keyboards/gh60/revc/config.h @@ -17,26 +17,6 @@ along with this program. If not, see . #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 052eaea8a3a3..9db944117163 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/satan/config.h b/keyboards/gh60/satan/config.h index ce76bc823363..3e9a6d3a1c2a 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #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 88a09cb3f60d..9a3b190d546b 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 a7d7231e2562..53826075894c 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #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 4806535fd00e..648a98e37c2a 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 5befa284fad4..b44dfaac527e 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 b03ea8f6a3a0..abc9c140518a 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 2853b095ccd8..ea09e835d029 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 1a8b534e56be..b97ee064fdf5 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 01e84b4cdd82..1b2a8bdf5b29 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -17,25 +17,6 @@ along with this program. If not, see . #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 30bd26159f96..31c0c3366d99 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 402c6f17ccc1..ba683e4fed15 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 . #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 a8c0e5b05d2e..f3169e3c0d9f 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 9589c7887d9b..036340f2fd03 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 . #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 ca200a1485e9..4719f1ee94a7 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/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h new file mode 100644 index 000000000000..e3a0340f19a6 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -0,0 +1,65 @@ +// Copyright 2023 gkeyboard (@gkeyboard) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 + +#define RGB_DI_PIN GP19 +#define RGB_MATRIX_LED_COUNT 16 +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_DISABLE_WHEN_USB_SUSPENDED +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_SAT +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_RAIN +#define ENABLE_RGB_MATRIX_PIXEL_FLOW +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define ENABLE_RGB_MATRIX_SPLASH +#define ENABLE_RGB_MATRIX_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +/* 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 diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json new file mode 100644 index 000000000000..fcc900a35fcc --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/info.json @@ -0,0 +1,80 @@ +{ + "manufacturer": "gkeyboard", + "keyboard_name": "GPAD8-2R", + "url": "https://github.com/gkeyboard/GPAD8-2R", + "maintainer": "gkeyboard", + "bootloader": "rp2040", + "processor": "RP2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "vid": "0x474B", + "pid": "0x4202", + "device_version": "1.0.0" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP12", "GP11", "GP10", "GP9"], + "rows": ["GP4", "GP5", "GP6"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP29", + "pin_b": "GP28", + "resolution": 4 + }, + { + "pin_a": "GP2", + "pin_b": "GP3", + "resolution": 4 + } + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [1, 0], "x": 28, "y": 12 }, + { "flags": 4, "matrix": [1, 1], "x": 84, "y": 12 }, + { "flags": 4, "matrix": [1, 2], "x": 140, "y": 12 }, + { "flags": 4, "matrix": [1, 3], "x": 196, "y": 12 }, + { "flags": 4, "matrix": [2, 0], "x": 28, "y": 28 }, + { "flags": 4, "matrix": [2, 1], "x": 84, "y": 28 }, + { "flags": 4, "matrix": [2, 2], "x": 140, "y": 28 }, + { "flags": 4, "matrix": [2, 3], "x": 196, "y": 28 }, + { "flags": 2, "x": 28, "y": 44 }, + { "flags": 2, "x": 84, "y": 44 }, + { "flags": 2, "x": 140, "y": 44 }, + { "flags": 2, "x": 196, "y": 44 }, + { "flags": 2, "x": 28, "y": 60 }, + { "flags": 2, "x": 84, "y": 60 }, + { "flags": 2, "x": 140, "y": 60 }, + { "flags": 2, "x": 196, "y": 60 } + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, + { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, + { "matrix": [1, 0], "x": 0.0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1.0, "y": 1.25 }, + { "matrix": [1, 2], "x": 2.0, "y": 1.25 }, + { "matrix": [1, 3], "x": 3.0, "y": 1.25 }, + { "matrix": [2, 0], "x": 0.0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1.0, "y": 2.25 }, + { "matrix": [2, 2], "x": 2.0, "y": 2.25 }, + { "matrix": [2, 3], "x": 3.0, "y": 2.25 } + ] + } + } +} diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c new file mode 100644 index 000000000000..41b505336d68 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* Copyright 2023 gkeyboard + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_MUTE, RGB_TOG, + KC_A, KC_B, KC_C, KC_D, + KC_E, KC_F, KC_G, KC_H + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk b/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c new file mode 100644 index 000000000000..589a1b15393c --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c @@ -0,0 +1,73 @@ +/* Copyright 2023 gkeyboard + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_MUTE, RGB_TOG, + KC_A, KC_B, KC_C, KC_D, + KC_E, KC_F, KC_G, KC_H + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [4] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [5] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [6] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [7] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk b/keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk new file mode 100644 index 000000000000..f1adcab005e8 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/gkeyboard/gpad8_2r/readme.md b/keyboards/gkeyboard/gpad8_2r/readme.md new file mode 100644 index 000000000000..fd16251714f8 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/readme.md @@ -0,0 +1,27 @@ +# GPAD8-2R + +![GPAD8-2R](https://i.imgur.com/jAaO7gYh.png) + +8 Keys Custom Macro Pad, 2 Encoders, with USB Type-C, RGB underglow, RGB Per Key Lighting. + +* Keyboard Maintainer: [gkeyboard](https://github.com/gkeyboard) +* Hardware Supported: GPAD8-2R PCB +* Hardware Availability: http://www.mltelectronic.com + +Make example for this keyboard (after setting up your build environment): + + make gkeyboard/gpad8_2r:default + +Flashing example for this keyboard: + + make gkeyboard/gpad8_2r:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk new file mode 100644 index 000000000000..997fce7e65c8 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index 76e6e89925ca..0ece27735d84 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 c2483d675fb0..64febeb948aa 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 5d5aba914eaf..af52b203dcc8 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 f5b05748c7ed..5a67f0b74ccc 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 19cab7842354..16aae9b33037 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 a2f377615b10..22678f64a143 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 c633d722a09c..8188418469e3 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 b8a7e94a82f3..7e66ad50435c 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 48181ec488a4..082f28a77474 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 a8a25f854707..0a20c97d2e17 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 c37ccd53df8c..e3cb707c4803 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 c3762c63889b..fa9a83d08ec4 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 097d4d45c00f..4b1f1587172f 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 8db20474be58..fa9a83d08ec4 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 f9e38f0c894f..ac7d8a0ce777 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 f660448b4632..86fc4cef7f5c 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 dc017f23c41c..d03cbc899b6a 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 56b84cb4271b..000000000000 --- 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 . -*/ - -#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 fe5b37c6b855..7f40f6583f85 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 843389ea2e17..000000000000 --- 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 . -*/ - -#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 8393d1c82d31..b9225b0cf04a 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 479ca4c744a3..70ee32e0a36f 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 37376a90e910..aaf8cf8dfde1 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 8d360498a543..ceab86fb2973 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 . #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 2f090ef34221..5fc332b46580 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 64b58911e354..ee5248471a8d 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 . #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 2f8a81d08eba..06de4b4f4b91 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 20dbdb3f50e3..41df8a357d2b 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 . #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 a8b7641a0b10..e49b1667c518 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 17a91e8e4707..1b3e39536fcc 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 . #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 0689443af58c..92eb084b56aa 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 0cd753963c29..089bb27b1747 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 b514a2886bfa..c2eca2b7695c 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 cad954709b21..1934bc77ad19 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 . #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 1ec54ad7486e..ff21f224f4da 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 b6e0419aa1c5..1934bc77ad19 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 . #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 5374b4619da0..c16f6652096b 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 a5a07330632f..38cde33eec61 100644 --- a/keyboards/grid600/press/config.h +++ b/keyboards/grid600/press/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #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 6fb7c8d5b048..0e0aaff476a7 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 7678422bc578..000000000000 --- 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 . -*/ - -#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 4e2d65df590c..53b4b69a42e3 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 2703cdd68886..000000000000 --- 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 . -*/ - -#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 435abb01e00c..31c752537ff6 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 2d677beb5cd2..489dae2a4e1a 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 -#include #define XXX KC_NO diff --git a/keyboards/handwired/co60/info.json b/keyboards/handwired/co60/info.json index 04541098a2e0..1ea1ac4ad2e6 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 ab8ec811c3f0..b1fe1f8479e9 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 5ab526ce67d9..0c8f353bffd7 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/yandrstudio/eau87/config.h b/keyboards/handwired/polly40/config.h similarity index 67% rename from keyboards/yandrstudio/eau87/config.h rename to keyboards/handwired/polly40/config.h index 328e3e3852c9..79dcced21816 100644 --- a/keyboards/yandrstudio/eau87/config.h +++ b/keyboards/handwired/polly40/config.h @@ -1,4 +1,4 @@ -/* Copyright 2022 JasonRen(biu) +/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1 * * 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 @@ -13,10 +13,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW +#pragma once +/* 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 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 } +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/info.json new file mode 100644 index 000000000000..69265ed6ec50 --- /dev/null +++ b/keyboards/handwired/polly40/info.json @@ -0,0 +1,77 @@ +{ + "keyboard_name": "polly40 v2", + "manufacturer": "paul", + "url": "https://github.com/PollyV1", + "maintainer": "Paul Enrico N. Viola", + "usb": { + "vid": "0x6532", + "pid": "0x0069", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "matrix_pins": { + "rows": ["F0", "F1", "F5", "B4"], + "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "rgblight": false, + "audio": false, + "key_lock": false + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00 (F0,F4)", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01 (F0,D7)", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02 (F0,B5)", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03 (F0,B6)", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04 (F0,C6)", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05 (F0,C7)", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06 (F0,D4)", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07 (F0,D6)", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08 (F0,D5)", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09 (F0,D0)", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A (F0,D1)", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "K0B (F0,D2)", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "K10 (F1,F4)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "K11 (F1,D7)", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "K12 (F1,B5)", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "K13 (F1,B6)", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "K14 (F1,C6)", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "K15 (F1,C7)", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "K16 (F1,D4)", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "K17 (F1,D6)", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "K18 (F1,D5)", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": "K19 (F1,D0)", "matrix": [1, 9], "x": 9.25, "y": 1}, + {"label": "K1B (F1,D2)", "matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + {"label": "K20 (F5,F4)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "K22 (F5,B5)", "matrix": [2, 2], "x": 1.75, "y": 2}, + {"label": "K23 (F5,B6)", "matrix": [2, 3], "x": 2.75, "y": 2}, + {"label": "K24 (F5,C6)", "matrix": [2, 4], "x": 3.75, "y": 2}, + {"label": "K25 (F5,C7)", "matrix": [2, 5], "x": 4.75, "y": 2}, + {"label": "K26 (F5,D4)", "matrix": [2, 6], "x": 5.75, "y": 2}, + {"label": "K27 (F5,D6)", "matrix": [2, 7], "x": 6.75, "y": 2}, + {"label": "K28 (F5,D5)", "matrix": [2, 8], "x": 7.75, "y": 2}, + {"label": "K29 (F5,D0)", "matrix": [2, 9], "x": 8.75, "y": 2}, + {"label": "K2A (F5,D1)", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25}, + {"label": "K2B (F5,D2)", "matrix": [2, 11], "x": 11, "y": 2}, + {"label": "K30 (B4,F4)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "K31 (B4,D7)", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "K32 (B4,B5)", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "K36 (B4,D4)", "matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25}, + {"label": "K3A (B4,D1)", "matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25}, + {"label": "K3B (B4,D2)", "matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25} + ] + } + }, + "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} \ No newline at end of file diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c new file mode 100644 index 000000000000..130887fb9006 --- /dev/null +++ b/keyboards/handwired/polly40/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_RSFT, MO(3), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(1) + ), + + [1] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT, + KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______ + ), + + [2] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_INS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_UP, KC_DEL, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_LEFT, KC_DOWN, KC_RGHT, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, _______ + ), + + [3] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/handwired/polly40/keymaps/via/keymap.c b/keyboards/handwired/polly40/keymaps/via/keymap.c new file mode 100644 index 000000000000..130887fb9006 --- /dev/null +++ b/keyboards/handwired/polly40/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_RSFT, MO(3), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(1) + ), + + [1] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT, + KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______ + ), + + [2] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_INS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_UP, KC_DEL, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_LEFT, KC_DOWN, KC_RGHT, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, _______ + ), + + [3] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/handwired/polly40/keymaps/via/rules.mk b/keyboards/handwired/polly40/keymaps/via/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/handwired/polly40/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/handwired/polly40/readme.md b/keyboards/handwired/polly40/readme.md new file mode 100644 index 000000000000..58e74febaf51 --- /dev/null +++ b/keyboards/handwired/polly40/readme.md @@ -0,0 +1,26 @@ +# Polly40 + +![Polly40](https://i.imgur.com/QJCQcFAh.jpg) + +A handwired 40% keyboard running a Pro micro Atmega32u4 controller + +* Keyboard Maintainer: [Paul Enrico N. Viola](https://github.com/PollyV1) +* Hardware Supported: Atmega32u4 controller +* Hardware Availability: https://shopee.ph/Pro-Micro-ATmega32U4-5V-16MHz-USB-Arduino-Compatible-i.20469516.225455828 + +Make example for this keyboard (after setting up your build environment): + + make handwired/polly40:default + +Flashing example for this keyboard: + + make handwired/polly40:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Physical reset button**: Short Ground and RST pin +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/handwired/polly40/rules.mk b/keyboards/handwired/polly40/rules.mk new file mode 100644 index 000000000000..7ff128fa692e --- /dev/null +++ b/keyboards/handwired/polly40/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index e1a3955d5d7a..e8409b78d717 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 af57447d30da..9cabb3e32e4a 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 11442461d446..8f82662058d1 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 ed052a14a3ee..914d5edcd622 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 8699edea437a..9440cda961bf 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/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c index afcc9b0a7a24..4412130df884 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c @@ -130,25 +130,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_NUKE, _______ ), }; - +// clang-format on #ifdef ENCODER_ENABLE -#ifdef ENCODER_MAP_ENABLE +# ifdef ENCODER_MAP_ENABLE +// clang-format off const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_DEFAULT_LAYER_1] = { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } }, - [_DEFAULT_LAYER_2] = { { _______, _______ }, { _______, _______ } }, - [_DEFAULT_LAYER_3] = { { _______, _______ }, { _______, _______ } }, - [_DEFAULT_LAYER_4] = { { _______, _______ }, { _______, _______ } }, - [_GAMEPAD] = { { _______, _______ }, { _______, _______ } }, - [_DIABLO] = { { _______, _______ }, { _______, _______ } }, - [_MOUSE] = { { _______, _______ }, { KC_WH_D, KC_WH_U } }, - [_MEDIA] = { { _______, _______ }, { _______, _______ } }, - [_RAISE] = { { _______, _______ }, { KC_PGDN, KC_PGUP } }, - [_LOWER] = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } }, - [_ADJUST] = { { CK_DOWN, CK_UP }, { _______, _______ } }, + [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLD, KC_VOLU ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_DEFAULT_LAYER_4] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_GAMEPAD] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_DIABLO] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_MOUSE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [_MEDIA] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_RAISE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_PGDN, KC_PGUP ) }, + [_LOWER] = { ENCODER_CCW_CW( RGB_MOD, RGB_RMOD), ENCODER_CCW_CW( RGB_HUD, RGB_HUI ) }, + [_ADJUST] = { ENCODER_CCW_CW( CK_DOWN, CK_UP ), ENCODER_CCW_CW( _______, _______ ) }, }; // clang-format on -#else +# else deferred_token encoder_token = INVALID_DEFERRED_TOKEN; static int8_t last_direction = -1; @@ -160,11 +161,11 @@ static uint32_t encoder_callback(uint32_t trigger_time, void *cb_arg) { } bool encoder_update_user(uint8_t index, bool clockwise) { -# ifdef SWAP_HANDS_ENABLE +# ifdef SWAP_HANDS_ENABLE if (swap_hands) { index ^= 1; } -# endif +# endif if (index == 0) { tap_code_delay(clockwise ? KC_VOLD : KC_VOLU, 5); } else if (index == 1) { @@ -185,7 +186,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } return false; } -#endif +# endif #endif #ifdef OLED_ENABLE @@ -214,4 +215,8 @@ void oled_render_large_display(bool side) { render_unicode_mode(1, 14); } } + +void render_oled_title(bool side) { + oled_write_P(side ? PSTR(" Tractyl ") : PSTR(" Manuform "), true); +} #endif diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json index aac770596f6c..c35abf455681 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 70c62212f1c6..e0f9ed5f26b6 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 37e578dfea7c..c02ea1f9139f 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 2aebd925ee50..95a572bd1769 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 c414e3254c1f..000000000000 --- 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 . -*/ - -#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 9e34484de5f3..137c6bc7de28 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 bf563918c909..2521d16e8c4d 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 7b3c71aa8821..3fd6dfe21a01 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 f943c2c0532a..10887bdf1899 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 7f48b11c76ba..e2e2b4a3f7e1 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 90077d236158..baf09cebb5ee 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 . #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 1114abd5bd4f..a7035245f0f3 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 54f0fc0c7c45..4f15181dfd94 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 . #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 a192072701c6..b0d2c6f712a6 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 d44e54d32cac..707f04099257 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 558cbda3c860..599e02ab59a6 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 d3eb71dc9256..fc65958e3ee7 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 . #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 89b64f3951e5..c8ee450e4477 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 2f4ebd7744e9..881174152c5d 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 . #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 ca396545752f..ea985584559d 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 7f48dc77528d..1d968410b1a5 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 2046283d8e49..5acdaba228e9 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 5c612855fb18..0cb9bb1f19a3 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 725ddc0c4d43..e5c423e5274d 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 a3b2a5ef92b0..4851844dad00 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 75add6a89692..f77698554dd3 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 f7f64091494c..50001e978cc4 100644 --- a/keyboards/illuminati/is0/config.h +++ b/keyboards/illuminati/is0/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 1d201e3535b5..c1816b5e2a27 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 b83ebd140adc..7b9007c1f654 100644 --- a/keyboards/illusion/rosa/config.h +++ b/keyboards/illusion/rosa/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #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 bb533bfb2f95..4432fbca4987 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 5e8abdf2e09a..0e5e8b9d2554 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 9b665dda7424..7f447ff1aed8 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 6c6326b3cdbf..151eba96c980 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 867152f2954e..e9f4488dc704 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 f6fcafb74934..5554f56bd17c 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 5318d704e461..6b8d8b520b5a 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 c63b26264e8c..fdd18467535e 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 9e5ec18b6741..3a725c01e86f 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 4ef09efc37fd..a194f0e4443e 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 1d9014bdbd2a..54c18859f2f8 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 be6d4a8e651f..21929f17f344 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 7da0598d91bc..fa6fa373f988 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 fdadcd564289..6ebc0f4083e0 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 . 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 635355d49044..c751cfe3f24a 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 c4ec6a4a7d0b..000000000000 --- a/keyboards/input_club/infinity60/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 . -*/ - -#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 301003e8b9ca..000000000000 --- a/keyboards/input_club/infinity60/led/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 . -*/ - -#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 000000000000..7a9b924a71d1 --- /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 1207dffc783e..000000000000 --- a/keyboards/input_club/infinity60/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 . -*/ - -#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 000000000000..a5afb37751b2 --- /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 aa7dca86d3dc..2a4c7d057c7a 100644 --- a/keyboards/input_club/k_type/config.h +++ b/keyboards/input_club/k_type/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #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 60522333d7c8..c05785ac6923 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 7567d0ef506c..067b7f4e59ac 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 . #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 0cd34f831250..80853b484751 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 95251ca8f87e..000000000000 --- 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 05b346d793f6..270da1ea501f 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 eefaa897a1ba..9386d03e7401 100644 --- a/keyboards/irene/config.h +++ b/keyboards/irene/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 a9e943db5c10..9e3a4a220d5a 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 5616f96083da..d813c012ef3a 100644 --- a/keyboards/iriskeyboards/config.h +++ b/keyboards/iriskeyboards/config.h @@ -17,25 +17,6 @@ along with this program. If not, see . #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 860d9f21b7df..19516e8d6eff 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 b47b2ccf5086..f2d3a3c36ff7 100644 --- a/keyboards/iron180/config.h +++ b/keyboards/iron180/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #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 3c7798508f06..e408e5321cbb 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 47eac652c5e7..000000000000 --- 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 . -*/ - -#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 c57e9e3e2a29..9231437bd1e6 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 0caf63504506..cde00d1c4d14 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 ed5768bf326d..c5ae58045371 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 147dc2ade40e..26e7ee3f339a 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 d7a8bf543b5a..7b1324e3f335 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 f2e51f63acb1..685504afb10a 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 1a6e9cea9e92..1359eafc9a72 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 639b5a389754..dac233ecc148 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/info.json b/keyboards/jadookb/jkb2/info.json index 0a72e6b7bc8b..b0b1c9792c5e 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 00bc0c3488f1..2ef7a6cf7bfc 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 78f13414c90c..000000000000 --- 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 . - */ - -#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 4bfe3aa763ec..9cf153f928b7 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 5db93f75cbd5..000000000000 --- 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 . - */ - -#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 8a23a21d5f18..909efbd665ef 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 8afbaabca0f6..6b5c1ab3f90a 100644 --- a/keyboards/jae/j01/config.h +++ b/keyboards/jae/j01/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #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 6f0b5d485dff..74bcf21b474e 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 163236c90c21..96c32b09f28a 100644 --- a/keyboards/jagdpietr/drakon/config.h +++ b/keyboards/jagdpietr/drakon/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 3aab78919901..9c28b2133605 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 62501a05d19a..6abe1d446de6 100644 --- a/keyboards/jc65/v32a/config.h +++ b/keyboards/jc65/v32a/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #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 b9693c8e72eb..27ee90931da9 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 eca08d7d9232..68e8005decee 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #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 . #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 e20dccdbfad5..e9d3e2b89740 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/jd40/config.h b/keyboards/jd40/config.h index 11a868ab3e4b..36c2f16578d4 100644 --- a/keyboards/jd40/config.h +++ b/keyboards/jd40/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 9bb96326d389..924122544ed9 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/jd45/config.h b/keyboards/jd45/config.h index 25153db7503f..9b7700e0139b 100644 --- a/keyboards/jd45/config.h +++ b/keyboards/jd45/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #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 725431c67256..c401d179ebbd 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 b03ceffba824..d78952f2611c 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 3d3b59ca7e33..418410c3ff23 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 b655834c0297..3eec23b21478 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 fed2fe9f4c9d..6542e29a0819 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/info.json b/keyboards/jian/handwired/info.json index 712c3d9b016f..bd76da9e9699 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 3e2fa93f31cf..5eda1a672406 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . */ #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 74121b2fda08..e51b65c5012b 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 083b235a2efb..a00830b7f715 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . */ #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 fc65cb13b892..9ca0a417852d 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 37e8f0458d31..92b15fab6524 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . */ #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 642bf83efc28..6cae5556e279 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 39ed4bb0c78a..16a45b256b3b 100644 --- a/keyboards/jiran/config.h +++ b/keyboards/jiran/config.h @@ -17,13 +17,4 @@ along with this program. If not, see . #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 9f04243278b8..6c4e4c397fab 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 4967594b552e..3b83277d42e2 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 c5422097abfd..b7fcc584f3bf 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 f8280340e825..a0012f33b5f4 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 . #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 fff5b9b75299..85f73603aea0 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 c80b64ef10de..532bf95acb1b 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 . #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 2415eb5c1804..3a389231a4b9 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 ca28364f72ed..4b007cf387ee 100644 --- a/keyboards/jm60/config.h +++ b/keyboards/jm60/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #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 1dbb4c31d998..a39bf9b4b4cc 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 abca51f3fac0..b53df6cf7f88 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 5bf9c1eda2f7..7b8a2ad03086 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 1936d5d2567e..acf9a541b3db 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #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 37f0b70087f0..fc690aa6cd98 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 7e0ef171132b..77316af07c9e 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 85df8cc7093f..dbfa50c35817 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 a22c82c681c3..ec522cc82cce 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 850cfb1dc29a..c4b262c26c89 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/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index 88cec2784406..09f6dd4d36da 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/keebio/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c index 4e393e4196bb..9b33f35e0eaa 100644 --- a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c +++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c @@ -20,7 +20,7 @@ #define TT_MDIA TT(_MEDIA) // enum more_custom_keycodes { -// KC_P00 = NEW_SAFE_RANGE +// KC_P00 = USER_SAFE_RANGE //}; // clang-format off diff --git a/keyboards/keebsforall/freebird60/info.json b/keyboards/keebsforall/freebird60/info.json index 4cd786a174ef..7092596e37ca 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 5d01d25bbd0a..78fd4adbde39 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/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c new file mode 100644 index 000000000000..2cfaeae8fc97 --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c @@ -0,0 +1,170 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + // {0, I_1, G_1, H_1} + {0, I_2, G_2, H_2}, // F13 + {0, I_3, G_3, H_3}, // F14 + {0, I_4, G_4, H_4}, // F15 + {0, I_5, G_5, H_5}, // Esc + {0, I_6, G_6, H_6}, // F1 + {0, I_7, G_7, H_7}, // F2 + {0, I_8, G_8, H_8}, // F3 + {0, I_9, G_9, H_9}, // F4 + {0, I_10, G_10, H_10}, // F5 + {0, I_11, G_11, H_11}, // F6 + {0, I_12, G_12, H_12}, // F7 + {0, I_13, G_13, H_13}, // F8 + {0, I_14, G_14, H_14}, // F9 + {0, I_15, G_15, H_15}, // F10 + {0, I_16, G_16, H_16}, // F11 + {0, L_16, J_16, K_16}, // F12 + {0, L_15, J_15, K_15}, // DEL + {0, L_14, J_14, K_14}, // Light + + + {0, C_1, A_1, B_1}, // num_lock + {0, C_2, A_2, B_2}, // / + {0, C_3, A_3, B_3}, // * + {0, C_4, A_4, B_4}, // - + {0, C_5, A_5, B_5}, // ~` + {0, C_6, A_6, B_6}, // 1! + {0, C_7, A_7, B_7}, // 2@ + {0, C_8, A_8, B_8}, // 3# + {0, C_9, A_9, B_9}, // 4$ + {0, C_10, A_10, B_10}, // 5% + {0, C_11, A_11, B_11}, // 6^ + {0, C_12, A_12, B_12}, // 7& + {0, C_13, A_13, B_13}, // 8* + {0, C_14, A_14, B_14}, // 9( + {0, C_15, A_15, B_15}, // 0) + {0, C_16, A_16, B_16}, // -_ + {0, L_13, J_13, K_13}, // =+ + {0, L_12, J_12, K_12}, // BackSpace + {0, L_11, J_11, K_11}, // PgUp + + {0, F_1, D_1, E_1}, // 7 + {0, F_2, D_2, E_2}, // 8 + {0, F_3, D_3, E_3}, // 9 + {0, F_4, D_4, E_4}, // + + {0, F_5, D_5, E_5}, // TAB + {0, F_6, D_6, E_6}, // Q + {0, F_7, D_7, E_7}, // W + {0, F_8, D_8, E_8}, // E + {0, F_9, D_9, E_9}, // R + {0, F_10, D_10, E_10}, // T + {0, F_11, D_11, E_11}, // Y + {0, F_12, D_12, E_12}, // U + {0, F_13, D_13, E_13}, // I + {0, F_14, D_14, E_14}, // O + {0, F_15, D_15, E_15}, // P + {0, F_16, D_16, E_16}, // [ + {0, L_10, J_10, K_10}, // ] + {0, L_9, J_9, K_9}, // \| + {0, L_8, J_8, K_8}, // PgDn + + {1, C_16, A_16, B_16}, // 4 + {1, C_15, A_15, B_15}, // 5 + {1, C_14, A_14, B_14}, // 6 + // {0, F_4, D_4, E_4}, // + + {1, C_12, A_12, B_12}, // CapsLock + {1, C_11, A_11, B_11}, // A + {1, C_10, A_10, B_10}, // S + {1, C_9, A_9, B_9}, // D + {1, C_8, A_8, B_8}, // F + {1, C_7, A_7, B_7}, // G + {1, C_6, A_6, B_6}, // H + {1, C_5, A_5, B_5}, // J + {1, C_4, A_4, B_4}, // k + {1, C_3, A_3, B_3}, // l + {1, C_2, A_2, B_2}, // ； + {1, C_1, A_1, B_1}, // ' + {1, L_1, J_1, K_1}, // Enter + {1, L_2, J_2, K_2}, // Home + + {1, I_16, G_16, H_16}, // 1 + {1, I_15, G_15, H_15}, // 2 + {1, I_14, G_14, H_14}, // 3 + {1, I_13, G_13, H_13}, // Enter + {1, I_12, G_12, H_12}, //Shift_L + {1, I_10, G_10, H_10}, // Z + {1, I_9, G_9, H_9}, // X + {1, I_8, G_8, H_8}, // C + {1, I_7, G_7, H_7}, // V + {1, I_6, G_6, H_6}, // B + {1, I_5, G_5, H_5}, // N + {1, I_4, G_4, H_4}, // M + {1, I_3, G_3, H_3}, // , + {1, I_2, G_2, H_2}, // . + {1, I_1, G_1, H_1}, // ? + {1, L_3, J_3, K_3}, // Shift_R + {1, L_4, J_4, K_4}, // Up + + {1, F_16, D_16, E_16}, // 0 + {1, F_14, D_14, E_14}, // . + {1, F_12, D_12, E_12}, // Ctrl_L + {1, F_11, D_11, E_11}, // Win_L + {1, F_10, D_10, E_10}, // Alt_L + {1, F_6, D_6, E_6}, // Space + {1, F_3, D_3, E_3}, // Alt_R + {1, F_2, D_2, E_2}, // Fn + {1, F_1, D_1, E_1}, // Ctrl_R + {1, L_5, J_5, K_5}, // Left + {1, L_6, J_6, K_6}, // Down + {1, L_7, J_7, K_7}, // Right +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, __, 0, 1 }, + { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 18, 19, 20 }, + { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 37, 38, 39 }, + { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 76, 71, 72, 56, 57, 58 }, + { 77, __, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, __, 88, 89, 73, 74, 75 }, + { 92, 93, 94, __, __, 21, 95, 40, __, 96, 97, 98, 99, 100, 101, 90, 2, 91 }, + }, + { + // LED Index to Physical Position + {11,0}, {23,0}, {34,0}, {49,0}, {63,0}, {75,0}, {86,0}, {98,0}, {112,0}, {123,0}, {135,0}, {146,0}, {161,0}, {172,0}, {184,0}, {195,0}, {209,0}, {224,0}, + {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15}, {106,15}, {118,15}, {129,15}, {141,15}, {152,15}, {164,15}, {175,15}, {186,15}, {204,15}, {224,15}, + {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {78,26}, {89,26}, {101,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {181,26}, {192,26}, {207,26}, {224,26}, + {0,38}, {11,38}, {23,38}, {53,38}, {69,38}, {81,38}, {92,38}, {103,38}, {115,38}, {126,38}, {138,38}, {149,38}, {161,38}, {172,38}, {184,38}, {202,38}, {224,38}, + {0,49}, {11,49}, {23,49}, {34,55}, {56,49}, {75,49}, {86,49}, {98,49}, {109,49}, {121,49}, {132,49}, {144,49}, {155,49}, {166,49}, {178,49}, {194,49}, {213,52}, + {6,61}, {23,61}, {50,61}, {65,61}, {79,61}, {122,61}, {163,61}, {175,61}, {186,61}, {201,64}, {213,64}, {224,64}, + }, + { + // RGB LED Index to Flag + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 4, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1, + } +}; +#endif diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/keychron/q12/ansi_encoder/config.h similarity index 64% rename from keyboards/40percentclub/polyandry/promicro/config.h rename to keyboards/keychron/q12/ansi_encoder/config.h index ff148a0b3f7c..56a1f7505fb3 100644 --- a/keyboards/40percentclub/polyandry/promicro/config.h +++ b/keyboards/keychron/q12/ansi_encoder/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 +/* Copyright 2023 @ Keychron (https://www.keychron.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 @@ -16,13 +16,15 @@ #pragma once +/* RGB Matrix Configuration */ +#define DRIVER_1_LED_TOTAL 56 +#define DRIVER_2_LED_TOTAL 46 +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) -/* 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 } +#define ENCODER_DEFAULT_POS 0x3 -/* doesn't really matter lol */ -#define DIODE_DIRECTION COL2ROW +/* Enable caps-lock LED */ +#define CAPS_LOCK_LED_INDEX 59 + +/* Enable num-lock LED */ +#define NUM_LOCK_LED_INDEX 18 diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json new file mode 100644 index 000000000000..0e3179708a1d --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/info.json @@ -0,0 +1,132 @@ +{ + "keyboard_name": "Keychron Q12", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x01D1", + "device_version": "1.0.0" + }, + "encoder": { + "rotary": [ + {"pin_a": "A2", "pin_b": "C14"} + ] + }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_ansi_103": { + "layout": [ + {"matrix":[0,15], "x":0, "y":0}, + {"matrix":[0,16], "x":1, "y":0}, + {"matrix":[0,17], "x":2, "y":0}, + {"matrix":[5,16], "x":3, "y":0}, + {"matrix":[0,0], "x":4.25, "y":0}, + {"matrix":[0,1], "x":5.5, "y":0}, + {"matrix":[0,2], "x":6.5, "y":0}, + {"matrix":[0,3], "x":7.5, "y":0}, + {"matrix":[0,4], "x":8.5, "y":0}, + {"matrix":[0,5], "x":9.75, "y":0}, + {"matrix":[0,6], "x":10.75, "y":0}, + {"matrix":[0,7], "x":11.75, "y":0}, + {"matrix":[0,8], "x":12.75, "y":0}, + {"matrix":[0,9], "x":14, "y":0}, + {"matrix":[0,10], "x":15, "y":0}, + {"matrix":[0,11], "x":16, "y":0}, + {"matrix":[0,12], "x":17, "y":0}, + {"matrix":[0,13], "x":18.25, "y":0}, + {"matrix":[0,14], "x":19.5, "y":0}, + + {"matrix":[1,15], "x":0, "y":1.25}, + {"matrix":[1,16], "x":1, "y":1.25}, + {"matrix":[1,17], "x":2, "y":1.25}, + {"matrix":[5,5], "x":3, "y":1.25}, + {"matrix":[1,0], "x":4.25, "y":1.25}, + {"matrix":[1,1], "x":5.25, "y":1.25}, + {"matrix":[1,2], "x":6.25, "y":1.25}, + {"matrix":[1,3], "x":7.25, "y":1.25}, + {"matrix":[1,4], "x":8.25, "y":1.25}, + {"matrix":[1,5], "x":9.25, "y":1.25}, + {"matrix":[1,6], "x":10.25, "y":1.25}, + {"matrix":[1,7], "x":11.25, "y":1.25}, + {"matrix":[1,8], "x":12.25, "y":1.25}, + {"matrix":[1,9], "x":13.25, "y":1.25}, + {"matrix":[1,10], "x":14.25, "y":1.25}, + {"matrix":[1,11], "x":15.25, "y":1.25}, + {"matrix":[1,12], "x":16.25, "y":1.25}, + {"matrix":[1,13], "x":17.25, "y":1.25, "w":2}, + {"matrix":[1,14], "x":19.5, "y":1.25}, + + {"matrix":[2,15], "x":0, "y":2.25}, + {"matrix":[2,16], "x":1, "y":2.25}, + {"matrix":[2,17], "x":2, "y":2.25}, + {"matrix":[5,7], "x":3, "y":2.25, "h":2}, + {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5}, + {"matrix":[2,1], "x":5.75, "y":2.25}, + {"matrix":[2,2], "x":6.75, "y":2.25}, + {"matrix":[2,3], "x":7.75, "y":2.25}, + {"matrix":[2,4], "x":8.75, "y":2.25}, + {"matrix":[2,5], "x":9.75, "y":2.25}, + {"matrix":[2,6], "x":10.75, "y":2.25}, + {"matrix":[2,7], "x":11.75, "y":2.25}, + {"matrix":[2,8], "x":12.75, "y":2.25}, + {"matrix":[2,9], "x":13.75, "y":2.25}, + {"matrix":[2,10], "x":14.75, "y":2.25}, + {"matrix":[2,11], "x":15.75, "y":2.25}, + {"matrix":[2,12], "x":16.75, "y":2.25}, + {"matrix":[2,13], "x":17.75, "y":2.25, "w":1.5}, + {"matrix":[2,14], "x":19.5, "y":2.25}, + + {"matrix":[3,15], "x":0, "y":3.25}, + {"matrix":[3,16], "x":1, "y":3.25}, + {"matrix":[3,17], "x":2, "y":3.25}, + {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75}, + {"matrix":[3,1], "x":6, "y":3.25}, + {"matrix":[3,2], "x":7, "y":3.25}, + {"matrix":[3,3], "x":8, "y":3.25}, + {"matrix":[3,4], "x":9, "y":3.25}, + {"matrix":[3,5], "x":10, "y":3.25}, + {"matrix":[3,6], "x":11, "y":3.25}, + {"matrix":[3,7], "x":12, "y":3.25}, + {"matrix":[3,8], "x":13, "y":3.25}, + {"matrix":[3,9], "x":14, "y":3.25}, + {"matrix":[3,10], "x":15, "y":3.25}, + {"matrix":[3,11], "x":16, "y":3.25}, + {"matrix":[3,13], "x":17, "y":3.25, "w":2.25}, + {"matrix":[3,14], "x":19.5, "y":3.25}, + + {"matrix":[4,15], "x":0, "y":4.25}, + {"matrix":[4,16], "x":1, "y":4.25}, + {"matrix":[4,17], "x":2, "y":4.25}, + {"matrix":[3,12], "x":3, "y":4.25, "h":2}, + {"matrix":[4,0], "x":4.25, "y":4.25, "w":2.25}, + {"matrix":[4,2], "x":6.5, "y":4.25}, + {"matrix":[4,3], "x":7.5, "y":4.25}, + {"matrix":[4,4], "x":8.5, "y":4.25}, + {"matrix":[4,5], "x":9.5, "y":4.25}, + {"matrix":[4,6], "x":10.5, "y":4.25}, + {"matrix":[4,7], "x":11.5, "y":4.25}, + {"matrix":[4,8], "x":12.5, "y":4.25}, + {"matrix":[4,9], "x":13.5, "y":4.25}, + {"matrix":[4,10], "x":14.5, "y":4.25}, + {"matrix":[4,11], "x":15.5, "y":4.25}, + {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75}, + {"matrix":[4,14], "x":18.5, "y":4.5}, + + {"matrix":[5,15], "x":0, "y":5.25, "w":2}, + {"matrix":[5,17], "x":2, "y":5.25}, + {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25}, + {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25}, + {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25}, + {"matrix":[5,6], "x":8, "y":5.25, "w":6.25}, + {"matrix":[5,9], "x":14.25, "y":5.25}, + {"matrix":[5,10], "x":15.25, "y":5.25}, + {"matrix":[5,11], "x":16.25, "y":5.25}, + {"matrix":[5,12], "x":17.5, "y":5.5}, + {"matrix":[5,13], "x":18.5, "y":5.5}, + {"matrix":[5,14], "x":19.5, "y":5.5} + ] + } + } +} diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c new file mode 100644 index 000000000000..9c9ee41ef61a --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include QMK_KEYBOARD_H + +// clang-format off + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_103( + KC_MUTE, KC_F13, KC_F14, KC_F15, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_FN] = LAYOUT_ansi_103( + RGB_TOG, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_BASE] = LAYOUT_ansi_103( + KC_MUTE, _______, _______, _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_FN] = LAYOUT_ansi_103( + RGB_TOG, _______, _______, _______, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q12/ansi_encoder/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c new file mode 100644 index 000000000000..abd259d1d17a --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c @@ -0,0 +1,80 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +// clang-format off + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_103( + KC_MUTE, KC_F13, KC_F14, KC_F15, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_FN] = LAYOUT_ansi_103( + RGB_TOG, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_BASE] = LAYOUT_ansi_103( + KC_MUTE, _______, _______, _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_FN] = LAYOUT_ansi_103( + RGB_TOG, _______, _______, _______, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +// clang-format on + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif + +void housekeeping_task_user(void) { + housekeeping_task_keychron(); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/rules.mk new file mode 100644 index 000000000000..9cf1a9b56cba --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes + +VPATH += keyboards/keychron/common +SRC += keychron_common.c diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c new file mode 100644 index 000000000000..9c9ee41ef61a --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include QMK_KEYBOARD_H + +// clang-format off + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_103( + KC_MUTE, KC_F13, KC_F14, KC_F15, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_FN] = LAYOUT_ansi_103( + RGB_TOG, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_BASE] = LAYOUT_ansi_103( + KC_MUTE, _______, _______, _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_FN] = LAYOUT_ansi_103( + RGB_TOG, _______, _______, _______, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q12/ansi_encoder/keymaps/via/rules.mk new file mode 100644 index 000000000000..f1adcab005e8 --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk new file mode 100644 index 000000000000..bf60bb7d7d54 --- /dev/null +++ b/keyboards/keychron/q12/ansi_encoder/rules.mk @@ -0,0 +1,26 @@ +# Build Options +# change yes to no to disable. +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable USB N-key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes # Enable Encoder +DIP_SWITCH_ENABLE = yes +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = CKLED2001 +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = embedded_flash + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE + +# custom matrix setup +CUSTOM_MATRIX = lite + +SRC += matrix.c diff --git a/keyboards/keychron/q12/config.h b/keyboards/keychron/q12/config.h new file mode 100644 index 000000000000..95281b4854c9 --- /dev/null +++ b/keyboards/keychron/q12/config.h @@ -0,0 +1,110 @@ +/* Copyright 2023 @ Keychron(https://www.keychron.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 . + */ + +#pragma once + +/* Key matrix pins */ +#define MATRIX_ROW_PINS \ + { B5, B4, B3, A15, A14, A13 } +#define MATRIX_COL_PINS \ + { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +/* RGB Matrix Driver Configuration */ +#define DRIVER_COUNT 2 +#define DRIVER_ADDR_1 0b1110111 +#define DRIVER_ADDR_2 0b1110100 + +/* Increase I2C speed to 1000 KHz */ +#define I2C1_TIMINGR_PRESC 0U +#define I2C1_TIMINGR_SCLDEL 3U +#define I2C1_TIMINGR_SDADEL 0U +#define I2C1_TIMINGR_SCLH 15U +#define I2C1_TIMINGR_SCLL 51U + +#define CKLED2001_CURRENT_TUNE \ + { 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55 } + +/* DIP switch */ +#define DIP_SWITCH_MATRIX_GRID \ + { \ + { 5, 4 } \ + } +#define SCAN_COUNT_MAX 100 + +/* Disable DIP switch in matrix data */ +#define MATRIX_MASKED + +/* turn off effects when suspended */ +#define RGB_DISABLE_WHEN_USB_SUSPENDED + +/* EEPROM Driver Configuration */ +// #define WEAR_LEVELING_LOGICAL_SIZE 2048 // default +// #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) // default + +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +// #define ENABLE_RGB_MATRIX_ALPHAS_MODS +// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +// #define ENABLE_RGB_MATRIX_BAND_SAT +// #define ENABLE_RGB_MATRIX_BAND_VAL +// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +// #define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +// #define ENABLE_RGB_MATRIX_HUE_BREATHING +// #define ENABLE_RGB_MATRIX_HUE_PENDULUM +// #define ENABLE_RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_RAIN +// #define ENABLE_RGB_MATRIX_PIXEL_FLOW +// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define ENABLE_RGB_MATRIX_SPLASH +// #define ENABLE_RGB_MATRIX_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH +// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/keychron/q12/halconf.h similarity index 84% rename from keyboards/jadookb/jkb2/config.h rename to keyboards/keychron/q12/halconf.h index 0c4b36593240..e490b49e005a 100644 --- a/keyboards/jadookb/jkb2/config.h +++ b/keyboards/keychron/q12/halconf.h @@ -1,4 +1,4 @@ - /* Copyright 2021 Wizard-GG +/* Copyright 2020 QMK * * 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 @@ -13,9 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #pragma once -#define MATRIX_ROW_PINS { B1 } -#define MATRIX_COL_PINS { B3 ,B2} +#define HAL_USE_I2C TRUE +#define PAL_USE_CALLBACKS TRUE -#define DIODE_DIRECTION COL2ROW +#include_next diff --git a/keyboards/keychron/q12/iso_encoder/config.h b/keyboards/keychron/q12/iso_encoder/config.h new file mode 100644 index 000000000000..eb0957d7afe7 --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/config.h @@ -0,0 +1,30 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#pragma once + +/* RGB Matrix Configuration */ +#define DRIVER_1_LED_TOTAL 56 +#define DRIVER_2_LED_TOTAL 47 +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) + +#define ENCODER_DEFAULT_POS 0x3 + +/* Enable caps-lock LED */ +#define CAPS_LOCK_LED_INDEX 58 + +/* Enable num-lock LED */ +#define NUM_LOCK_LED_INDEX 18 diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json new file mode 100644 index 000000000000..c945fbc771cc --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/info.json @@ -0,0 +1,133 @@ +{ + "keyboard_name": "Keychron Q12", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x01D3", + "device_version": "1.0.0" + }, + "encoder": { + "rotary": [ + {"pin_a": "A2", "pin_b": "C14"} + ] + }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_iso_104": { + "layout": [ + {"matrix":[0,15], "x":0, "y":0}, + {"matrix":[0,16], "x":1, "y":0}, + {"matrix":[0,17], "x":2, "y":0}, + {"matrix":[5,16], "x":3, "y":0}, + {"matrix":[0,0], "x":4.25, "y":0}, + {"matrix":[0,1], "x":5.5, "y":0}, + {"matrix":[0,2], "x":6.5, "y":0}, + {"matrix":[0,3], "x":7.5, "y":0}, + {"matrix":[0,4], "x":8.5, "y":0}, + {"matrix":[0,5], "x":9.75, "y":0}, + {"matrix":[0,6], "x":10.75, "y":0}, + {"matrix":[0,7], "x":11.75, "y":0}, + {"matrix":[0,8], "x":12.75, "y":0}, + {"matrix":[0,9], "x":14, "y":0}, + {"matrix":[0,10], "x":15, "y":0}, + {"matrix":[0,11], "x":16, "y":0}, + {"matrix":[0,12], "x":17, "y":0}, + {"matrix":[0,13], "x":18.25, "y":0}, + {"matrix":[0,14], "x":19.5, "y":0}, + + {"matrix":[1,15], "x":0, "y":1.25}, + {"matrix":[1,16], "x":1, "y":1.25}, + {"matrix":[1,17], "x":2, "y":1.25}, + {"matrix":[5,5], "x":3, "y":1.25}, + {"matrix":[1,0], "x":4.25, "y":1.25}, + {"matrix":[1,1], "x":5.25, "y":1.25}, + {"matrix":[1,2], "x":6.25, "y":1.25}, + {"matrix":[1,3], "x":7.25, "y":1.25}, + {"matrix":[1,4], "x":8.25, "y":1.25}, + {"matrix":[1,5], "x":9.25, "y":1.25}, + {"matrix":[1,6], "x":10.25, "y":1.25}, + {"matrix":[1,7], "x":11.25, "y":1.25}, + {"matrix":[1,8], "x":12.25, "y":1.25}, + {"matrix":[1,9], "x":13.25, "y":1.25}, + {"matrix":[1,10], "x":14.25, "y":1.25}, + {"matrix":[1,11], "x":15.25, "y":1.25}, + {"matrix":[1,12], "x":16.25, "y":1.25}, + {"matrix":[1,13], "x":17.25, "y":1.25, "w":2}, + {"matrix":[1,14], "x":19.5, "y":1.25}, + + {"matrix":[2,15], "x":0, "y":2.25}, + {"matrix":[2,16], "x":1, "y":2.25}, + {"matrix":[2,17], "x":2, "y":2.25}, + {"matrix":[5,7], "x":3, "y":2.25, "h":2}, + {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5}, + {"matrix":[2,1], "x":5.75, "y":2.25}, + {"matrix":[2,2], "x":6.75, "y":2.25}, + {"matrix":[2,3], "x":7.75, "y":2.25}, + {"matrix":[2,4], "x":8.75, "y":2.25}, + {"matrix":[2,5], "x":9.75, "y":2.25}, + {"matrix":[2,6], "x":10.75, "y":2.25}, + {"matrix":[2,7], "x":11.75, "y":2.25}, + {"matrix":[2,8], "x":12.75, "y":2.25}, + {"matrix":[2,9], "x":13.75, "y":2.25}, + {"matrix":[2,10], "x":14.75, "y":2.25}, + {"matrix":[2,11], "x":15.75, "y":2.25}, + {"matrix":[2,12], "x":16.75, "y":2.25}, + {"matrix":[2,14], "x":19.5, "y":2.25}, + + {"matrix":[3,15], "x":0, "y":3.25}, + {"matrix":[3,16], "x":1, "y":3.25}, + {"matrix":[3,17], "x":2, "y":3.25}, + {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75}, + {"matrix":[3,1], "x":6, "y":3.25}, + {"matrix":[3,2], "x":7, "y":3.25}, + {"matrix":[3,3], "x":8, "y":3.25}, + {"matrix":[3,4], "x":9, "y":3.25}, + {"matrix":[3,5], "x":10, "y":3.25}, + {"matrix":[3,6], "x":11, "y":3.25}, + {"matrix":[3,7], "x":12, "y":3.25}, + {"matrix":[3,8], "x":13, "y":3.25}, + {"matrix":[3,9], "x":14, "y":3.25}, + {"matrix":[3,10], "x":15, "y":3.25}, + {"matrix":[3,11], "x":16, "y":3.25}, + {"matrix":[3,13], "x":17, "y":3.25}, + {"matrix":[2,13], "x":18, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3,14], "x":19.5, "y":3.25}, + + {"matrix":[4,15], "x":0, "y":4.25}, + {"matrix":[4,16], "x":1, "y":4.25}, + {"matrix":[4,17], "x":2, "y":4.25}, + {"matrix":[3,12], "x":3, "y":4.25, "h":2}, + {"matrix":[4,0], "x":4.25, "y":4.25, "w":1.25}, + {"matrix":[4,1], "x":5.5, "y":4.25}, + {"matrix":[4,2], "x":6.5, "y":4.25}, + {"matrix":[4,3], "x":7.5, "y":4.25}, + {"matrix":[4,4], "x":8.5, "y":4.25}, + {"matrix":[4,5], "x":9.5, "y":4.25}, + {"matrix":[4,6], "x":10.5, "y":4.25}, + {"matrix":[4,7], "x":11.5, "y":4.25}, + {"matrix":[4,8], "x":12.5, "y":4.25}, + {"matrix":[4,9], "x":13.5, "y":4.25}, + {"matrix":[4,10], "x":14.5, "y":4.25}, + {"matrix":[4,11], "x":15.5, "y":4.25}, + {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75}, + {"matrix":[4,14], "x":18.5, "y":4.5}, + + {"matrix":[5,15], "x":0, "y":5.25, "w":2}, + {"matrix":[5,17], "x":2, "y":5.25}, + {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25}, + {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25}, + {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25}, + {"matrix":[5,6], "x":8, "y":5.25, "w":6.25}, + {"matrix":[5,9], "x":14.25, "y":5.25}, + {"matrix":[5,10], "x":15.25, "y":5.25}, + {"matrix":[5,11], "x":16.25, "y":5.25}, + {"matrix":[5,12], "x":17.5, "y":5.5}, + {"matrix":[5,13], "x":18.5, "y":5.5}, + {"matrix":[5,14], "x":19.5, "y":5.5} + ] + } + } +} diff --git a/keyboards/keychron/q12/iso_encoder/iso_encoder.c b/keyboards/keychron/q12/iso_encoder/iso_encoder.c new file mode 100644 index 000000000000..8090649d3304 --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/iso_encoder.c @@ -0,0 +1,173 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE + +const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + // {0, I_1, G_1, H_1} + {0, I_2, G_2, H_2}, // F13 + {0, I_3, G_3, H_3}, // F14 + {0, I_4, G_4, H_4}, // F15 + {0, I_5, G_5, H_5}, // Esc + {0, I_6, G_6, H_6}, // F1 + {0, I_7, G_7, H_7}, // F2 + {0, I_8, G_8, H_8}, // F3 + {0, I_9, G_9, H_9}, // F4 + {0, I_10, G_10, H_10}, // F5 + {0, I_11, G_11, H_11}, // F6 + {0, I_12, G_12, H_12}, // F7 + {0, I_13, G_13, H_13}, // F8 + {0, I_14, G_14, H_14}, // F9 + {0, I_15, G_15, H_15}, // F10 + {0, I_16, G_16, H_16}, // F11 + {0, L_16, J_16, K_16}, // F12 + {0, L_15, J_15, K_15}, // DEL + {0, L_14, J_14, K_14}, // Light + + + {0, C_1, A_1, B_1}, // num_lock + {0, C_2, A_2, B_2}, // / + {0, C_3, A_3, B_3}, // * + {0, C_4, A_4, B_4}, // - + {0, C_5, A_5, B_5}, // ~` + {0, C_6, A_6, B_6}, // 1! + {0, C_7, A_7, B_7}, // 2@ + {0, C_8, A_8, B_8}, // 3# + {0, C_9, A_9, B_9}, // 4$ + {0, C_10, A_10, B_10}, // 5% + {0, C_11, A_11, B_11}, // 6^ + {0, C_12, A_12, B_12}, // 7& + {0, C_13, A_13, B_13}, // 8* + {0, C_14, A_14, B_14}, // 9( + {0, C_15, A_15, B_15}, // 0) + {0, C_16, A_16, B_16}, // -_ + {0, L_13, J_13, K_13}, // =+ + {0, L_12, J_12, K_12}, // BackSpace + {0, L_11, J_11, K_11}, // PgUp + + {0, F_1, D_1, E_1}, // 7 + {0, F_2, D_2, E_2}, // 8 + {0, F_3, D_3, E_3}, // 9 + {0, F_4, D_4, E_4}, // + + {0, F_5, D_5, E_5}, // TAB + {0, F_6, D_6, E_6}, // Q + {0, F_7, D_7, E_7}, // W + {0, F_8, D_8, E_8}, // E + {0, F_9, D_9, E_9}, // R + {0, F_10, D_10, E_10}, // T + {0, F_11, D_11, E_11}, // Y + {0, F_12, D_12, E_12}, // U + {0, F_13, D_13, E_13}, // I + {0, F_14, D_14, E_14}, // O + {0, F_15, D_15, E_15}, // P + {0, F_16, D_16, E_16}, // [ + {0, L_10, J_10, K_10}, // ] + // {0, L_9, J_9, K_9}, // \| + {0, L_8, J_8, K_8}, // PgDn + + {1, C_16, A_16, B_16}, // 4 + {1, C_15, A_15, B_15}, // 5 + {1, C_14, A_14, B_14}, // 6 + // {0, F_4, D_4, E_4}, // + + {1, C_12, A_12, B_12}, // CapsLock + {1, C_11, A_11, B_11}, // A + {1, C_10, A_10, B_10}, // S + {1, C_9, A_9, B_9}, // D + {1, C_8, A_8, B_8}, // F + {1, C_7, A_7, B_7}, // G + {1, C_6, A_6, B_6}, // H + {1, C_5, A_5, B_5}, // J + {1, C_4, A_4, B_4}, // k + {1, C_3, A_3, B_3}, // l + {1, C_2, A_2, B_2}, // ； + {1, C_1, A_1, B_1}, // ' + {1, L_1, J_1, K_1}, // #~ + {0, L_9, J_9, K_9}, // Enter + {1, L_2, J_2, K_2}, // Home + + {1, I_16, G_16, H_16}, // 1 + {1, I_15, G_15, H_15}, // 2 + {1, I_14, G_14, H_14}, // 3 + {1, I_13, G_13, H_13}, // Enter + {1, I_12, G_12, H_12}, //Shift_L + {1, I_11, G_11, H_11}, // | + {1, I_10, G_10, H_10}, // Z + {1, I_9, G_9, H_9}, // X + {1, I_8, G_8, H_8}, // C + {1, I_7, G_7, H_7}, // V + {1, I_6, G_6, H_6}, // B + {1, I_5, G_5, H_5}, // N + {1, I_4, G_4, H_4}, // M + {1, I_3, G_3, H_3}, // , + {1, I_2, G_2, H_2}, // . + {1, I_1, G_1, H_1}, // ? + {1, L_3, J_3, K_3}, // Shift_R + {1, L_4, J_4, K_4}, // Up + + {1, F_16, D_16, E_16}, // 0 + {1, F_14, D_14, E_14}, // . + {1, F_12, D_12, E_12}, // Ctrl_L + {1, F_11, D_11, E_11}, // Win_L + {1, F_10, D_10, E_10}, // Alt_L + {1, F_6, D_6, E_6}, // Space + {1, F_3, D_3, E_3}, // Alt_R + {1, F_2, D_2, E_2}, // Fn + {1, F_1, D_1, E_1}, // Ctrl_R + {1, L_5, J_5, K_5}, // Left + {1, L_6, J_6, K_6}, // Down + {1, L_7, J_7, K_7}, // Right +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, __, 0, 1 }, + { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 18, 19, 20 }, + { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 71, 54, 37, 38, 39 }, + { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 76, 70, 72, 55, 56, 57 }, + { 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, __, 89, 90, 73, 74, 75 }, + { 93, 94, 95, __, __, 21, 96, 40, __, 97, 98, 99, 100, 101, 102, 91, 2, 92 }, + }, + { + // LED Index to Physical Position + {11,0}, {23,0}, {34,0}, {49,0}, {63,0}, {75,0}, {86,0}, {98,0}, {112,0}, {123,0}, {135,0}, {146,0}, {160,0}, {172,0}, {183,0}, {194,0}, {209,0}, {224,0}, + {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15}, {106,15}, {117,15}, {129,15}, {140,15}, {152,15}, {163,15}, {175,15}, {186,15}, {204,15}, {224,15}, + {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {77,26}, {89,26}, {100,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {180,26}, {192,26}, {224,26}, + {0,38}, {11,38}, {23,38}, {53,38}, {69,38}, {80,38}, {92,38}, {103,38}, {115,38}, {126,38}, {137,38}, {149,38}, {160,38}, {172,38}, {183,38}, {195,38}, {210,34}, {224,38}, + {0,49}, {11,49}, {23,49}, {34,55}, {50,49}, {63,49}, {75,49}, {86,49}, {97,49}, {109,49}, {120,49}, {132,49}, {143,49}, {155,49}, {166,49}, {177,49}, {193,49}, {212,52}, + {6,61}, {23,61}, {50,61}, {65,61}, {79,61}, {122,61}, {163,61}, {174,61}, {186,61}, {201,64}, {212,64}, {223,64}, + }, + { + // RGB LED Index to Flag + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1, + } +}; +#endif diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c new file mode 100644 index 000000000000..93c94fc13b56 --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include QMK_KEYBOARD_H + +// clang-format off + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_iso_104( + KC_MUTE, KC_F13, KC_F14, KC_F15, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_FN] = LAYOUT_iso_104( + RGB_TOG, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_BASE] = LAYOUT_iso_104( + KC_MUTE, _______, _______, _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_FN] = LAYOUT_iso_104( + RGB_TOG, _______, _______, _______, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q12/iso_encoder/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c new file mode 100644 index 000000000000..ff4d369757fb --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c @@ -0,0 +1,80 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +// clang-format off + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_iso_104( + KC_MUTE, KC_F13, KC_F14, KC_F15, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_FN] = LAYOUT_iso_104( + RGB_TOG, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_BASE] = LAYOUT_iso_104( + KC_MUTE, _______, _______, _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_FN] = LAYOUT_iso_104( + RGB_TOG, _______, _______, _______, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +// clang-format on + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif + +void housekeeping_task_user(void) { + housekeeping_task_keychron(); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q12/iso_encoder/keymaps/keychron/rules.mk new file mode 100644 index 000000000000..9cf1a9b56cba --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/keymaps/keychron/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes + +VPATH += keyboards/keychron/common +SRC += keychron_common.c diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c new file mode 100644 index 000000000000..93c94fc13b56 --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include QMK_KEYBOARD_H + +// clang-format off + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_iso_104( + KC_MUTE, KC_F13, KC_F14, KC_F15, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_FN] = LAYOUT_iso_104( + RGB_TOG, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_BASE] = LAYOUT_iso_104( + KC_MUTE, _______, _______, _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_MOD, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_P0, KC_PDOT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_FN] = LAYOUT_iso_104( + RGB_TOG, _______, _______, _______, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q12/iso_encoder/keymaps/via/rules.mk new file mode 100644 index 000000000000..f1adcab005e8 --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk new file mode 100644 index 000000000000..f76ec9b08d5e --- /dev/null +++ b/keyboards/keychron/q12/iso_encoder/rules.mk @@ -0,0 +1,27 @@ +# Build Options +# change yes to no to disable. +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable USB N-key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes # Enable Encoder +DIP_SWITCH_ENABLE = yes +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = CKLED2001 +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = embedded_flash + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE + +# custom matrix setup +CUSTOM_MATRIX = lite + +VPATH ?= keyboards/keychron/common +SRC += matrix.c diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c new file mode 100644 index 000000000000..8229517fd9ce --- /dev/null +++ b/keyboards/keychron/q12/matrix.c @@ -0,0 +1,208 @@ +/* Copyright 2022 @ Keychron (https://www.keychron.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 . + */ + +#include "matrix.h" +#include "quantum.h" + +// Pin connected to DS of 74HC595 +#define DATA_PIN C15 +// Pin connected to SH_CP of 74HC595 +#define CLOCK_PIN A1 +// Pin connected to ST_CP of 74HC595 +#define LATCH_PIN A0 + +#ifdef MATRIX_ROW_PINS +static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +#endif // MATRIX_ROW_PINS +#ifdef MATRIX_COL_PINS +static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; +#endif // MATRIX_COL_PINS + +#define ROWS_PER_HAND (MATRIX_ROWS) + +static inline void setPinOutput_writeLow(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + setPinOutput(pin); + writePinLow(pin); + } +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + setPinOutput(pin); + writePinHigh(pin); + } +} + +static inline void setPinInputHigh_atomic(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + setPinInputHigh(pin); + } +} + +static inline uint8_t readMatrixPin(pin_t pin) { + if (pin != NO_PIN) { + return readPin(pin); + } else { + return 1; + } +} + +static void shiftOut(uint8_t dataOut) { + for (uint8_t i = 0; i < 8; i++) { + if (dataOut & 0x1) { + setPinOutput_writeHigh(DATA_PIN); + } else { + setPinOutput_writeLow(DATA_PIN); + } + dataOut = dataOut >> 1; + setPinOutput_writeHigh(CLOCK_PIN); + setPinOutput_writeLow(CLOCK_PIN); + } + setPinOutput_writeHigh(LATCH_PIN); + setPinOutput_writeLow(LATCH_PIN); +} + +static void shiftout_single(uint8_t data) { + if (data & 0x1) { + setPinOutput_writeHigh(DATA_PIN); + } else { + setPinOutput_writeLow(DATA_PIN); + } + setPinOutput_writeHigh(CLOCK_PIN); + setPinOutput_writeLow(CLOCK_PIN); + + setPinOutput_writeHigh(LATCH_PIN); + setPinOutput_writeLow(LATCH_PIN); +} + +static bool select_col(uint8_t col) { + pin_t pin = col_pins[col]; + + if (pin != NO_PIN) { + setPinOutput_writeLow(pin); + return true; + } else { + if (col == 10) { + shiftout_single(0x00); + } else { + shiftout_single(0x01); + } + return true; + } + return false; +} + +static void unselect_col(uint8_t col) { + pin_t pin = col_pins[col]; + + if (pin != NO_PIN) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(pin); +#else + setPinInputHigh_atomic(pin); +#endif + } else { + if (col == (MATRIX_COLS - 1)) + setPinOutput_writeHigh(CLOCK_PIN); + setPinOutput_writeLow(CLOCK_PIN); + setPinOutput_writeHigh(LATCH_PIN); + setPinOutput_writeLow(LATCH_PIN); + } +} + +static void unselect_cols(void) { + // unselect column pins + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + pin_t pin = col_pins[x]; + if (pin != NO_PIN) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(pin); +#else + setPinInputHigh_atomic(pin); +#endif + } + if (x == 10) + // unselect shift Register + shiftOut(0xFF); + } +} + +static void matrix_init_pins(void) { + unselect_cols(); + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + if (row_pins[x] != NO_PIN) { + setPinInputHigh_atomic(row_pins[x]); + } + } +} + +static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + bool key_pressed = false; + + // Select col + if (!select_col(current_col)) { // select col + return; // skip NO_PIN col + } + + if (current_col < 10) { + matrix_output_select_delay(); + } else { + for (int8_t cycle = 4; cycle > 0; cycle--) { + matrix_output_select_delay(); // 0.25us + matrix_output_select_delay(); + matrix_output_select_delay(); + matrix_output_select_delay(); + } + } + + // For each row... + for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) { + // Check row pin state + if (readMatrixPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_matrix[row_index] |= row_shifter; + key_pressed = true; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // // Unselect col + unselect_col(current_col); + matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH +} + +void matrix_init_custom(void) { + // initialize key pins + matrix_init_pins(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t curr_matrix[MATRIX_ROWS] = {0}; + + // Set col, read rows + matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) { + matrix_read_rows_on_col(curr_matrix, current_col, row_shifter); + } + + bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0; + if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix)); + + return changed; +} diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/keychron/q12/mcuconf.h similarity index 77% rename from keyboards/qpockets/eggman/config.h rename to keyboards/keychron/q12/mcuconf.h index eac213400ab6..0ca8c64850f4 100644 --- a/keyboards/qpockets/eggman/config.h +++ b/keyboards/keychron/q12/mcuconf.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Alan Lehners +/* Copyright 2020 QMK * * 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 @@ -13,13 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#pragma once - -#define MATRIX_ROW_PINS { C4, C5, C2, D0, B5, B6, D6 } -#define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 } +#pragma once +#include_next -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/keychron/q12/q12.c b/keyboards/keychron/q12/q12.c new file mode 100644 index 000000000000..3d8eab56590b --- /dev/null +++ b/keyboards/keychron/q12/q12.c @@ -0,0 +1,93 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.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 . + */ + +#include "quantum.h" + +// clang-format off +const matrix_row_t matrix_mask[] = { + 0b111111111111111111, + 0b111111111111111111, + 0b111111111111111111, + 0b111111111111111111, + 0b111111111111111111, + 0b111111111111101111, +}; +// clang-format on +#ifdef DIP_SWITCH_ENABLE +bool dip_switch_update_kb(uint8_t index, bool active) { + if (!dip_switch_update_user(index, active)) { + return false; + } + if (index == 0) { + default_layer_set(1UL << (active ? 2 : 0)); + } + return true; +} +#endif + +#if defined(RGB_MATRIX_ENABLE) && (defined(CAPS_LOCK_LED_INDEX) || defined(NUM_LOCK_LED_INDEX)) +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + if (!rgb_matrix_is_enabled()) { + rgb_matrix_set_flags(LED_FLAG_ALL); + rgb_matrix_enable(); + } + return false; + } + return true; +} + +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue); +# if defined(CAPS_LOCK_LED_INDEX) + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0); + } + } +# endif // CAPS_LOCK_LED_INDEX +# if defined(NUM_LOCK_LED_INDEX) + if (host_keyboard_led_state().num_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 0, 0, 0); + } + } +# endif // NUM_LOCK_LED_INDEX + return true; +} +#endif diff --git a/keyboards/keychron/q12/readme.md b/keyboards/keychron/q12/readme.md new file mode 100644 index 000000000000..be9ec6f3e81a --- /dev/null +++ b/keyboards/keychron/q12/readme.md @@ -0,0 +1,19 @@ +# Keychron Q12 + +A customizable 96% keyboard. + +* Keyboard Maintainer: [Keychron](https://github.com/keychron) +* Hardware Supported: Keychron Q12 +* Hardware Availability: [Keychron](https://www.keychron.com) + +Make example for this keyboard (after setting up your build environment): + + make keychron/q12/q12_ansi_stm32l432:default + +Flashing example for this keyboard: + + make keychron/q12/q12_ansi_stm32l432:default:flash + +**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/info.json index e2b2d4305aa2..a864057a1c2b 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/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json index a2aea088293d..f82af456ff59 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 3d273e8aec50..47ad655ddc5b 100644 --- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c +++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c @@ -2,7 +2,6 @@ #include #include #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 ce81aa7d273a..58dcfde46da6 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.c +++ b/keyboards/lfkeyboards/lfk87/lfk87.c @@ -3,7 +3,6 @@ #include #include #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 f435f556778d..adccd8c2787c 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -3,7 +3,6 @@ #include #include #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 858305244a71..a1d9f61284ae 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 . #include #include #include "smk65.h" -#include "keymap.h" #include "debug.h" #include "issi.h" #include "TWIlib.h" diff --git a/keyboards/jian/handwired/config.h b/keyboards/lily58/keymaps/mb_via/config.h similarity index 75% rename from keyboards/jian/handwired/config.h rename to keyboards/lily58/keymaps/mb_via/config.h index d968a5bf9346..bd4e11fb0e61 100644 --- a/keyboards/jian/handwired/config.h +++ b/keyboards/lily58/keymaps/mb_via/config.h @@ -1,6 +1,9 @@ /* +This is the c configuration file for the keymap + Copyright 2012 Jun Wako Copyright 2015 Jack Humbert +Copyright 2023 Elliot Powell 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,11 +18,15 @@ 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 . */ + #pragma once +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS -#define DIODE_DIRECTION COL2ROW +#define TAPPING_FORCE_HOLD +#define TAPPING_TERM 100 -// 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/lily58/keymaps/mb_via/keymap.c b/keyboards/lily58/keymaps/mb_via/keymap.c new file mode 100644 index 000000000000..cef682db533e --- /dev/null +++ b/keyboards/lily58/keymaps/mb_via/keymap.c @@ -0,0 +1,121 @@ + /* Copyright 2020 Naoki Katahira + * Copyright 2023 Elliot Powell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +enum layer_number { + _QWERTY = 0, + _LOWER, + _RAISE, + _ADJUST, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ~ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | + * | | | |/ / \ \ | | | | + * `-------------------''-------' '------''--------------------' + */ + + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + LOWER, KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_BSPC, KC_RGUI, RAISE +), +/* LOWER + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | 1 | 2 | 3 | 4 | 5 |-------. ,-------| 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | | ` | + | { | } | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | + * | | | |/ / \ \ | | | | + * `-------------------''-------' '------''--------------------' + */ +[_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, + _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_GRAVE, KC_PLUS, KC_LCBR, KC_RCBR, _______, + _______, _______, _______, _______, _______, _______, _______, _______ +), +/* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |RGBTOG|RGBHUI|RGBSAI|RGBVAI| |-------. ,-------| | Left | Down | Up |Right | | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |RGBMOD|RGBHUD|RGBSAD|RGBVAD| | |-------| |-------| + | = | [ | ] | \ | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | + * | | | |/ / \ \ | | | | + * `-------------------''-------' '------''--------------------' + */ + +[_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, KC_PLUS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, + _______, _______, _______, _______, _______, _______, _______, _______ +), + +/* ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | |-------. ,-------| | | | | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + + diff --git a/keyboards/lily58/keymaps/mb_via/rules.mk b/keyboards/lily58/keymaps/mb_via/rules.mk new file mode 100644 index 000000000000..d3528d52a1a2 --- /dev/null +++ b/keyboards/lily58/keymaps/mb_via/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 +MOUSEKEY_ENABLE = yes +EXTRAKEY_ENABLE = yes diff --git a/keyboards/lily58/r2g/config.h b/keyboards/lily58/r2g/config.h new file mode 100644 index 000000000000..1d857ce696ae --- /dev/null +++ b/keyboards/lily58/r2g/config.h @@ -0,0 +1,57 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 F_YUUCHI +Copyright 2023 Elliot Powell + +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 . +*/ + +#pragma once +//#define SERIAL_USE_MULTI_TRANSACTION + + +#ifdef RGB_MATRIX_ENABLE +# define RGB_DI_PIN D3 +# define RGB_MATRIX_LED_COUNT 74 +# define RGB_DISABLE_WHEN_USB_SUSPENDED +# define RGB_MATRIX_LED_FLUSH_LIMIT 16 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_KEYRELEASES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS + + +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON + +#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_MULTISPLASH +#endif + +# define SPLIT_TRANSPORT_MIRROR +#endif + +#ifdef RGBLIGHT_ENABLE +# define RGBLIGHT_LIMIT_VAL 120 +#endif + diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json new file mode 100644 index 000000000000..909cc78f18e3 --- /dev/null +++ b/keyboards/lily58/r2g/info.json @@ -0,0 +1,118 @@ +{ + "keyboard_name": "Lily58 R2G", + "manufacturer": "Mechboards UK", + "url": "", + "maintainer": "Elliot Powell", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "oled": true, + "rgb_matrix": true + }, + "usb": { + "vid": "0x04D8", + "pid": "0xEB2E", + "device_version": "1.0.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["C6", "D7", "E6", "B4", "B5"], + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "split": { + "enabled": true, + "soft_serial_pin": "D2" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x":0, "y":0.5}, {"matrix": [0, 1], "x":1, "y":0.375}, {"matrix": [0, 2], "x":2, "y":0.125}, {"matrix": [0, 3], "x":3, "y":0}, {"matrix": [0, 4], "x":4, "y":0.125}, {"matrix": [0, 5], "x":5, "y":0.25}, {"matrix": [5, 5], "x":10.5, "y":0.25}, {"matrix": [5, 4], "x":11.5, "y":0.125}, {"matrix": [5, 3], "x":12.5, "y":0}, {"matrix": [5, 2], "x":13.5, "y":0.125}, {"matrix": [5, 1], "x":14.5, "y":0.375}, {"matrix": [5, 0], "x":15.5, "y":0.5}, + {"matrix": [1, 0], "x":0, "y":1.5}, {"matrix": [1, 1], "x":1, "y":1.375}, {"matrix": [1, 2], "x":2, "y":1.125}, {"matrix": [1, 3], "x":3, "y":1}, {"matrix": [1, 4], "x":4, "y":1.125}, {"matrix": [1, 5], "x":5, "y":1.25}, {"matrix": [6, 5], "x":10.5, "y":1.25}, {"matrix": [6, 4], "x":11.5, "y":1.125}, {"matrix": [6, 3], "x":12.5, "y":1}, {"matrix": [6, 2], "x":13.5, "y":1.125}, {"matrix": [6, 1], "x":14.5, "y":1.375}, {"matrix": [6, 0], "x":15.5, "y":1.5}, + {"matrix": [2, 0], "x":0, "y":2.5}, {"matrix": [2, 1], "x":1, "y":2.375}, {"matrix": [2, 2], "x":2, "y":2.125}, {"matrix": [2, 3], "x":3, "y":2}, {"matrix": [2, 4], "x":4, "y":2.125}, {"matrix": [2, 5], "x":5, "y":2.25}, {"matrix": [7, 5], "x":10.5, "y":2.25}, {"matrix": [7, 4], "x":11.5, "y":2.125}, {"matrix": [7, 3], "x":12.5, "y":2}, {"matrix": [7, 2], "x":13.5, "y":2.125}, {"matrix": [7, 1], "x":14.5, "y":2.375}, {"matrix": [7, 0], "x":15.5, "y":2.5}, + {"matrix": [3, 0], "x":0, "y":3.5}, {"matrix": [3, 1], "x":1, "y":3.375}, {"matrix": [3, 2], "x":2, "y":3.125}, {"matrix": [3, 3], "x":3, "y":3}, {"matrix": [3, 4], "x":4, "y":3.125}, {"matrix": [3, 5], "x":5, "y":3.25}, {"matrix": [4, 5], "x":6, "y":2.75}, {"matrix": [9, 5], "x":9.5, "y":2.75}, {"matrix": [8, 5], "x":10.5, "y":3.25}, {"matrix": [8, 4], "x":11.5, "y":3.125}, {"matrix": [8, 3], "x":12.5, "y":3}, {"matrix": [8, 2], "x":13.5, "y":3.125}, {"matrix": [8, 1], "x":14.5, "y":3.375}, {"matrix": [8, 0], "x":15.5, "y":3.5}, + {"matrix": [4, 1], "x":2.5,"y":4.125},{"matrix": [4, 2], "x":3.5, "y":4.15},{"matrix": [4, 3], "x":4.5,"y":4.25},{"matrix": [4, 4], "x":6, "y":4.25, "h":1.5}, {"matrix": [9, 4], "x":9.5, "y":4.25, "h":1.5}, {"matrix": [9, 3], "x":11, "y":4.25}, {"matrix": [9, 2], "x":12, "y":4.15}, {"matrix": [9, 1], "x":13, "y":4.15} + ] + } + }, + "rgb_matrix": { + "driver": "WS2812", + "split_count": [37, 37], + "layout": [ + {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06 + {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05 + {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04 + {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03 + {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02 + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01 + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07 + {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08 + {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09 + {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10 + {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11 + {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12 + {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18 + {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17 + {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16 + {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15 + {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14 + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13 + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20 + {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21 + {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22 + {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23 + {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24 + {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25 + {"flags": 4, "matrix": [4, 5], "x": 87, "y": 41}, + {"flags": 4, "matrix": [4, 4], "x": 87, "y": 64}, + {"flags": 4, "matrix": [4, 3], "x": 65, "y": 64}, + {"flags": 4, "matrix": [4, 2], "x": 51, "y": 62}, + {"flags": 4, "matrix": [4, 1], "x": 36, "y": 62}, + {"flags": 2, "x": 96, "y": 64}, // L RGB1 + {"flags": 2, "x": 32, "y": 64}, // L RGB2 + {"flags": 2, "x": 0, "y": 64}, // L RGB3 + {"flags": 2, "x": 0, "y": 32}, // L RGB4 + {"flags": 2, "x": 16, "y": 0}, // L RGB5 + {"flags": 2, "x": 50, "y": 0}, // L RGB6 + {"flags": 2, "x": 80, "y": 0}, // L RGB7 + {"flags": 2, "x": 96, "y": 32}, // L RGB8 + {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06 + {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05 + {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04 + {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03 + {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02 + {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01 + {"flags": 4, "matrix": [6, 0], "x": 224, "y": 23}, // R SW07 + {"flags": 4, "matrix": [6, 1], "x": 210, "y": 21}, // R SW08 + {"flags": 4, "matrix": [6, 2], "x": 195, "y": 17}, // R SW09 + {"flags": 4, "matrix": [6, 3], "x": 181, "y": 15}, // R SW10 + {"flags": 4, "matrix": [6, 4], "x": 166, "y": 17}, // R SW11 + {"flags": 4, "matrix": [6, 5], "x": 152, "y": 19}, // R SW12 + {"flags": 4, "matrix": [7, 5], "x": 152, "y": 34}, // R SW18 + {"flags": 4, "matrix": [7, 4], "x": 166, "y": 32}, // R SW17 + {"flags": 4, "matrix": [7, 3], "x": 181, "y": 30}, // R SW16 + {"flags": 4, "matrix": [7, 2], "x": 195, "y": 32}, // R SW15 + {"flags": 4, "matrix": [7, 1], "x": 210, "y": 36}, // R SW14 + {"flags": 4, "matrix": [7, 0], "x": 224, "y": 38}, // R SW13 + {"flags": 4, "matrix": [8, 0], "x": 224, "y": 53}, // R SW20 + {"flags": 4, "matrix": [8, 1], "x": 210, "y": 51}, // R SW21 + {"flags": 4, "matrix": [8, 2], "x": 195, "y": 47}, // R SW22 + {"flags": 4, "matrix": [8, 3], "x": 181, "y": 45}, // R SW23 + {"flags": 4, "matrix": [8, 4], "x": 166, "y": 47}, // R SW24 + {"flags": 4, "matrix": [8, 5], "x": 152, "y": 49}, // R SW25 + {"flags": 4, "matrix": [9, 5], "x": 137, "y": 41}, + {"flags": 4, "matrix": [9, 4], "x": 137, "y": 64}, + {"flags": 4, "matrix": [9, 3], "x": 159, "y": 64}, + {"flags": 4, "matrix": [9, 2], "x": 173, "y": 62}, + {"flags": 4, "matrix": [9, 1], "x": 188, "y": 62}, + {"flags": 2, "x": 128, "y": 64}, // R RGB1 + {"flags": 2, "x": 192, "y": 64}, // R RGB2 + {"flags": 2, "x": 224, "y": 64}, // R RGB3 + {"flags": 2, "x": 224, "y": 32}, // R RGB4 + {"flags": 2, "x": 206, "y": 0}, // R RGB5 + {"flags": 2, "x": 150, "y": 0}, // R RGB6 + {"flags": 2, "x": 140, "y": 0}, // R RGB7 + {"flags": 2, "x": 128, "y": 32} // R RGB8 + ] + } +} diff --git a/keyboards/lily58/r2g/r2g.c b/keyboards/lily58/r2g/r2g.c new file mode 100644 index 000000000000..813d855029ba --- /dev/null +++ b/keyboards/lily58/r2g/r2g.c @@ -0,0 +1,169 @@ +/* Copyright 2023 Elliot Powell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + + +#ifdef OLED_ENABLE + +oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + if (!is_keyboard_master()) { + return OLED_ROTATION_180; // flips the display 180 degrees if offhand + } + return rotation; +} + + +void oled_render_layer_state_r2g(void) { + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_ln_P(PSTR("Default"), false); + break; + case 1: + oled_write_ln_P(PSTR("Lower"), false); + break; + case 2: + oled_write_ln_P(PSTR("Raise"), false); + break; + case 3: + oled_write_ln_P(PSTR("Adjust"), false); + break; + default: + oled_write_ln_P(PSTR("Unknown"), false); + break; + } +} + +//char keylog_str_r2g[24] = {}; + +const char code_to_name_r2g[60] = { + ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', + 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', + 'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\', + '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '}; + +char key_name_r2g = ' '; +uint16_t last_keycode_r2g; +uint8_t last_row_r2g; +uint8_t last_col_r2g; + +void set_keylog_r2g(uint16_t keycode, keyrecord_t *record) { + key_name_r2g = ' '; + last_keycode_r2g = keycode; + if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || + (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { last_keycode_r2g = keycode & 0xFF; } + if (keycode < 60) { + key_name_r2g = code_to_name_r2g[keycode]; + } + last_row_r2g = record->event.key.row; + last_col_r2g = record->event.key.col; +} + +const char *depad_str(const char *depad_str, char depad_char) { + while (*depad_str == depad_char) ++depad_str; + return depad_str; +} + +void oled_render_keylog_r2g(void) { + //oled_write(keylog_str_r2g, false); + const char *last_row_r2g_str = get_u8_str(last_row_r2g, ' '); + oled_write(depad_str(last_row_r2g_str, ' '), false); + oled_write_P(PSTR("x"), false); + const char *last_col_r2g_str = get_u8_str(last_col_r2g, ' '); + oled_write(depad_str(last_col_r2g_str, ' '), false); + oled_write_P(PSTR(", k"), false); + const char *last_keycode_r2g_str = get_u16_str(last_keycode_r2g, ' '); + oled_write(depad_str(last_keycode_r2g_str, ' '), false); + oled_write_P(PSTR(":"), false); + oled_write_char(key_name_r2g, false); +} + +void render_bootmagic_status_r2g(bool status) { + /* Show Ctrl-Gui Swap options */ + static const char PROGMEM logo[][2][3] = { + {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}, + {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, + }; + if (status) { + oled_write_ln_P(logo[0][0], false); + oled_write_ln_P(logo[0][1], false); + } else { + oled_write_ln_P(logo[1][0], false); + oled_write_ln_P(logo[1][1], false); + } +} + +void oled_render_logo_r2g(void) { + static const char PROGMEM mb_logo[] = { +0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f, +0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x83, 0x83, 0x83, 0x83, 0x83, 0xff, 0xff, +0x83, 0x83, 0x83, 0x83, 0xff, 0xff, 0x83, 0x83, 0x83, 0x83, 0x83, 0xff, 0xff, 0x83, 0x83, 0x83, +0x83, 0xff, 0xff, 0x83, 0x83, 0x83, 0x83, 0x83, 0xff, 0xff, 0xff, 0xff, 0x82, 0x82, 0x82, 0x82, +0x82, 0xff, 0xff, 0x83, 0x83, 0x83, 0x83, 0xff, 0xff, 0x83, 0x83, 0x83, 0x83, 0x83, 0xff, 0xff, +0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfc, 0xfc, +0x9c, 0x9c, 0xfc, 0xfc, 0xf8, 0xf8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78, 0x7c, 0x3c, +0x9c, 0xfc, 0xfc, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0x3c, 0x3c, +0x9c, 0xbc, 0xfc, 0xb8, 0xb8, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x41, 0x41, 0x41, 0x41, 0x41, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x41, 0x41, 0x41, 0x41, 0x41, 0xff, 0xff, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0x41, 0x41, 0x41, 0x41, 0x41, 0xff, 0xff, 0xff, 0xff, 0x41, 0x41, 0x41, 0x41, +0x41, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0x41, 0x41, 0x41, 0x41, 0x41, 0xff, 0xff, +0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, +0x03, 0x07, 0x0f, 0x3f, 0x3f, 0x3e, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x3c, 0x3e, 0x3f, +0x3f, 0x3f, 0x3b, 0x39, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x1f, 0x3f, 0x3c, 0x38, +0x3b, 0x3b, 0x3f, 0x1f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, +0xf0, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, +0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + oled_write_raw_P(mb_logo, sizeof(mb_logo)); + //oled_set_cursor(oled_max_chars()/2,oled_max_lines()/2); + //oled_write_P(PSTR("R2G"), false); +} + +bool oled_task_kb(void) { + if (!oled_task_user()) { return false; } + if (is_keyboard_master()) { + oled_render_layer_state_r2g(); + oled_render_keylog_r2g(); + } else { + oled_render_logo_r2g(); + } + return false; +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + set_keylog_r2g(keycode, record); + } + return process_record_user(keycode, record); +} +#endif // OLED_ENABLE diff --git a/keyboards/lily58/r2g/readme.md b/keyboards/lily58/r2g/readme.md new file mode 100644 index 000000000000..ad48dcfbd208 --- /dev/null +++ b/keyboards/lily58/r2g/readme.md @@ -0,0 +1,27 @@ +# Lily58 R2G + +Lily58 R2G is factory assembled version of the lilly 58 featuring hotswap and perkey rgb + +![Lily58_R2G](https://i.imgur.com/4vPkIQ5.png) +Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23) +Hardware Supported: Lily58 R2G PCB +Hardware Availability: [Mechboards UK](https://mechboards.co.uk/products/lily58-r2g-ready2go-kit) + +Make example for this keyboard (after setting up your build environment): +```sh +make crkbd/r2g:mb_via +``` + +Flash example for this keyboard: +```sh +make crkbd/r2g:mb_via:flash +``` + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +These PCBs have a reset on the underside of the PCB next to the controller which may be pressed to enter in to the bootloader. + +Additionally, if you hold down the "ESC" or "GRV" buttons when plugging in that half of the keyboard (per the default QWERTY layout), this will jump to the bootloader and reset the EEPROM (persistent storage). + diff --git a/keyboards/lily58/r2g/rules.mk b/keyboards/lily58/r2g/rules.mk new file mode 100644 index 000000000000..4da205a168c7 --- /dev/null +++ b/keyboards/lily58/r2g/rules.mk @@ -0,0 +1 @@ +LTO_ENABLE = yes diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json index 4abcb323a425..f501b5e52ce7 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 70c22a5dd207..735ba9272d80 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/masterworks/classy_tkl/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json index 5a3c567bc9fa..89f227fbf795 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 12d53bb0f6a6..62a97029531b 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 9db0307940a1..93827a1a6495 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 ae12912f00a3..ba389e31f15b 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/moonlander/keymaps/drashna/keymap.c b/keyboards/moonlander/keymaps/drashna/keymap.c index e38a2828fea4..2f38ac790c3c 100644 --- a/keyboards/moonlander/keymaps/drashna/keymap.c +++ b/keyboards/moonlander/keymaps/drashna/keymap.c @@ -16,7 +16,9 @@ #include "drashna.h" -enum more_custom_keycodes { KC_SWAP_NUM = NEW_SAFE_RANGE }; +enum more_custom_keycodes { + KC_SWAP_NUM = USER_SAFE_RANGE, +}; // clang-format off #define LAYOUT_moonlander_wrapper(...) LAYOUT_moonlander(__VA_ARGS__) diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json index 23d5666a4dec..1e540bd58c29 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 e97d70bf3bdb..38a7b38e4ac7 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 3ac29f519ce7..fec7ac2fcb7a 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 4742e2f9bdd6..002c82f6b7f3 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 cf87e52e482d..5ba2551f4a76 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/pabile/p40/info.json b/keyboards/pabile/p40/info.json index 703a3b1f80f4..088b7ce32484 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 25a8b75f04fc..91b32a6c91b7 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 509d14b2648a..5ae3d5443b8c 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 cc57b6da6045..a4911b999e1c 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/thk/info.json b/keyboards/planck/thk/info.json index 50ee36da3bf3..418dda97dad5 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/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c index cf0b57d433bd..a249ebdfd985 100644 --- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c +++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c @@ -17,6 +17,8 @@ */ #include QMK_KEYBOARD_H +// safe range starts at `USER_SAFE_RANGE` instead. + // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( @@ -26,6 +28,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [1] = { ENCODER_CCW_CW( RGB_HUD, RGB_HUI ) }, +}; +#endif + #ifdef RGBLIGHT_ENABLE void eeconkfig_init_user(void) { rgblight_enable(); diff --git a/keyboards/ploopyco/trackball/readme.md b/keyboards/ploopyco/trackball/readme.md index 1648bd20f9b6..5c76f1018788 100644 --- a/keyboards/ploopyco/trackball/readme.md +++ b/keyboards/ploopyco/trackball/readme.md @@ -29,20 +29,17 @@ The PCB should indicate which revision this is. While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change. Such as adding DPI control, or to use the ball to scroll while holding a button. To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor. -The default behavior for this is: ```c -void process_wheel_user(report_mouse_t* mouse_report, int16_t h, int16_t v) { - mouse_report->h = h; - mouse_report->v = v; -} - -void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) { - mouse_report->x = x; - mouse_report->y = y; +report_mouse_t pointing_device_task_user(report_mouse_t mouse_report){ + // executed each time the sensor is updated + // mouse_report. - can be used to access indivdual mouse attributes + return mouse_report; } ``` +More information on `report_mouse_t` may be found [here](https://docs.qmk.fm/#/feature_pointing_device?id=manipulating-mouse-reports). + This should allow you to more heavily customize the behavior. Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality. diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json index 3cf2d0ca37ef..3b9404b401da 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 3e7955e193de..ba92bd897381 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/genone/g1_65/config.h b/keyboards/preonic/keymaps/guillermoap/config.h similarity index 52% rename from keyboards/genone/g1_65/config.h rename to keyboards/preonic/keymaps/guillermoap/config.h index 95e67a9d1225..d336623c0325 100644 --- a/keyboards/genone/g1_65/config.h +++ b/keyboards/preonic/keymaps/guillermoap/config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 GEN ONE LLC +/* Copyright 2023 Guillermo Aguirre * * 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 @@ -16,20 +16,30 @@ #pragma once +#ifdef AUDIO_ENABLE +# define STARTUP_SONG SONG(PREONIC_SOUND) +// #define STARTUP_SONG SONG(NO_SOUND) + +# define DEFAULT_LAYER_SONGS \ + { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) } +#endif + +#define MUSIC_MASK (keycode != KC_NO) /* - * 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) - * + * MIDI options + */ + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on */ -#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 +#define MIDI_BASIC +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED diff --git a/keyboards/preonic/keymaps/guillermoap/keymap.c b/keyboards/preonic/keymaps/guillermoap/keymap.c new file mode 100644 index 000000000000..fe17182111a8 --- /dev/null +++ b/keyboards/preonic/keymaps/guillermoap/keymap.c @@ -0,0 +1,215 @@ +/* Copyright 2023 Guillermo Aguirre + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "muse.h" + +enum preonic_layers { + _BASE, + _GAMING, + _LOWER, + _RAISE, + _CONFIG, +}; + +enum preonic_keycodes { + BASE = SAFE_RANGE, + GAMING, + LOWER, + RAISE, + CONFIG, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base + * ,------------------------------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |-------------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ | + * |-------------+------+------+------+------+-------------+------+------+------+------+------| + * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | + * |-------------+------+------+------+------+------|------+------+------+------+------+------| + * | HOLD Shift | Z | X | C | V | B | N | M | , | . | Up | / | + * | TOGGLE Caps | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------| + * | GUI | ` | Alt |Lower |Enter |Enter |Space |Space |Raise | Left | Down |Right | + * `------------------------------------------------------------------------------------------' + */ +[_BASE] = LAYOUT_preonic_grid( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + LSFT_T(KC_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH, + KC_LGUI, KC_GRV, LALT_T(KC_RALT), MO(2), KC_ENT, KC_ENT, KC_SPC, KC_SPC, MO(3), KC_LEFT, KC_DOWN, KC_RGHT +), + +/* Gaming + * ,-----------------------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | ` | A | S | D | F | G | H | J | K | L | ; | ' | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | Up | / | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | GUI | Alt |Lower |Space |Space |Enter |Enter |Raise | Left | Down |Right | + * `-----------------------------------------------------------------------------------' + */ +[_GAMING] = LAYOUT_preonic_grid( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_SPC, KC_ENT, KC_ENT, MO(3), KC_LEFT, KC_DOWN, KC_RGHT +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ▽ | ▽ | Mute |Vol + | Play | ▽ | ▽ | _ | + | { | } | \ | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | ▽ | ▽ | Prev |Vol - | Next | ▽ | ▽ | - | = | [ | ] | ▽ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | ▽ |CTRL_Z| ▽ |CTRL_C| ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ▽ | ▽ | ▽ | ▽ | ▽ |CONFIG| ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_preonic_grid( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS, + KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, + KC_TRNS, LCTL(KC_Z), KC_TRNS, LCTL(KC_C), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | { | } | Del | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ▽ | 6 | 7 | 8 | 9 | 0 | ▽ | ▽ | Up | [ | ] | ▽ | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Ctrl | 1 | 2 | 3 | 4 | 5 | ▽ | Left | Down |Right | ▽ | ▽ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | Home | End | PgUp |PgDown| ▽ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | GUI |PrntSc|R Alt | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_preonic_grid( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_DEL, + KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, KC_UP, KC_LBRC, KC_RBRC, KC_TRNS, + KC_LCTL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, + KC_RSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_TRNS, + KC_RGUI, KC_PSCR, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +), + +/* Config + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ▽ | Reset| Debug| ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | ▽ | ▽ | ▽ |Aud on|AudOff|CGnorm|CGswap| Base |Gaming| ▽ | ▽ | ▽ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | ▽ |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| ▽ | ▽ | ▽ | ▽ | ▽ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | ▽ | + * `-----------------------------------------------------------------------------------' + */ +[_CONFIG] = LAYOUT_preonic_grid( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, QK_BOOT, DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, + KC_TRNS, KC_TRNS, MU_MOD, AU_ON, AU_OFF, CG_NORM, CG_SWAP, DF(0), DF(1), KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +) +}; + +/* Encoder + * Currently using ENCONDER_MAP_ENABLE + */ +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }, // Mouse Scroll Down | Mouse Scroll Up + [_GAMING] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }, // Mouse Scroll Down | Mouse Scroll Up + [_LOWER] = { ENCODER_CCW_CW(LCTL(KC_TAB), LCTL(LSFT(KC_TAB))) }, // Ctrl + Tab | Ctrl + Shift + Tab + [_RAISE] = { ENCODER_CCW_CW(KC_MS_WH_LEFT, KC_MS_WH_RIGHT) }, // Mouse Scroll Left | Mouse Scroll Right + [_CONFIG] = { }, +}; +#endif + +/* Default music config + * Don't really understand what this does + */ +bool muse_mode = false; +uint8_t last_muse_note = 0; +uint16_t muse_counter = 0; +uint8_t muse_offset = 70; +uint16_t muse_tempo = 50; + +bool dip_switch_update_user(uint8_t index, bool active) { + switch (index) { + case 0: + if (active) { + layer_on(_CONFIG); + } else { + layer_off(_CONFIG); + } + break; + case 1: + if (active) { + muse_mode = true; + } else { + muse_mode = false; + } + } + return true; +} + + +void matrix_scan_user(void) { +#ifdef AUDIO_ENABLE + if (muse_mode) { + if (muse_counter == 0) { + uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; + if (muse_note != last_muse_note) { + stop_note(compute_freq_for_midi_note(last_muse_note)); + play_note(compute_freq_for_midi_note(muse_note), 0xF); + last_muse_note = muse_note; + } + } + muse_counter = (muse_counter + 1) % muse_tempo; + } else { + if (muse_counter) { + stop_all_notes(); + muse_counter = 0; + } + } +#endif +} + +bool music_mask_user(uint16_t keycode) { + switch (keycode) { + case RAISE: + case LOWER: + return false; + default: + return true; + } +} diff --git a/keyboards/preonic/keymaps/guillermoap/readme.md b/keyboards/preonic/keymaps/guillermoap/readme.md new file mode 100644 index 000000000000..290765233823 --- /dev/null +++ b/keyboards/preonic/keymaps/guillermoap/readme.md @@ -0,0 +1,33 @@ +# Preonic Double Spacebar HHKB layout mainly for programming +This layout is highly curated to my needs and what I like. I mainly use it for programming in macOS, but also gaming in Windows. + +The main concept behind every key position is to be able to maximize how many things I can do without lifting my hands from the home row. +## Layers +### Base +- Ctrl/Cmd is on the Caps Lock place (HHKB like) +- Enter and Space are in the double space bar +- Normal arrows position (not vim-like) +- Left Shift on hold - Caps Lock Toggle on tap +- Vertical scroll on encoder +### Gaming +- Switched Enter and Space to reach more easily when gaming +- Left Shift doesn't have Caps Lock toggle +- ` is in Ctrl space, mainly used for Push To Talk in games +### Lower +- Main programming symbols with right hand +- Media controls with left hand +- Full F1..F12 Function keys on number row +- Ctrl + C | Ctrl + Z Macros to avoid having to constantly press encoder +- Ctrl + Tab | Ctrl + Shift + Tab on encoder +### Raise +- Arrow keys on JKLI +- Home End PgUp PgDown on M,.Up +- Numbers on asdfgqwert +- Del on BackSpace +- Horizontal scroll on encoder +### Config +- Swap Ctrl and GUI on H so I have Cmd next to KC_A when on MacOS +- Unswap Ctrl and GUI on G so I have Ctrl next to KC_A when on Windows +- J switches to BASE layer +- K switches to GAMING layer +- Default Config for Preonic diff --git a/keyboards/preonic/keymaps/guillermoap/rules.mk b/keyboards/preonic/keymaps/guillermoap/rules.mk new file mode 100644 index 000000000000..da6657c8bdc9 --- /dev/null +++ b/keyboards/preonic/keymaps/guillermoap/rules.mk @@ -0,0 +1,3 @@ +SRC += muse.c +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index 8046f233e984..a392b7037514 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 eea6fcc076c2..67553a44320d 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 aed372df94d8..3e000db2d2c5 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/info.json b/keyboards/qpockets/eggman/info.json index 989402411db8..58d2975169b0 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 22c2bc73dee2..3caf7fdbcbe6 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 46cc42c2cb64..407a61d9eb10 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 26b85360c43f..53e42221c9ce 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 580ab0a4d523..aa99956be9b1 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 a811be9a74c0..000000000000 --- 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 . -*/ - -#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 94192139a428..07a4d7680230 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 b3a4bf279e1b..25ceace9656a 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 . #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 386ba4606753..6f6f5a598a11 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 bd74b09133e1..44c3746d29dd 100644 --- a/keyboards/quantrik/kyuu/config.h +++ b/keyboards/quantrik/kyuu/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 da19670161af..ea8b3da4fa4e 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 1ca7a3584954..feb0b654580d 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 57159669a4dc..fd152e40701c 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 b23030ad5ccb..d6945273efa5 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 c142c01b7ecc..82a280e5247f 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 a66ebdd550c6..4f45b2ba12c6 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 e5ec227c7e86..bf1cc9230f7a 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 3e3ce2b0a2da..74d8d069c769 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 c31a37325d57..0431f3bca6d9 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 18ed99750047..778fa5e07f2f 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 af8c81f9d2c5..d6dbb553eaf3 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 830b5364a5e9..7ba4700cde5c 100644 --- a/keyboards/qvex/lynepad/config.h +++ b/keyboards/qvex/lynepad/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #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 f2930137d26f..93d2a04323bb 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 4de51720eaa0..a15f35c44438 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 5a425f97a864..82a33a955921 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 346e51a15708..916485e60b5c 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 . #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 9f7664ea516a..5cfaaf5767dd 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 40eddea86f24..6561379dbe78 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 . #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 0e85073f59fc..399126e10b6a 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 5ea65094f9de..44ad35a7ca0f 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #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 df34cd9fa75e..ee6112972245 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/singa/info.json b/keyboards/singa/info.json index 3784c7232ae3..b41713f7098b 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/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index 723fe70fb95a..dae35f1dc61a 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/sofle/keymaps/michal/config.h b/keyboards/sofle/keymaps/michal/config.h index 6ab3602dfd99..0f326f7605a4 100644 --- a/keyboards/sofle/keymaps/michal/config.h +++ b/keyboards/sofle/keymaps/michal/config.h @@ -1,14 +1,8 @@ -// Copyright 2022 Michal S. (@ihatethefrench) -// SPDX-License-Identifier: GPL-2.0-only +// Copyright 2023 Michal S. (@not-my-segfault) +// SPDX-License-Identifier: GPL-3.0-only #pragma once -// Enables features such as octave changer, suspend, etc. -#define MIDI_ADVANCED - -// This autoshift delay feels most natural for me I think -#define AUTO_SHIFT_TIMEOUT 165 - // I don't use too many layers, so this is more than enough #define LAYER_STATE_8BIT diff --git a/keyboards/sofle/keymaps/michal/keymap.c b/keyboards/sofle/keymaps/michal/keymap.c index 9c89468a89da..49b70fd825e3 100644 --- a/keyboards/sofle/keymaps/michal/keymap.c +++ b/keyboards/sofle/keymaps/michal/keymap.c @@ -1,5 +1,5 @@ -// Copyright 2022 Michal S. (@ihatethefrench) -// SPDX-License-Identifier: GPL-2.0-only +// Copyright 2023 Michal S. (@not-my-segfault) +// SPDX-License-Identifier: GPL-3.0-only #include QMK_KEYBOARD_H @@ -7,20 +7,18 @@ enum sofle_layers { _WORKMAN, _QWERTY, - _MIDI, _LOWER, _RAISE, _ADJUST }; -// This specifies any custom keycodes I might have set enum custom_keycodes { KC_WORKMAN = SAFE_RANGE, KC_QWERTY, - KC_MIDI, KC_LOWER, KC_RAISE, - KC_ADJUST + KC_ADJUST, + KC_TOGGLE, }; // Here the keymaps are defined in matrix form using KC_XYZ form keycodes @@ -71,28 +69,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_LALT, KC_LCTL, KC_LOWER, KC_SPC, KC_ENT, KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI ), -/* MIDI - * ,-----------------------------------------. ,-----------------------------------------. - * | Pnic | OCT0 | OCT1 | OCT2 | OCT3 | OCT4 | | OCT5 | OCT6 | OCT7 | | | MTOG | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | |G#/Ab |Bb/A# | |C#/Db |D#/Eb | | |F#/Gb |G#/Ab |Bb/A# | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | A | B | C | D | E |-------. ,-------| F | G | A | B | C | Wkmn | - * |------+------+------+------+------+------| | | |------+------+------+------+------+------| - * | | | | | TNSD | TNSU |-------| |-------| BNDD | BNDU | | | | | - * `-----------------------------------------/ / \ \-----------------------------------------' - * | | | | Susd | /OCTDN / \OCTUP \ | | | | | - * | | | | |/ / \ \ | | | | | - * `----------------------------------' '------''---------------------------' - */ -[_MIDI] = LAYOUT( - MI_AOFF, MI_OC0, MI_OC1, MI_OC2, MI_OC3, MI_OC4, MI_OC5, MI_OC6, MI_OC7, _______, _______, MI_TOGG, - _______, MI_Gs, MI_As, _______, MI_Cs1, MI_Ds1, _______, MI_Fs1, MI_Gs1, MI_As1, _______, _______, - _______, MI_A, MI_B, MI_C1, MI_D1, MI_E1, MI_F1, MI_G1, MI_A1, MI_B1, MI_C2, KC_WORKMAN, - _______, _______, _______, _______, MI_TRSD, MI_TRSU, _______, _______, MI_BNDD, MI_BNDU, _______, _______, _______, _______, - _______, _______, _______, MI_SUST, MI_OCTD, MI_OCTU, _______, _______, _______, _______ -), - /* LOWER * ,-----------------------------------------. ,-----------------------------------------. * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | @@ -100,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | | F12 | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | | | | | |-------. ,-------| | | | | | | | - * |------+------+------+------+------+------| | | Run |------+------+------+------+------+------| + * |------+------+------+------+------+------| | | Togg. |------+------+------+------+------+------| * | | = | - | + | { | } |-------| |-------| [ | ] | | | \ | | * `-----------------------------------------/ / \ \-----------------------------------------' * | | | |LOWER | / / \ \ | | | | | @@ -111,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, - _______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, LALT(KC_F2), KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, _______, + _______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, KC_TOGGLE, KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -121,9 +97,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | | | | | | | | | Up | | | Del | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | |-------. ,-------| | Left | Down | Rght | | Wkmn | + * | | | | | | |-------. ,-------| | Left | Down | Rght | | | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| - * | | | | Midi | | |-------| |-------| | | Home | End | | Qwrt | + * | | | | | | |-------| |-------| | | Home | End | | | * `-----------------------------------------/ / \ \-----------------------------------------' * | | | | | / / \ \ |RAISE | | | | * | | | | |/ / \ \ | | | | | @@ -132,27 +108,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AS_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_WORKMAN, - _______, _______, _______, KC_MIDI, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, KC_QWERTY, + _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, XXXXXXX, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ )}; -// This section only compiles if OLED_ENABLE is set to `yes` in rules.mk #ifdef OLED_ENABLE -// Defining my custom text to draw to the screen :) static void oled_screen(void) { - oled_write_ln_P(PSTR(""), false); - oled_write_ln_P(PSTR(">nix "), false); - oled_write_ln_P(PSTR(">rust"), false); - oled_write_ln_P(PSTR(">hs &"), false); - oled_write_ln_P(PSTR(">rum"), false); - oled_write_ln_P(PSTR(""), false); - oled_write_ln_P(PSTR(" . ."), false); - oled_write_ln_P(PSTR(" u "), false); - oled_write_ln_P(PSTR(" d"), false); - oled_write_ln_P(PSTR(""), false); - oled_write_ln_P(PSTR("mchal"), false); + oled_set_cursor(0, 0); // Write nothing } // Set correct rotation so the text doesn't end up sideways @@ -174,7 +138,6 @@ bool oled_task_user(void) { #endif -// This section defines custom keycodes, which I use to manage layers bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case KC_QWERTY: @@ -187,9 +150,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_single_persistent_default_layer(_WORKMAN); } return false; - case KC_MIDI: + case KC_TOGGLE: // Toggle between QWERTY and WORKMAN if (record->event.pressed) { - set_single_persistent_default_layer(_MIDI); + layer_invert(_QWERTY); + layer_invert(_WORKMAN); } return false; case KC_LOWER: @@ -214,7 +178,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -// This section only compiles if ENCODER_ENABLE is set to `yes` in rules.mk #ifdef ENCODER_ENABLE // This section is like the keymap matrix, but for rotary encoders @@ -224,7 +187,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_QWERTY] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_VOLD, KC_VOLU )}, [_LOWER] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)}, [_RAISE] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______ )}, - [_ADJUST] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______ )}, }; #endif diff --git a/keyboards/sofle/keymaps/michal/rules.mk b/keyboards/sofle/keymaps/michal/rules.mk index 63f587fd306a..8088d744cd01 100644 --- a/keyboards/sofle/keymaps/michal/rules.mk +++ b/keyboards/sofle/keymaps/michal/rules.mk @@ -11,11 +11,9 @@ MAGIC_ENABLE = no SPACE_CADET_ENABLE = no # I actually use these features -AUTO_SHIFT_ENABLE = yes ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes EXTRAKEY_ENABLE = yes -MIDI_ENABLE = yes MOUSEKEY_ENABLE = yes # More space-saving diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json index 723b6c1054d1..31cd3640c13b 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 2e44803f3274..b4c037caebe0 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/splitkb/kyria/keymaps/drashna/config.h b/keyboards/splitkb/kyria/keymaps/drashna/config.h index ffd17ebd8fbc..2d1fbdcb02d0 100644 --- a/keyboards/splitkb/kyria/keymaps/drashna/config.h +++ b/keyboards/splitkb/kyria/keymaps/drashna/config.h @@ -41,14 +41,21 @@ #define QMK_ESC_INPUT D4 #define QMK_ESC_OUTPUT B2 -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 7 -#define BOOTMAGIC_LITE_ROW_RIGHT 4 -#define BOOTMAGIC_LITE_COLUMN_RIGHT 7 - -#define BOOTMAGIC_LITE_EEPROM_ROW 1 -#define BOOTMAGIC_LITE_EEPROM_COLUMN 7 -#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 5 -#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 7 +#ifndef KEYBOARD_splitkb_kyria_rev3 +# define BOOTMAGIC_LITE_ROW 0 +# define BOOTMAGIC_LITE_COLUMN 7 +# define BOOTMAGIC_LITE_ROW_RIGHT 4 +# define BOOTMAGIC_LITE_COLUMN_RIGHT 7 + +# define BOOTMAGIC_LITE_EEPROM_ROW 1 +# define BOOTMAGIC_LITE_EEPROM_COLUMN 7 +# define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 5 +# define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 7 +#endif #define SERIAL_USART_SPEED 921600 + +#if defined(KEYBOARD_splitkb_kyria_rev1_proton_c) +# define WEAR_LEVELING_BACKING_SIZE 16384 +# define WEAR_LEVELING_LOGICAL_SIZE 8192 +#endif diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c index 8c028985ef92..178d3f2480dc 100644 --- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c @@ -105,34 +105,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_DEFAULT_LAYER_1] = { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } }, - [_DEFAULT_LAYER_2] = { { _______, _______ }, { _______, _______ } }, - [_DEFAULT_LAYER_3] = { { _______, _______ }, { _______, _______ } }, - [_DEFAULT_LAYER_4] = { { _______, _______ }, { _______, _______ } }, - [_GAMEPAD] = { { _______, _______ }, { _______, _______ } }, - [_DIABLO] = { { _______, _______ }, { _______, _______ } }, - [_MOUSE] = { { _______, _______ }, { KC_WH_D, KC_WH_U } }, - [_MEDIA] = { { _______, _______ }, { _______, _______ } }, - [_RAISE] = { { _______, _______ }, { KC_PGDN, KC_PGUP } }, - [_LOWER] = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } }, - [_ADJUST] = { { CK_DOWN, CK_UP }, { _______, _______ } }, + [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLD, KC_VOLU ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_GAMEPAD] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_DIABLO] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_MOUSE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [_MEDIA] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, + [_RAISE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_PGDN, KC_PGUP ) }, + [_LOWER] = { ENCODER_CCW_CW( RGB_MOD, RGB_RMOD), ENCODER_CCW_CW( RGB_HUD, RGB_HUI ) }, + [_ADJUST] = { ENCODER_CCW_CW( CK_DOWN, CK_UP ), ENCODER_CCW_CW( _______, _______ ) }, }; #endif // clang-format on #ifdef OLED_ENABLE +void render_oled_title(bool side) { + oled_write_P(side ? PSTR(" Splitkb ") : PSTR(" Kyria "), true); +} + oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { -#ifdef OLED_DRIVER_SH1107 +# ifdef OLED_DRIVER_SH1107 return OLED_ROTATION_0; -#else +# else return OLED_ROTATION_180; -#endif +# endif } void oled_render_large_display(bool side) { if (side) { render_wpm_graph(56, 64); } else { + // clang-format off static const char PROGMEM kyria_logo[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192,224,240,124, 62, 31, 15, 7, 3, 1,128,192,224,240,120, 56, 60, 28, 30, 14, 14, 7, 7,135,231,127, 31,255,255, 31,127,231,135, 7, 7, 14, 14, 30, 28, 60, 56,120,240,224,192,128, 1, 3, 7, 15, 31, 62,124,240,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -144,7 +149,7 @@ void oled_render_large_display(bool side) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15, 7, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // clang-format on - oled_set_cursor(0,7); + oled_set_cursor(0, 7); oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); } } @@ -171,7 +176,6 @@ void housekeeping_task_keymap(void) { } #endif - #ifdef KEYBOARD_splitkb_kyria_rev1_proton_c void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { for (int32_t i = 0; i < 40; i++) { diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index a99be6bf2918..71a30c5b32b3 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/studiokestra/frl84/config.h b/keyboards/studiokestra/frl84/config.h new file mode 100644 index 000000000000..341346502798 --- /dev/null +++ b/keyboards/studiokestra/frl84/config.h @@ -0,0 +1,26 @@ +// Copyright 2023 Studio Kestra +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define RGB_DI_PIN B0 +#define RGBLED_NUM 18 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */ +#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING + +/* 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 diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json new file mode 100644 index 000000000000..9520e2bd1b76 --- /dev/null +++ b/keyboards/studiokestra/frl84/info.json @@ -0,0 +1,118 @@ +{ + "manufacturer": "Studio Kestra", + "keyboard_name": "FRL84", + "maintainer": "studiokestra", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["D3", "D5", "D0", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6", "D2", "D1"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0F84", + "vid": "0x7C10" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"Esc", "matrix": [0, 0], "x":0, "y":0}, + {"label":"1", "matrix": [1, 0], "x":1, "y":0}, + {"label":"2", "matrix": [0, 1], "x":2, "y":0}, + {"label":"3", "matrix": [1, 1], "x":3, "y":0}, + {"label":"4", "matrix": [0, 2], "x":4, "y":0}, + {"label":"5", "matrix": [1, 2], "x":5, "y":0}, + {"label":"6", "matrix": [0, 3], "x":6, "y":0}, + {"label":"7", "matrix": [1, 3], "x":7, "y":0}, + {"label":"8", "matrix": [0, 4], "x":8, "y":0}, + {"label":"9", "matrix": [1, 4], "x":9, "y":0}, + {"label":"0", "matrix": [0, 5], "x":10, "y":0}, + {"label":"_", "matrix": [1, 5], "x":11, "y":0}, + {"label":"+", "matrix": [0, 6], "x":12, "y":0}, + {"label":"|", "matrix": [1, 6], "x":13, "y":0}, + {"label":"~", "matrix": [0, 7], "x":14, "y":0}, + {"label":"Num Lock", "matrix": [1, 7], "x":15, "y":0}, + {"label":"/", "matrix": [0, 8], "x":16, "y":0}, + {"label":"*", "matrix": [1, 8], "x":17, "y":0}, + {"label":"-", "matrix": [3, 8], "x":18, "y":0}, + + {"label":"Tab", "matrix": [2, 0], "x":0, "y":1, "w":1.5}, + {"label":"Q", "matrix": [3, 0], "x":1.5, "y":1}, + {"label":"W", "matrix": [2, 1], "x":2.5, "y":1}, + {"label":"E", "matrix": [3, 1], "x":3.5, "y":1}, + {"label":"R", "matrix": [2, 2], "x":4.5, "y":1}, + {"label":"T", "matrix": [3, 2], "x":5.5, "y":1}, + {"label":"Y", "matrix": [2, 3], "x":6.5, "y":1}, + {"label":"U", "matrix": [3, 3], "x":7.5, "y":1}, + {"label":"I", "matrix": [2, 4], "x":8.5, "y":1}, + {"label":"O", "matrix": [3, 4], "x":9.5, "y":1}, + {"label":"P", "matrix": [2, 5], "x":10.5, "y":1}, + {"label":"{", "matrix": [3, 5], "x":11.5, "y":1}, + {"label":"}", "matrix": [2, 6], "x":12.5, "y":1}, + {"label":"Backspace", "matrix": [3, 6], "x":13.5, "y":1, "w":1.5}, + {"label":"7", "matrix": [2, 7], "x":15, "y":1}, + {"label":"8", "matrix": [3, 7], "x":16, "y":1}, + {"label":"9", "matrix": [2, 8], "x":17, "y":1}, + {"label":"+", "matrix": [5, 8], "x":18, "y":1, "h":2}, + + {"label":"Caps Lock", "matrix": [4, 0], "x":0, "y":2, "w":1.75}, + {"label":"A", "matrix": [5, 0], "x":1.75, "y":2}, + {"label":"S", "matrix": [4, 1], "x":2.75, "y":2}, + {"label":"D", "matrix": [5, 1], "x":3.75, "y":2}, + {"label":"F", "matrix": [4, 2], "x":4.75, "y":2}, + {"label":"G", "matrix": [5, 2], "x":5.75, "y":2}, + {"label":"H", "matrix": [4, 3], "x":6.75, "y":2}, + {"label":"J", "matrix": [5, 3], "x":7.75, "y":2}, + {"label":"K", "matrix": [4, 4], "x":8.75, "y":2}, + {"label":"L", "matrix": [5, 4], "x":9.75, "y":2}, + {"label":":", "matrix": [4, 5], "x":10.75, "y":2}, + {"label":"\"", "matrix": [5, 5], "x":11.75, "y":2}, + {"label":"Enter", "matrix": [4, 6], "x":12.75, "y":2, "w":2.25}, + {"label":"4", "matrix": [4, 7], "x":15, "y":2}, + {"label":"5", "matrix": [5, 7], "x":16, "y":2}, + {"label":"6", "matrix": [4, 8], "x":17, "y":2}, + + {"label":"Shift", "matrix": [6, 0], "x":0, "y":3, "w":2.25}, + {"label":"Z", "matrix": [7, 0], "x":2.25, "y":3}, + {"label":"X", "matrix": [6, 1], "x":3.25, "y":3}, + {"label":"C", "matrix": [7, 1], "x":4.25, "y":3}, + {"label":"V", "matrix": [6, 2], "x":5.25, "y":3}, + {"label":"B", "matrix": [7, 2], "x":6.25, "y":3}, + {"label":"N", "matrix": [6, 3], "x":7.25, "y":3}, + {"label":"M", "matrix": [7, 3], "x":8.25, "y":3}, + {"label":"<", "matrix": [6, 4], "x":9.25, "y":3}, + {"label":">", "matrix": [7, 4], "x":10.25, "y":3}, + {"label":"?", "matrix": [6, 5], "x":11.25, "y":3}, + {"label":"Shift", "matrix": [7, 5], "x":12.25, "y":3, "w":1.75}, + {"label":"\u2191", "matrix": [6, 6], "x":14, "y":3}, + {"label":"1", "matrix": [6, 7], "x":15, "y":3}, + {"label":"2", "matrix": [7, 7], "x":16, "y":3}, + {"label":"3", "matrix": [6, 8], "x":17, "y":3}, + {"label":"Enter", "matrix": [7, 8], "x":18, "y":3, "h":2}, + + {"label":"Ctrl", "matrix": [8, 0], "x":0, "y":4, "w":1.25}, + {"label":"Win", "matrix": [9, 0], "x":1.25, "y":4, "w":1.25}, + {"label":"Alt", "matrix": [8, 1], "x":2.5, "y":4, "w":1.25}, + {"label":"Space", "matrix": [8, 3], "x":3.75, "y":4, "w":6.25}, + {"label":"Alt", "matrix": [8, 4], "x":10, "y":4, "w":1.25}, + {"label":"Ctrl", "matrix": [8, 5], "x":11.25, "y":4, "w":1.25}, + {"label":"\u2190", "matrix": [8, 6], "x":13, "y":4}, + {"label":"\u2193", "matrix": [9, 6], "x":14, "y":4}, + {"label":"\u2192", "matrix": [8, 7], "x":15, "y":4}, + {"label":"0", "matrix": [9, 7], "x":16, "y":4}, + {"label":".", "matrix": [8, 8], "x":17, "y":4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/studiokestra/frl84/keymaps/default/keymap.c b/keyboards/studiokestra/frl84/keymaps/default/keymap.c new file mode 100644 index 000000000000..9adcd682d40b --- /dev/null +++ b/keyboards/studiokestra/frl84/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +// Copyright 2023 Studio Kestra +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ~ │Num│ / │ * │ - │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┼───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bksp│ 7 │ 8 │ 9 │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┼───┼───┤ + │ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ 4 │ 5 │ 6 │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┼───┼───┼───┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │ 1 │ 2 │ 3 │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┤───┼───┼───┤Ent│ + * │Ctrl│GUI │Alt │ │ Alt│Ctrl│ │ ← │ ↓ │ → │ 0 │ . │ │ + * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRAVE,KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + [1] = LAYOUT( + KC_TRNS, KC_F1, KC_F2 , KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_PGUP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_PGDN, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL + ) +}; diff --git a/keyboards/studiokestra/frl84/keymaps/via/keymap.c b/keyboards/studiokestra/frl84/keymaps/via/keymap.c new file mode 100644 index 000000000000..c8ed25c07a4c --- /dev/null +++ b/keyboards/studiokestra/frl84/keymaps/via/keymap.c @@ -0,0 +1,41 @@ +// Copyright 2023 Studio Kestra +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ~ │Num│ / │ * │ - │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┼───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bksp│ 7 │ 8 │ 9 │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┼───┼───┤ + │ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ 4 │ 5 │ 6 │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┼───┼───┼───┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │ 1 │ 2 │ 3 │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┤───┼───┼───┤Ent│ + * │Ctrl│GUI │Alt │ │ Alt│Ctrl│ │ ← │ ↓ │ → │ 0 │ . │ │ + * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRAVE,KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + [1] = LAYOUT( + KC_TRNS, KC_F1, KC_F2 , KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_PGUP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_PGDN, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/studiokestra/frl84/keymaps/via/rules.mk b/keyboards/studiokestra/frl84/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/studiokestra/frl84/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/studiokestra/frl84/readme.md b/keyboards/studiokestra/frl84/readme.md new file mode 100644 index 000000000000..8ed7de0869bd --- /dev/null +++ b/keyboards/studiokestra/frl84/readme.md @@ -0,0 +1,27 @@ +# studiokestra/frl84 + +![studiokestra/frl84](https://i.imgur.com/XzO7Ly0h.png) + +FRL84 is a hotswap, via-compatible 65+Numpad layout. + +* Keyboard Maintainer: [studiokestra](https://github.com/studiokestra) +* Hardware Supported: FRL84 Invisibolt Case +* Hardware Availability: [FRL84 Invisibolt Case and PCB Group Buy](https://p3dstore.com/products/frl84-invisibolt-case-and-pcb-group-buy) + +Make example for this keyboard (after setting up your build environment): + + make studiokestra/frl84:default + +Flashing example for this keyboard: + + make studiokestra/frl84:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/studiokestra/frl84/rules.mk b/keyboards/studiokestra/frl84/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/studiokestra/frl84/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json index 350202f29f7a..492165be2b7d 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/switchplate/southpaw_65/matrix.c b/keyboards/switchplate/southpaw_65/matrix.c index 5895750f890b..e24dcef85353 100644 --- a/keyboards/switchplate/southpaw_65/matrix.c +++ b/keyboards/switchplate/southpaw_65/matrix.c @@ -54,9 +54,9 @@ static uint32_t read_cols(void) { uint8_t state_1 = 0; uint8_t state_2 = 0; uint8_t state_3 = 0; - pca9555_readPins(IC2, PCA9555_PORT0, &state_1); - pca9555_readPins(IC2, PCA9555_PORT1, &state_2); - pca9555_readPins(IC1, PCA9555_PORT1, &state_3); + pca9555_readPins(IC1, PCA9555_PORT1, &state_1); + pca9555_readPins(IC2, PCA9555_PORT0, &state_2); + pca9555_readPins(IC2, PCA9555_PORT1, &state_3); uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4)); return ~state; diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json index 9c0b6bcf9a3e..86efe2239cf7 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/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index a1480dc5ffbc..d4865fa3e8e1 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/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json index e964fb23840a..578ab1431b77 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 1a93578325de..95e3a411b019 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 6a7e10fad7d4..fb8ce09dff3b 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 d6b5b04b2a26..53108843604d 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 2f194d658b85..85eaa670608e 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 a0612fabd613..18edcce9b9bf 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 14e833c5b20d..58c5175cb245 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 75551832f1b9..3922bd825183 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 348a51fc7ad3..aef7138b6460 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 3a9e21ea6000..da31c3d93333 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #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 fbbc15609c6e..a33a558b250f 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 dc63dc77bdfc..d72a8fd06d0d 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 a6e12f3374d5..e3634bcad056 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 dee9f85acc1a..4535371186d3 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 88eb8c2c513a..c02ea1f9139f 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 aa28ce85c896..44262e071c60 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 88eb8c2c513a..c02ea1f9139f 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 f1d47ef1b001..6b8a6cf9c788 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 88eb8c2c513a..c02ea1f9139f 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 c484553e8998..7afe842b8a3c 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 88eb8c2c513a..c02ea1f9139f 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 249b33fdd24b..52d2849e8a30 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 88eb8c2c513a..c02ea1f9139f 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 c9a5d49447f6..b5ed9415d5fa 100644 --- a/keyboards/unikeyboard/diverge3/config.h +++ b/keyboards/unikeyboard/diverge3/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 c2caaca8810c..4aac244492ba 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 7f8054f18323..78d133446e3e 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 e8a3ac1bb3fd..d97d10d1185d 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 a3a667d63266..7bc78f68d698 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 ee74cb134f78..d3200e6ed1c9 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 fc91f5138f59..4c3789155eef 100644 --- a/keyboards/unikorn/config.h +++ b/keyboards/unikorn/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #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 b894a98dacfe..e916cc767428 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 6e3ba625e28a..ea285f408292 100644 --- a/keyboards/unison/v04/config.h +++ b/keyboards/unison/v04/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #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 a772d344d251..f795fa1c9066 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 fb911ab60cf6..39bb20f2a890 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 d8bc5b107d4a..5d3d081f7394 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 9677a8e26284..ad29207062d6 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 cf0b6530adf3..ba8451a33118 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 241418bdb702..85be8c023266 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #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 1e5cda2b20a4..1bcb6ad5f8b3 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 39af6344eff1..000000000000 --- 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 . -*/ - -#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 effd2268dbd1..000000000000 --- 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 . -*/ - -#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 dab37baf0456..769c35d8caf4 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 2299b791efad..000000000000 --- 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 . -*/ - -#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 65be217368d2..6959188be9a2 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 3c76b77bce02..8eafa8d7b512 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 . #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 e37ccc9543d3..f453fa1f5b60 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 e96d154b6691..195f3f617cd3 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 6c26013f6025..56797aac2268 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 fc71e667b8c4..768474ba269f 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 3716ddbede99..ebb2609fccda 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 633843021f48..5cbee6426ff9 100644 --- a/keyboards/vertex/arc60/config.h +++ b/keyboards/vertex/arc60/config.h @@ -16,10 +16,6 @@ along with this program. If not, see . #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 bfb8e4fc3a63..60758ac3b888 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 1795f9b2ee44..650d91008928 100644 --- a/keyboards/vertex/arc60h/config.h +++ b/keyboards/vertex/arc60h/config.h @@ -16,10 +16,6 @@ along with this program. If not, see . #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 9cd38dd907a3..1032b9880c67 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 3036f0ac8fab..97bd940cdc71 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #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 312f97e7f1b3..667798b4aa74 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 9a469e7188d0..ada0ff6e76df 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 aebfd08f0ff0..88b0c78b2d5a 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 9a399518a15e..d035c79a9063 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 e4730b2031e8..0e29960d9418 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 a4789be9b7a5..bb14ae71b110 100644 --- a/keyboards/viktus/smolka/config.h +++ b/keyboards/viktus/smolka/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 3e38c540e6bc..e9727d48ff95 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 1ac5d4802abc..76cdbb7c037e 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 8b7c6fdc7d7f..c9a1d1cca307 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 . #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 33cc1f6dcb3b..6b287e9833cc 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 5c8d52a18b37..c0e0f2bef8bb 100644 --- a/keyboards/viktus/styrka/config.h +++ b/keyboards/viktus/styrka/config.h @@ -17,29 +17,6 @@ along with this program. If not, see . #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 6bad0166c04d..7e0c7c4c03dc 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 a3555ccd50a7..d035c79a9063 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 f1e68dedf13b..f622120e9a11 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 cea58affaa77..9d63b82b19af 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 . #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 e79f940440b0..7561cb585147 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 40f6312b4796..0fa20e9c86ef 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 . #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 894043ef9874..0098b22d14f9 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 cd9b8b4d63fe..0a0fefabd04e 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 0a0e3b0bc57b..eca78d19b5d2 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 ce4274fc2482..12787a72d753 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/yampad/config.h b/keyboards/yampad/config.h index 00ddc347dba5..8aedbcf715d8 100644 --- a/keyboards/yampad/config.h +++ b/keyboards/yampad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 753c952b1d63..d0e4b4232981 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 fe7045efad5d..22610f451818 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 07f7dbbe30c8..6178272b17f1 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/info.json b/keyboards/yandrstudio/eau87/info.json index f09f55c76b27..94770678053e 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 d1405b2bbf19..878ac47bbc0e 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 74f5dd6e86d9..4865cecb0b23 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 79f37b9bde12..0c091e17af81 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 4f8105fae816..9c0195618db0 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 06de2f568062..b3bb28e7ae2c 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 5aa0c2ae68aa..c924055e4e53 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 a3d9bb74c5b5..9a23a64ae267 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 ed063749761c..90ef04d1256e 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 d52452e0a200..84c1c2ae8fde 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 d48809128faf..7bc7ea41421c 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 ec02b66c19ca..46c0d6005d4e 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 20a1e86cf44e..5fbc7ecf33c6 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 2fa940c63ab8..66ec91c51074 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 d3c36ca85205..7a4754cf299f 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 e53141a77258..5e34888c144a 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 85b39abe9b13..017f4445b8de 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 a3fcde472f7a..305f37ad193e 100644 --- a/keyboards/ydkb/chili/config.h +++ b/keyboards/ydkb/chili/config.h @@ -17,18 +17,6 @@ along with this program. If not, see . #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 1ef666e69fcd..2516744ef039 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 bc86dc02e549..4ec059e4b582 100644 --- a/keyboards/ydkb/just60/config.h +++ b/keyboards/ydkb/just60/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #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 618f0d8eac35..bea9152e0bbe 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 94c922931bda..788e0e02fe8d 100644 --- a/keyboards/ydkb/yd68/config.h +++ b/keyboards/ydkb/yd68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 d8f1439a3fb7..7b15598735a9 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 9314f26bea77..08303c4b13e5 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #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 641fe3154385..4cd6356298aa 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 1420387adbc7..782e711cfd71 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 074e6c048519..4688aee3a24f 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 ce2e688bd702..81bfa2e81a71 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 9d1e375cd9ed..2a191a4a24f6 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 0524cfd5630e..cbb4974c0997 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 dd4b532538ee..98d881cd4d67 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 3b21cea4a6f6..013df9fa1232 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -15,23 +15,6 @@ along with this program. If not, see . #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 92f019bacb60..0bf2f4ca97d9 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 055c93b32737..034d338d351a 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -13,23 +13,6 @@ along with this program. If not, see . #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 8e72d4093a0a..a4984a81d798 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 82d7484aa85a..4b44082d9f01 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 84b42905c717..60ff8f7fe2eb 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 d07a8917dfe8..c55883abd3a5 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 5d4d3913f89f..e3ec6538f863 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 4c4ca90583a3..daf340e4b8c9 100644 --- a/keyboards/ymdk/ymd09/config.h +++ b/keyboards/ymdk/ymd09/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #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 0e3aaba46bfb..8d456b3ab763 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 36cbd9389144..5f0ff7b52d6e 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 84badccc5a83..11e85c1e2b27 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 db792118da52..4fcbc8421cb4 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 3920ff6a29a0..b334b8171770 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 21a027eab469..a0b2e37f8f9a 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 375f8c848024..37c51da1a535 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 90f4ffed24a8..dc7ebdc8bc91 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 f66e1533dd44..89cdd6b25897 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 d46c3bc01042..000000000000 --- a/keyboards/ymdk/ymd75/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Base Copyright 2017 Luiz Ribeiro -Modified 2017 Andrew Novak -Modified 2018 Wayne Jones (WarmCatUK) - -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 . -*/ - -#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 967dd3de9567..e1c728c19d7f 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 83e075b29040..000000000000 --- 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 56435d5b278e..8d7188068965 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 e3a31b5116c9..968045a7c9b8 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 ce0db873cf73..d4abcdd4e166 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 f4fc0a99c3fd..cc4cd0d147c0 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #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 7541e62019ac..f48314cfa5e2 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 fb4155c48dae..b8bcd08e27b9 100644 --- a/keyboards/yncognito/batpad/config.h +++ b/keyboards/yncognito/batpad/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #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 01d2032d2ee7..fa1efd40ebd7 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 73de0d6c42d2..504d6ba5411e 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 . #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 f7d032a1d283..ef1402a41e24 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 a4ddefb53cb7..b674473983de 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 . #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 4baa40bda4e9..d32b1490d114 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 39c7907b4812..c17ec90d8ee1 100644 --- a/keyboards/yosino58/rev1/config.h +++ b/keyboards/yosino58/rev1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #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 baf43c47a57e..597c4a442e73 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 a132e577bb47..2b7fc4d15756 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 . #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 35162e1b715c..3533bf6142cc 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 7f1153299c84..4a567f22b19c 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 . #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 3e65349c87b4..000000000000 --- 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 . -*/ - -#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 5baab67dbad4..76b579338c31 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 d2e78293235d..4c69a35deaca 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 . #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 90ac25f360b6..5bf5ce113580 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 5b0e667cc9c4..ae49a16f3b13 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 . #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 . 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 19b8c31efb44..5bc055b38125 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 3df5c25081bf..1e455411192d 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 7d062aef1611..e5eb64db8463 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 4ca22e9b5d58..4994ead6bcf6 100644 --- a/keyboards/yynmt/dozen0/config.h +++ b/keyboards/yynmt/dozen0/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 b32291b05222..0c73591326ed 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 4d2fab5ace96..e2bf97645b70 100644 --- a/keyboards/yynmt/kagamidget/config.h +++ b/keyboards/yynmt/kagamidget/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #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 7ffbddfd257d..983b09aa7914 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 27ef3bfb87e1..0167811c6ab0 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 . #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 aaf72f61b3bb..0e52f3a29d06 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 e532c012bad7..000000000000 --- a/keyboards/ziggurat/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 kb-elmo - -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 . -*/ - -#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 0cd86b049c0e..c3a4a50326f7 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 efbdb02f81ab..2df5b9daaf56 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #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 0c902f2468f5..70bba664eca8 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 231ad6d92e57..f6311ba01324 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 e69956a96d1b..9bee3a5016a4 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 739358f6936d..8437e42144ff 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 74bf17b6037a..a3693fdad2a3 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 7c0453e3ae8f..59d91c329de8 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 875478ec1096..72f068d33847 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 58b8096ef8f1..59d91c329de8 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 c7140de8ded9..9ebaedef16aa 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 2f8984f51af9..cda1688944a0 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 d8245be3085d..dff0282f16ca 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 97b0393aab6d..c643ca5d313e 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 f3519b94f492..4206a3fa6e47 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/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index e5675854e134..846bbc2351cf 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c @@ -17,7 +17,7 @@ #include "drashna.h" enum more_custom_keycodes { - KC_SWAP_NUM = NEW_SAFE_RANGE, + KC_SWAP_NUM = USER_SAFE_RANGE, PM_SCROLL, PM_PRECISION, }; diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c index b22401a77e06..d5faf7f7c85e 100644 --- a/layouts/community/ortho_4x12/drashna/keymap.c +++ b/layouts/community/ortho_4x12/drashna/keymap.c @@ -16,19 +16,11 @@ #include "drashna.h" -#ifdef BACKLIGHT_ENABLE +#define BACKLIT OSM(MOD_LSFT) enum planck_keycodes { - BACKLIT = NEW_SAFE_RANGE, - TH_LVL, + TH_LVL = USER_SAFE_RANGE, }; -#else -# define BACKLIT OSM(MOD_LSFT) -enum planck_keycodes { - TH_LVL = NEW_SAFE_RANGE, -}; -#endif - #ifdef KEYBOARD_planck_ez # define PLNK_1 BK_LWER # define PLNK_2 SP_LWER @@ -56,10 +48,10 @@ enum planck_keycodes { K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ ) \ LAYOUT_ortho_4x12_wrapper( \ - KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_DEL, \ + KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, PRINT_SETUPS, \ LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \ KC_MLSF, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), KC_ENT, \ - BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + STORE_SETUPS, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ) #define LAYOUT_base_wrapper(...) LAYOUT_ortho_4x12_base(__VA_ARGS__) @@ -130,18 +122,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { -#ifdef BACKLIGHT_ENABLE - case BACKLIT: - if (record->event.pressed) { - register_code(KC_RSFT); -# ifdef BACKLIGHT_ENABLE - backlight_step(); -# endif - } else { - unregister_code(KC_RSFT); - } - break; -#endif #ifdef KEYBOARD_planck_ez case TH_LVL: if (record->event.pressed) { diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 7e051b6b5c24..257e033f2222 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c @@ -16,7 +16,9 @@ #include "drashna.h" -enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE }; +enum crkbd_keycodes { + RGBRST = USER_SAFE_RANGE, +}; /* * The `LAYOUT_crkbd_base` macro is a template to allow the use of identical @@ -96,33 +98,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #ifdef OLED_ENABLE -oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_270; } +oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { + return OLED_ROTATION_270; +} # ifdef CONVERT_TO_PROTON_C // WPM-responsive animation stuff here # define SLEEP_FRAMES 2 -# define SLEEP_SPEED 10 // below this wpm value your animation will idle +# define SLEEP_SPEED 10 // below this wpm value your animation will idle -# define WAKE_FRAMES 2 // uncomment if >1 +# define WAKE_FRAMES 2 // uncomment if >1 -# define KAKI_FRAMES 3 -# define KAKI_SPEED 40 // above this wpm value typing animation to triggere +# define KAKI_FRAMES 3 +# define KAKI_SPEED 40 // above this wpm value typing animation to triggere # define RTOGI_FRAMES 2 -//#define LTOGI_FRAMES 2 +// #define LTOGI_FRAMES 2 -//#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms -// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing -# define ANIM_SIZE 512 // number of bytes in array, minimize for adequate firmware size, max is 1024 +// #define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms +// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing +# define ANIM_SIZE 512 // number of bytes in array, minimize for adequate firmware size, max is 1024 uint32_t anim_timer = 0; uint32_t anim_frame_duration = 500; uint8_t current_sleep_frame = 0; -uint8_t current_wake_frame = 0; // uncomment if WAKE_FRAMES >1 +uint8_t current_wake_frame = 0; // uncomment if WAKE_FRAMES >1 uint8_t current_kaki_frame = 0; -#ifdef SWAP_HANDS_ENABLE -uint8_t current_rtogi_frame = 0; -#endif +# ifdef SWAP_HANDS_ENABLE +uint8_t current_rtogi_frame = 0; +# endif // uint8_t current_ltogi_frame = 0; // clang-format off void render_small_kitty(void) { diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py index 3d73e660911f..501c41972f6d 100644 --- a/lib/python/qmk/c_parse.py +++ b/lib/python/qmk/c_parse.py @@ -88,7 +88,9 @@ def find_layouts(file): for i, key in enumerate(parsed_layout): if 'label' not in key: cli.log.error('Invalid LAYOUT macro in %s: Empty parameter name in macro %s at pos %s.', file, macro_name, i) - elif key['label'] in matrix_locations: + elif key['label'] not in matrix_locations: + cli.log.error('Invalid LAYOUT macro in %s: Key %s in macro %s has no matrix position!', file, key['label'], macro_name) + else: key['matrix'] = matrix_locations[key['label']] parsed_layouts[macro_name] = { @@ -211,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)): @@ -228,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': @@ -248,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: @@ -263,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 17503bac637a..3b69b17ed1cd 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 6e23d96e1cb1..12b83e630f8b 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 f1cb11c39576..d68df3fa5884 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 84757b9b01c6..aa64b75064f6 100644 --- a/quantum/command.c +++ b/quantum/command.c @@ -19,7 +19,6 @@ along with this program. If not, see . #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 c406be4585a8..90a0f2083828 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#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 0225f533626a..1263ef188bb3 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -30,8 +30,7 @@ along with this program. If not, see . #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 000000000000..20e70263f349 --- /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 + +// 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 1bf9549c5a7d..6851c6b4e82e 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 12026ce6496f..448727deceac 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 70a09a52beb1..8fac7666c2ac 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 44009f3aa2b6..5b9b03babb1d 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 5cb86bf441e2..d63309f010b6 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 1115592e17e8..3e7c681ced91 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 02692002e310..351c51ad411b 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 18107ccd53b1..cea9444896b3 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 5767530b3bf1..9205a72057f5 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 60675fbf1338..b206767614e9 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 6e1ae17807d4..19187ed13b09 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 462bcde429a9..ea9c56c12ac5 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 7e94896e2e88..c0dc1af81ec2 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 da9467a475dd..03dbb7bc40d0 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 259e0a30f462..869984c4d2e1 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 9a8ed726045c..e5f7514a8026 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 251491fb8161..38b0c685ba67 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 de7b60546b73..efa9099f2011 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 b4f5b5c5b31a..01779cf2e859 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 372d7f2e9386..284562072dc6 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 591d71c09cb3..fbc31ed15562 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 800899b51521..3bd71c19f280 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 2cd63a48e3b8..6e161628c864 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 95f3348f63ac..8092dc130188 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 5e7e2a37e873..ae1281be262b 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 1d30451376ea..f3f01839c32a 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 286863deea74..947317833ed2 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 073647de7f43..440a6b3b4dfc 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 e3ac1cd433c3..2f26b1d8afa5 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 11de3ad03073..f6dd94f0ca77 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 c27389971e54..03c6b7a2af5c 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 e8352ffa08a5..bc9445892f9a 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 e3369167130c..6464966c7119 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 1f773bb4107d..1a3a0bc53a42 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 33193d6a4d4c..af16fec8d6a1 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 b51e44b8bbc3..c0e3311e90bf 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 f8341f8cbcab..7feb52a25c7b 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 6b37d77a0aa8..40870ec2378d 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 17da9a6c117f..b4570ad922d0 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 3d34a39ae5f3..57a27d04e9b6 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 fb48a0fda788..cf4c17125f13 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 36437184448a..fd3a1604c8e0 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 dd1bda753318..732e2e939d1e 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 83495b63bead..5151696a1031 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 10714f1be925..81a88fa25c0e 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 30910530e00f..1e17342c2734 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 cac16c08a595..bcdd5af0c257 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 1feab96b8c39..fb033df770a1 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 07d96b746563..852b2f71211d 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 4cdf4879c3ca..acb49f77738b 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 9649f59dd086..ef48a9e493e4 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 068c81b020e5..2eaef5e60ca5 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 c0692ababde6..d33a25902354 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 e01f0a7dc395..680bd1db9e26 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 0a6e6e49184c..69bba7293e67 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 05a4a4c279d8..1e2f833db16f 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 0dfc0236e80b..4fdcf3f7462c 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 cc64300b1892..5a9362acb4c8 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 ff6f8c9c2eaf..71e5f38f55a9 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 b954bb239877..3f3ec4cec2b5 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 38df8c633666..6101c8d8ba88 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 c4f627c30d7d..90da98c756a7 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 1f2bc3347609..bd5f21ec8c60 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 16d072cc5b9e..4551cbe29ffa 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 5fe9d36b1610..808caec054cd 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 757f98e912dd..f8645ac4cfbe 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 a8df3928a619..201de937cb43 100644 --- a/quantum/keymap_introspection.h +++ b/quantum/keymap_introspection.h @@ -3,6 +3,7 @@ #pragma once #include +#include //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Key mapping diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 76daa625ad8e..72763d0bc08c 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/users/drashna/audio_config.h b/users/drashna/audio_config.h new file mode 100644 index 000000000000..21fe27ee6bbb --- /dev/null +++ b/users/drashna/audio_config.h @@ -0,0 +1,33 @@ +// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define AUDIO_CLICKY +#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f + +#if __has_include("user_song_list.h") +# include "user_song_list.h" +#endif + +#ifdef USER_SONG_LIST +# define STARTUP_SONG SONG(RICK_ROLL) +# define GOODBYE_SONG SONG(SONIC_RING) +# define DEFAULT_LAYER_SONGS \ + { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND), SONG(OVERWATCH_THEME) } +# define UNICODE_SONG_MAC SONG(MARIO_THEME) +# define UNICODE_SONG_LNX SONG(MARIO_POWERUP) +# define UNICODE_SONG_WIN SONG(MARIO_ONEUP) +# define UNICODE_SONG_BSD SONG(RICK_ROLL) +# define UNICODE_SONG_WINC SONG(RICK_ROLL) +#else +# define STARTUP_SONG SONG(STARTUP_SOUND) +# define GOODBYE_SONG SONG(GOODBYE_SOUND) +# define DEFAULT_LAYER_SONGS \ + { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND), SONG(WORKMAN_SOUND) } +# define UNICODE_SONG_MAC SONG(QWERTY_SOUND) +# define UNICODE_SONG_LNX SONG(COLEMAK_SOUND) +# define UNICODE_SONG_WIN SONG(DVORAK_SOUND) +# define UNICODE_SONG_BSD SONG(WORKMAN_SOUND) +# define UNICODE_SONG_WINC SONG(PLOVER_GOODBYE_SOUND) +#endif diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c index c2f1156ceea6..568f56c8d165 100644 --- a/users/drashna/callbacks.c +++ b/users/drashna/callbacks.c @@ -3,9 +3,8 @@ #include "drashna.h" - #ifdef I2C_SCANNER_ENABLE -void matrix_scan_i2c(void); +void housekeeping_task_i2c_scanner(void); void keyboard_post_init_i2c(void); #endif @@ -21,6 +20,64 @@ void keyboard_pre_init_user(void) { // Call user matrix init, set default RGB colors and then // call the keymap's init function +#ifdef CUSTOM_QUANTUM_PAINTER_ENABLE +void keyboard_post_init_qp(void); +#endif + +#ifdef OS_DETECTION_ENABLE +os_variant_t os_type; + +uint32_t startup_exec(uint32_t trigger_time, void *cb_arg) { + /* do something */ + + if (is_keyboard_master()) { + os_type = detected_host_os(); + if (os_type) { + bool is_mac = (os_type == OS_MACOS) || (os_type == OS_IOS); + keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = is_mac; +# ifdef UNICODE_COMMON_ENABLE + uint8_t mode = is_mac ? UNICODE_MODE_MACOS : UNICODE_MODE_WINCOMPOSE; + if (mode != get_unicode_input_mode()) { + set_unicode_input_mode(mode); + } +# endif + switch (os_type) { + case OS_UNSURE: + xprintf("unknown OS Detected\n"); + break; + case OS_LINUX: + xprintf("Linux Detected\n"); + break; + case OS_WINDOWS: + xprintf("Windows Detected\n"); + break; +# if 0 + case OS_WINDOWS_UNSURE: + xprintf("Windows? Detected\n"); + break; +# endif + case OS_MACOS: + xprintf("MacOS Detected\n"); + break; + case OS_IOS: + xprintf("iOS Detected\n"); + break; +# if 0 + case OS_PS5: + xprintf("PlayStation 5 Detected\n"); + break; + case OS_HANDHELD: + xprintf("Nintend Switch/Quest 2 Detected\n"); + break; +# endif + } + } + } + + return os_type ? 0 : 500; +} +#endif + __attribute__((weak)) void keyboard_post_init_keymap(void) {} void keyboard_post_init_user(void) { #if defined(CUSTOM_RGBLIGHT) @@ -47,6 +104,10 @@ void keyboard_post_init_user(void) { PORTB &= ~(1 << 0); #endif +#ifdef OS_DETECTION_ENABLE + defer_exec(100, startup_exec, NULL); +#endif + keyboard_post_init_keymap(); } @@ -102,25 +163,6 @@ void suspend_wakeup_init_user(void) { // scan function __attribute__((weak)) void matrix_scan_keymap(void) {} void matrix_scan_user(void) { - static bool has_ran_yet; - if (!has_ran_yet) { - has_ran_yet = true; - startup_user(); - } - -#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. - run_diablo_macro_check(); -#endif // TAP_DANCE_ENABLE -#if defined(CUSTOM_RGB_MATRIX) - matrix_scan_rgb_matrix(); -#endif -#ifdef I2C_SCANNER_ENABLE - matrix_scan_i2c(); -#endif -#ifdef CUSTOM_OLED_DRIVER - matrix_scan_oled(); -#endif - matrix_scan_keymap(); } @@ -134,10 +176,6 @@ __attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) return state; } layer_state_t layer_state_set_user(layer_state_t state) { - if (!is_keyboard_master()) { - return state; - } - state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); #if defined(CUSTOM_POINTING_DEVICE) state = layer_state_set_pointing(state); @@ -145,18 +183,33 @@ layer_state_t layer_state_set_user(layer_state_t state) { #if defined(CUSTOM_RGBLIGHT) state = layer_state_set_rgb_light(state); #endif // CUSTOM_RGBLIGHT -#if defined(AUDIO_ENABLE) && !defined(__arm__) +#if defined(AUDIO_ENABLE) static bool is_gamepad_on = false; if (layer_state_cmp(state, _GAMEPAD) != is_gamepad_on) { - is_gamepad_on = layer_state_cmp(state, _GAMEPAD); + static bool is_click_on = false; + is_gamepad_on = layer_state_cmp(state, _GAMEPAD); if (is_gamepad_on) { + is_click_on = is_clicky_on(); + if (is_click_on) { + clicky_off(); + } PLAY_LOOP(doom_song); } else { + if (is_click_on) { + clicky_on(); + } stop_all_notes(); } } #endif state = layer_state_set_keymap(state); + +#ifdef CONSOLE_ENABLE + char layer_buffer[16 + 5]; + format_layer_bitmap_string(layer_buffer, state, default_layer_state); + dprintf("layer state: %s\n", layer_buffer); +#endif + return state; } @@ -227,9 +280,27 @@ void matrix_slave_scan_user(void) { #endif __attribute__((weak)) void housekeeping_task_keymap(void) {} -void housekeeping_task_user(void) { +void housekeeping_task_user(void) { + static bool has_ran_yet; + if (!has_ran_yet) { + has_ran_yet = true; + startup_user(); + } +#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. + run_diablo_macro_check(); +#endif // TAP_DANCE_ENABLE +#if defined(CUSTOM_RGB_MATRIX) + housekeeping_task_rgb_matrix(); +#endif +#ifdef I2C_SCANNER_ENABLE + housekeeping_task_i2c_scanner(); +#endif +#ifdef CUSTOM_OLED_DRIVER + housekeeping_task_oled(); +#endif #if defined(SPLIT_KEYBOARD) && defined(SPLIT_TRANSACTION_IDS_USER) housekeeping_task_transport_sync(); #endif + housekeeping_task_keymap(); } diff --git a/users/drashna/config.h b/users/drashna/config.h index 9edbfff56b2a..465ea63ee278 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -11,7 +11,6 @@ #endif #define IS_COMMAND() (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) - #if defined(SPLIT_KEYBOARD) # include "split/split_config.h" #endif @@ -27,51 +26,26 @@ # include "oled/oled_config.h" #endif +#ifdef POINTING_DEVICE_ENABLE +# include "pointing/pointing_config.h" +#endif // POINTING_DEVICE_ENABLE + +#ifdef AUDIO_ENABLE +# include "audio_config.h" +#endif // AUDIO_ENABLE + #if defined(WPM_ENABLE) // # define WPM_LAUNCH_CONTROL -// # define WPM_ALLOW_COUNT_REGRESSOIN // # define WPM_UNFILTERED +# define WPM_ALLOW_COUNT_REGRESSION # define WPM_SAMPLE_SECONDS 10 # define WPM_SAMPLE_PERIODS 50 # define WPM_ESTIMATED_WORD_SIZE 5 #endif -#ifdef AUDIO_ENABLE -# define AUDIO_CLICKY -# define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f - -# ifdef USER_SONG_LIST -# define STARTUP_SONG SONG(RICK_ROLL) -# define GOODBYE_SONG SONG(SONIC_RING) -# define DEFAULT_LAYER_SONGS \ - { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND), SONG(OVERWATCH_THEME) } -# define UNICODE_SONG_MAC SONG(MARIO_THEME) -# define UNICODE_SONG_LNX SONG(MARIO_POWERUP) -# define UNICODE_SONG_WIN SONG(MARIO_ONEUP) -# define UNICODE_SONG_BSD SONG(RICK_ROLL) -# define UNICODE_SONG_WINC SONG(RICK_ROLL) -# else -# define STARTUP_SONG SONG(STARTUP_SOUND) -# define GOODBYE_SONG SONG(GOODBYE_SOUND) -# define DEFAULT_LAYER_SONGS \ - { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND), SONG(WORKMAN_SOUND) } -# define UNICODE_SONG_MAC SONG(QWERTY_SOUND) -# define UNICODE_SONG_LNX SONG(COLEMAK_SOUND) -# define UNICODE_SONG_WIN SONG(DVORAK_SOUND) -# define UNICODE_SONG_BSD SONG(WORKMAN_SOUND) -# define UNICODE_SONG_WINC SONG(PLOVER_GOODBYE_SOUND) -# endif -#endif // !AUDIO_ENABLE #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS -// #define WPM_ESTIMATED_WORD_SIZE 5 -#define WPM_ALLOW_COUNT_REGRESSION -// #define WPM_UNFILTERED -// #define WPM_SAMPLE_SECONDS 5 -// #define WPM_SAMPLE_PERIODS 50 -// #define WPM_LAUNCH_CONTROL - #ifndef ONESHOT_TAP_TOGGLE # define ONESHOT_TAP_TOGGLE 2 #endif // !ONESHOT_TAP_TOGGLE diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 283e82d13d86..259810c70f14 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -117,7 +117,7 @@ void do_scan(void) { uint16_t scan_timer = 0; -void matrix_scan_i2c(void) { +void housekeeping_task_i2c_scanner(void) { if (timer_elapsed(scan_timer) > 5000) { do_scan(); scan_timer = timer_read(); @@ -139,7 +139,7 @@ float autocorrect_song[][2] = SONG(PLOVER_GOODBYE_SOUND); # endif # endif -bool apply_autocorrect(uint8_t backspaces, const char *str) { +bool apply_autocorrect(uint8_t backspaces, const char* str) { if (layer_state_is(_GAMEPAD)) { return false; } @@ -153,7 +153,31 @@ bool apply_autocorrect(uint8_t backspaces, const char *str) { } #endif -#if defined(CAPS_WORD_ENABLE) && !defined(NO_ACTION_ONESHOT) +#if defined(CAPS_WORD_ENABLE) +bool caps_word_press_user(uint16_t keycode) { + switch (keycode) { + // Keycodes that continue Caps Word, with shift applied. + case KC_MINS: + if (!keymap_config.swap_lctl_lgui) { + return true; + } + case KC_A ... KC_Z: + add_weak_mods(MOD_BIT(KC_LSFT)); // Apply shift to next key. + return true; + + // Keycodes that continue Caps Word, without shifting. + case KC_1 ... KC_0: + case KC_BSPC: + case KC_DEL: + case KC_UNDS: + return true; + + default: + return false; // Deactivate Caps Word. + } +} + +# if !defined(NO_ACTION_ONESHOT) void oneshot_locked_mods_changed_user(uint8_t mods) { if (mods & MOD_MASK_SHIFT) { del_mods(MOD_MASK_SHIFT); @@ -161,4 +185,25 @@ void oneshot_locked_mods_changed_user(uint8_t mods) { caps_word_on(); } } +# endif #endif + +void format_layer_bitmap_string(char* buffer, layer_state_t state, layer_state_t default_state) { + for (int i = 0; i < 16; i++) { + if (i == 0 || i == 4 || i == 8 || i == 12) { + *buffer = ' '; + ++buffer; + } + + uint8_t layer = i; + if ((default_state & ((layer_state_t)1 << layer)) != 0) { + *buffer = 'D'; + } else if ((state & ((layer_state_t)1 << layer)) != 0) { + *buffer = '1'; + } else { + *buffer = '_'; + } + ++buffer; + } + *buffer = 0; +} diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h index 16d7cda638b7..4e2a4d5acbd3 100644 --- a/users/drashna/drashna.h +++ b/users/drashna/drashna.h @@ -11,7 +11,7 @@ #ifdef TAP_DANCE_ENABLE # include "keyrecords/tap_dances.h" -#endif // TAP_DANCE_ENABLE +#endif // TAP_DANCE_ENABLE #if defined(RGBLIGHT_ENABLE) # include "rgb/rgb_stuff.h" #endif @@ -27,6 +27,9 @@ #ifdef POINTING_DEVICE_ENABLE # include "pointing/pointing.h" #endif +#ifdef OS_DETECTION_ENABLE +# include "os_detection.h" +#endif /* Define layer names */ enum userspace_layers { @@ -79,6 +82,7 @@ bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed); bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer); bool hasAllBitsInMask(uint8_t value, uint8_t mask); void tap_code16_nomods(uint16_t kc); +void format_layer_bitmap_string(char* buffer, layer_state_t state, layer_state_t default_state); // clang-format off typedef union { diff --git a/users/drashna/keyrecords/capwords.md b/users/drashna/keyrecords/capwords.md deleted file mode 100644 index 1ca01ed853b6..000000000000 --- a/users/drashna/keyrecords/capwords.md +++ /dev/null @@ -1,36 +0,0 @@ -# Cap Words - -This is taken from [Pascal Getreuer's implemenation](https://getreuer.info/posts/keyboards/caps-word/index.html), with a number of modifications. - -To enable Caps Word, add `CAPS_WORD_ENABLE = yes` to your `rules.mk`. - -This is mostly a reproduction of Pascal's docs: - -## Overview - -All-caps identifiers like “MOD_MASK_ALT” are awkward to type. - -Caps Lock would be the standard solution to this problem, but it is awkward: it needs a dedicated key to toggle it (an imposition on smaller keyboards), and we need to remember to toggle it off after typing the word. Or with normal shifting, we either perform finger gymnastics or need to stop typing in the middle of the word to release shift with one hand to switch to holding shift with the other hand. In my experience, this is a nuisance especially if your shift keys are mod-taps, as in home row mods. - -Caps Word, implemented here, is a modern alternative to Caps Lock: - -* Caps Word is activated by pressing the left and right shift keys at the same time. This way you don’t need a dedicated key for using Caps Word. -* Caps Word automatically disables itself at the end of the word. - -**Compatibility**: I’ve tested that this implementation works with one-shot mods and Space Cadet Shift, and it predictably handles key repeating. - -Unlike some other QMK Caps Word implementations, this library does not use the Caps Lock (KC_CAPS) keycode. It works even if the OS remaps Caps Lock to Ctrl or something else, as Emacs and Vim users often do. - -## Using Caps Word -With the above flashed to your keyboard: - -1. **Activating**: Press and release both left and right shift keys at the same time. If your shift keys are mod-taps, activate Caps Word by holding both shift mod-tap keys until the tapping term, then release them. -2. Then begin typing to get capitalized letters. -3. **Disabling**: Caps Word disables itself when the next word breaking key is typed. - -If you want to explicitly stop Caps Word, press and release Ctrl or another non-shift modifier or layer key. This also disables Caps Word. - -## Explanation -The code checks the mod bits on each key event, enabling Caps Word when both left and right shifts are active. - -While enabled, Caps Word automatically presses and releases left shift (KC_LSFT) as needed so that letters are shifted and other keys are not. The word continues while typing a–z, 0–9, -, _, and backspace. Any other key is considered “word breaking” and disables Caps Word. You can edit the switch statement at the end of the process_caps_word() function to adjust which keys count as word breaking. diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c index 89d1c80b8f99..99d95c3dff8f 100644 --- a/users/drashna/keyrecords/process_records.c +++ b/users/drashna/keyrecords/process_records.c @@ -3,6 +3,9 @@ #include "drashna.h" #include "version.h" +#ifdef OS_DETECTION_ENABLE +# include "os_detection.h" +#endif uint16_t copy_paste_timer; bool host_driver_disabled = false; @@ -32,15 +35,6 @@ __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t * @return false Stop process keycode and do not send to host */ bool process_record_user(uint16_t keycode, keyrecord_t *record) { -#ifdef ENCODER_ENABLE // some debouncing for weird issues - if (IS_ENCODEREVENT(record->event)) { - static bool ignore_first = true; - if (ignore_first) { - ignore_first = false; - return false; - } - } -#endif // If console is enabled, it will print the matrix position and status of each key pressed #ifdef KEYLOGGER_ENABLE uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %1d, time: %5u, int: %1d, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count); @@ -195,6 +189,29 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; } + case OLED_LOCK: { +#if defined(OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER) + extern bool is_oled_locked; + if (record->event.pressed) { + is_oled_locked = !is_oled_locked; + if (is_oled_locked) { + oled_on(); + } + } +#endif + } break; +#if defined(OS_DETECTION_ENABLE) && defined(OS_DETECTION_DEBUG_ENABLE) + case STORE_SETUPS: + if (record->event.pressed) { + store_setups_in_eeprom(); + } + return false; + case PRINT_SETUPS: + if (record->event.pressed) { + print_stored_setups(); + } + return false; +#endif } return true; } diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h index 5c8fe889e4ef..8073b7adb07e 100644 --- a/users/drashna/keyrecords/process_records.h +++ b/users/drashna/keyrecords/process_records.h @@ -5,7 +5,7 @@ #include "drashna.h" enum userspace_custom_keycodes { - VRSN = SAFE_RANGE, // Prints QMK Firmware and board info + VRSN = QK_USER, // Prints QMK Firmware and board info KC_QWERTY, // Sets default layer to QWERTY FIRST_DEFAULT_LAYER_KEYCODE = KC_QWERTY, // Sets default layer to QWERTY KC_COLEMAK_DH, // Sets default layer to COLEMAK @@ -39,7 +39,12 @@ enum userspace_custom_keycodes { KC_SUPER, KC_COMIC, KC_ACCEL, - NEW_SAFE_RANGE // use "NEWPLACEHOLDER for keymap specific codes + OLED_LOCK, + + STORE_SETUPS, + PRINT_SETUPS, + + USER_SAFE_RANGE, // use "NEWPLACEHOLDER for keymap specific codes }; bool process_record_secrets(uint16_t keycode, keyrecord_t *record); diff --git a/users/drashna/keyrecords/readme.md b/users/drashna/keyrecords/readme.md index 5f708f9edf88..b89777db3d83 100644 --- a/users/drashna/keyrecords/readme.md +++ b/users/drashna/keyrecords/readme.md @@ -1,7 +1,5 @@ # Keycode handling and interception - * [Autocorrection](autocorrection/readme.md) - * [Cap Words](capwords.md) * [Diablo Tap Dancing](tap_dance.md) * [Keymap Wrappers](wrappers.md) * [Secret Macros](secrets.md) diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c index 6dbe3b48129e..98506247df3e 100644 --- a/users/drashna/oled/oled_stuff.c +++ b/users/drashna/oled/oled_stuff.c @@ -25,7 +25,7 @@ #endif #include -bool is_oled_enabled = true; +bool is_oled_enabled = true, is_oled_locked = false; extern bool host_driver_disabled; @@ -75,9 +75,9 @@ void add_keylog(uint16_t keycode, keyrecord_t *record) { keycode = QK_MODS_GET_BASIC_KEYCODE(keycode); } - if ((keycode == KC_BSPC) && mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL) { memset(keylog_str, ' ', OLED_KEYLOGGER_LENGTH); + keylog_str[OLED_KEYLOGGER_LENGTH-1] = 0x00; return; } if (record->tap.count) { @@ -86,10 +86,10 @@ void add_keylog(uint16_t keycode, keyrecord_t *record) { return; } - memmove(keylog_str, keylog_str + 1, OLED_KEYLOGGER_LENGTH - 1); + memmove(keylog_str, keylog_str + 1, OLED_KEYLOGGER_LENGTH - 2); if (keycode < ARRAY_SIZE(code_to_name)) { - keylog_str[(OLED_KEYLOGGER_LENGTH - 1)] = pgm_read_byte(&code_to_name[keycode]); + keylog_str[(OLED_KEYLOGGER_LENGTH - 2)] = pgm_read_byte(&code_to_name[keycode]); } log_timer = timer_read(); @@ -638,10 +638,10 @@ void render_pointing_dpi_status(uint16_t cpi, uint8_t padding, uint8_t col, uint #define OLED_KAKI_SPEED 40 // above this wpm value typing animation to triggere #define OLED_RTOGI_FRAMES 2 -//#define OLED_LTOGI_FRAMES 2 +// #define OLED_LTOGI_FRAMES 2 -//#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms -// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing +// #define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms +// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define OLED_ANIM_SIZE 36 #define OLED_ANIM_ROWS 4 #define OLED_ANIM_MAX_FRAMES 3 @@ -735,7 +735,7 @@ void render_kitty(uint8_t col, uint8_t line) { } void render_unicode_mode(uint8_t col, uint8_t line) { -#ifdef CUSTOM_UNICODE_ENABLE +#if defined(CUSTOM_UNICODE_ENABLE) && defined(UNICODE_COMMON_ENABLE) oled_set_cursor(col, line); oled_write_P(PSTR("Unicode:"), false); oled_write_P(unicode_mode_str[unicode_typing_mode], false); @@ -802,19 +802,6 @@ void render_mouse_mode(uint8_t col, uint8_t line) { } void render_status_right(void) { -#if defined(KEYBOARD_handwired_tractyl_manuform) - oled_set_cursor(7, 0); - oled_write_P(PSTR("Manuform"), true); -#elif defined(KEYBOARD_bastardkb_charybdis) - oled_set_cursor(6, 0); - oled_write_P(PSTR("Charybdis"), true); -#elif defined(KEYBOARD_splitkb_kyria) - oled_set_cursor(8, 0); - oled_write_P(PSTR("Kyria"), true); -#else - oled_set_cursor(8, 0); - oled_write_P(PSTR("Right"), true); -#endif #if defined(OLED_DISPLAY_VERBOSE) render_default_layer_state(1, 1); #else @@ -834,23 +821,6 @@ void render_status_left(void) { #if defined(OLED_DISPLAY_VERBOSE) render_kitty(0, 1); -# if defined(KEYBOARD_handwired_tractyl_manuform) - oled_set_cursor(7, 0); - oled_write_P(PSTR("Tractyl"), true); -# elif defined(KEYBOARD_bastardkb_charybdis) - oled_set_cursor(6, 0); - oled_write_P(PSTR("Charybdis"), true); -# elif defined(KEYBOARD_splitkb_kyria) - oled_set_cursor(7, 0); - oled_write_P(PSTR("SplitKB"), true); -# elif defined(KEYBOARD_handwired_fingerpunch_rockon) - oled_set_cursor(7, 0); - oled_write_P(PSTR("Rock On"), true); -# else - oled_set_cursor(8, 0); - oled_write_P(PSTR("Left"), true); -# endif - # if defined(WPM_ENABLE) render_wpm(1, 7, 1); # elif defined(DEBUG_MATRIX_SCAN_RATE) @@ -883,6 +853,11 @@ __attribute__((weak)) void oled_render_large_display(bool side) { } } +__attribute__((weak)) void render_oled_title(bool side) { + oled_write_P(side ? PSTR(" Left ") : PSTR(" Right "), true); + // oled_write_P(PSTR( "1234567890123" "1234567890123"), true); +} + __attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; } @@ -924,6 +899,9 @@ bool oled_task_user(void) { // 0,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 7, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255, 0 }; oled_write_raw_P(header_image, sizeof(header_image)); + + oled_set_cursor(4, 0); + render_oled_title(is_keyboard_left()); #endif #ifndef OLED_DISPLAY_TEST @@ -966,6 +944,6 @@ bool oled_task_user(void) { extern bool oled_initialized; -__attribute__((weak)) void matrix_scan_oled(void) { - is_oled_enabled = !(timer_elapsed32(oled_timer) > 60000); +__attribute__((weak)) void housekeeping_task_oled(void) { + is_oled_enabled = is_oled_locked ? true : !(timer_elapsed32(oled_timer) > 60000); } diff --git a/users/drashna/oled/oled_stuff.h b/users/drashna/oled/oled_stuff.h index df1a6d1805e6..419cdc11ebbe 100644 --- a/users/drashna/oled/oled_stuff.h +++ b/users/drashna/oled/oled_stuff.h @@ -45,7 +45,8 @@ void render_kitty(uint8_t col, uint8_t line); void render_unicode_mode(uint8_t col, uint8_t line); void render_rgb_hsv(uint8_t col, uint8_t line); void render_mouse_mode(uint8_t col, uint8_t line); -void matrix_scan_oled(void); +void housekeeping_task_oled(void); +void render_oled_title(bool side); void oled_pan_section(bool left, uint16_t y_start, uint16_t y_end, uint16_t x_start, uint16_t x_end); @@ -54,7 +55,7 @@ void oled_pan_section(bool left, uint16_t y_start, uint16_t y_end, uint16_t x_st # define OLED_RENDER_KEYLOGGER "Keylogger: " # ifndef OLED_KEYLOGGER_LENGTH -# define OLED_KEYLOGGER_LENGTH 9 +# define OLED_KEYLOGGER_LENGTH 10 # endif # define OLED_RENDER_LAYOUT_NAME "Layout: " # define OLED_RENDER_LAYOUT_QWERTY "Qwerty" @@ -101,7 +102,7 @@ void oled_pan_section(bool left, uint16_t y_start, uint16_t y_end, uint16_t x_st #else # define OLED_RENDER_KEYLOGGER "KLogr" # ifndef OLED_KEYLOGGER_LENGTH -# define OLED_KEYLOGGER_LENGTH 5 +# define OLED_KEYLOGGER_LENGTH 6 # endif # define OLED_RENDER_LAYOUT_NAME "Lyout" @@ -148,7 +149,7 @@ void oled_pan_section(bool left, uint16_t y_start, uint16_t y_end, uint16_t x_st # define OLED_RENDER_WPM_COUNTER "WPM: " #endif -extern char keylog_str[OLED_KEYLOGGER_LENGTH]; +extern char keylog_str[]; #ifndef OLED_WPM_GRAPH_MAX_WPM # define OLED_WPM_GRAPH_MAX_WPM 120 diff --git a/users/drashna/oled/sh110x.c b/users/drashna/oled/sh110x.c index 9fed5a9d1a6e..f96a93a8973a 100644 --- a/users/drashna/oled/sh110x.c +++ b/users/drashna/oled/sh110x.c @@ -324,78 +324,77 @@ static void rotate_90(const uint8_t *src, uint8_t *dest) { } void oled_render(void) { - if (!oled_initialized) { - return; - } - // Do we have work to do? oled_dirty &= OLED_ALL_BLOCKS_MASK; - if (!oled_dirty || oled_scrolling) { + if (!oled_dirty || !oled_initialized || oled_scrolling) { return; } - // Find first dirty block + // Turn on display if it is off + oled_on(); + uint8_t update_start = 0; - while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) { - ++update_start; - } + uint8_t num_processed = 0; + while (oled_dirty && num_processed++ < OLED_UPDATE_PROCESS_LIMIT) { // render all dirty blocks (up to the configured limit) + // Find next dirty block + while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) { + ++update_start; + } - // Set column & page position - static uint8_t display_start[] = {I2C_CMD, PAM_PAGE_ADDR, PAM_SETCOLUMN_LSB, PAM_SETCOLUMN_MSB}; - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start - } else { - calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start - } + // Set column & page position + static uint8_t display_start[] = {I2C_CMD, PAM_PAGE_ADDR, PAM_SETCOLUMN_LSB, PAM_SETCOLUMN_MSB}; + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start + } else { + calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start + } - // Send column & page position - if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) { - print("oled_render offset command failed\n"); - return; - } + // Send column & page position + if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) { + print("oled_render offset command failed\n"); + return; + } - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - // Send render data chunk as is - if (I2C_WRITE_REG(I2C_DATA, &oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) { - print("oled_render data failed\n"); - return; - } - } else { - // Rotate the render chunks - const static uint8_t source_map[] = OLED_SOURCE_MAP; - const static uint8_t target_map[] = OLED_TARGET_MAP; - - static uint8_t temp_buffer[OLED_BLOCK_SIZE]; - memset(temp_buffer, 0, sizeof(temp_buffer)); - for (uint8_t i = 0; i < sizeof(source_map); ++i) { - rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]); - } + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + // Send render data chunk as is + if (I2C_WRITE_REG(I2C_DATA, &oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) { + print("oled_render data failed\n"); + return; + } + } else { + // Rotate the render chunks + const static uint8_t source_map[] = OLED_SOURCE_MAP; + const static uint8_t target_map[] = OLED_TARGET_MAP; + + static uint8_t temp_buffer[OLED_BLOCK_SIZE]; + memset(temp_buffer, 0, sizeof(temp_buffer)); + for (uint8_t i = 0; i < sizeof(source_map); ++i) { + rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]); + } - // For SH1106 or SH1107 the data chunk must be split into separate pieces for each page - const uint8_t columns_in_block = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8; - const uint8_t num_pages = OLED_BLOCK_SIZE / columns_in_block; - for (uint8_t i = 0; i < num_pages; ++i) { - // Send column & page position for all pages except the first one - if (i > 0) { - display_start[1]++; - if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) { - print("oled_render offset command failed\n"); + // For SH1106 or SH1107 the data chunk must be split into separate pieces for each page + const uint8_t columns_in_block = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8; + const uint8_t num_pages = OLED_BLOCK_SIZE / columns_in_block; + for (uint8_t i = 0; i < num_pages; ++i) { + // Send column & page position for all pages except the first one + if (i > 0) { + display_start[1]++; + if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) { + print("oled_render offset command failed\n"); + return; + } + } + // Send data for the page + if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[columns_in_block * i], columns_in_block) != I2C_STATUS_SUCCESS) { + print("oled_render90 data failed\n"); return; } } - // Send data for the page - if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[columns_in_block * i], columns_in_block) != I2C_STATUS_SUCCESS) { - print("oled_render90 data failed\n"); - return; - } } - } - // Turn on display if it is off - oled_on(); - - // Clear dirty flag - oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start); + // Clear dirty flag + oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start); + } } void oled_set_cursor(uint8_t col, uint8_t line) { diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c index a74c9fd41e19..18dad0da816f 100644 --- a/users/drashna/pointing/pointing.c +++ b/users/drashna/pointing/pointing.c @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "pointing.h" +#include "math.h" static uint16_t mouse_debounce_timer = 0; bool enable_acceleration = false; @@ -38,8 +39,10 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { oled_timer_reset(); #endif if (enable_acceleration) { - x = (mouse_xy_report_t)(x > 0 ? x * x / 16 + x : -x * x / 16 + x); - y = (mouse_xy_report_t)(y > 0 ? y * y / 16 + y : -y * y / 16 + y); + x = (mouse_xy_report_t)(x > 0 ? pow(4, x) / 2 + x : -pow(4, abs(x)) / 2 + x); + y = (mouse_xy_report_t)(y > 0 ? pow(5, y) / 2 + y : -pow(5, abs(y)) / 2 + y); +// x = (mouse_xy_report_t)(x > 0 ? x * x / 16 + x : -x * x / 16 + x); +// y = (mouse_xy_report_t)(y > 0 ? y * y / 16 + y : -y * y / 16 + y); } mouse_report.x = x; mouse_report.y = y; @@ -81,9 +84,7 @@ bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record) { switch (keycode) { # if defined(KEYBOARD_ploopy) case DPI_CONFIG: -# elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES) - case QK_KB ... QK_KB_MAX: -# elif (defined(KEYBOARD_bastardkb_dilemma) && !defined(NO_DILEMMA_KEYCODES)) +# elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES) || (defined(KEYBOARD_bastardkb_dilemma) && !defined(NO_DILEMMA_KEYCODES)) case QK_KB ... QK_KB_MAX: # endif case KC_ACCEL: diff --git a/users/drashna/pointing/pointing_config.h b/users/drashna/pointing/pointing_config.h new file mode 100644 index 000000000000..50c29ede852b --- /dev/null +++ b/users/drashna/pointing/pointing_config.h @@ -0,0 +1,6 @@ +// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define POINTING_DEVICE_MODES_ENABLE diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h index 85e60df68105..85ce0e310811 100644 --- a/users/drashna/post_config.h +++ b/users/drashna/post_config.h @@ -137,7 +137,7 @@ # define USB_SUSPEND_WAKEUP_DELAY 200 #endif -#ifdef XAP_ENABLE +#if defined(XAP_ENABLE) && !defined(__AVR__) # undef DYNAMIC_KEYMAP_LAYER_COUNT # define DYNAMIC_KEYMAP_LAYER_COUNT 12 #endif diff --git a/users/drashna/rgb/rgb_matrix_stuff.c b/users/drashna/rgb/rgb_matrix_stuff.c index 2867641a3e98..eff9191eb749 100644 --- a/users/drashna/rgb/rgb_matrix_stuff.c +++ b/users/drashna/rgb/rgb_matrix_stuff.c @@ -40,15 +40,12 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode } } -__attribute__((weak)) void rgb_matrix_indicator_keymap(void) {} - -void matrix_scan_rgb_matrix(void) { +void housekeeping_task_rgb_matrix(void) { #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP && sync_timer_elapsed32(hypno_timer) > 15000) { rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE); } #endif - rgb_matrix_indicator_keymap(); } void keyboard_post_init_rgb_matrix(void) { diff --git a/users/drashna/rgb/rgb_matrix_stuff.h b/users/drashna/rgb/rgb_matrix_stuff.h index 7c6f6c271e40..9559134c8cc6 100644 --- a/users/drashna/rgb/rgb_matrix_stuff.h +++ b/users/drashna/rgb/rgb_matrix_stuff.h @@ -6,7 +6,7 @@ bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record); void keyboard_post_init_rgb_matrix(void); -void matrix_scan_rgb_matrix(void); +void housekeeping_task_rgb_matrix(void); void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue); void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type, uint8_t led_min, uint8_t led_max); diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk index 980d09576bef..43186b024ae4 100644 --- a/users/drashna/rules.mk +++ b/users/drashna/rules.mk @@ -138,3 +138,8 @@ ifeq ($(strip $(CUSTOM_BOOTMAGIC_ENABLE)), yes) SRC += bootmagic_better.c endif endif + +OS_DETECTION_ENABLE ?= yes +ifeq ($(strip $(OS_DETECTION_ENABLE)), yes) + DEFERRED_EXEC_ENABLE = yes +endif diff --git a/users/drashna/split/split_config.h b/users/drashna/split/split_config.h index 21ff3829bb7b..17daa4f808dc 100644 --- a/users/drashna/split/split_config.h +++ b/users/drashna/split/split_config.h @@ -3,17 +3,13 @@ #pragma once -// # define SPLIT_TRANSPORT_MIRROR +#define SPLIT_TRANSPORT_MIRROR #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE #define SPLIT_MODS_ENABLE -#ifndef POINTING_DEVICE_ENABLE -# define SPLIT_WATCHDOG_ENABLE -#endif -#ifdef WPM_ENABLE -# define SPLIT_WPM_ENABLE -#endif -#ifdef OLED_ENABLE +#define SPLIT_WATCHDOG_ENABLE +#define SPLIT_WPM_ENABLE +#ifdef SPLIT_OLED_ENABLE # undef SPLIT_OLED_ENABLE #endif #if defined(__AVR__) && !defined(SELECT_SOFT_SERIAL_SPEED) diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c index 0284627ed286..bd6f7c568820 100644 --- a/users/drashna/split/transport_sync.c +++ b/users/drashna/split/transport_sync.c @@ -52,7 +52,7 @@ void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiato #ifdef CUSTOM_OLED_DRIVER # include "oled/oled_stuff.h" void keylogger_string_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) { - if (initiator2target_buffer_size == OLED_KEYLOGGER_LENGTH) { + if (initiator2target_buffer_size == (OLED_KEYLOGGER_LENGTH)) { memcpy(&keylog_str, initiator2target_buffer, initiator2target_buffer_size); } } diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h index 8bfb49bf6389..e27e598f831a 100644 --- a/users/drashna/split/transport_sync.h +++ b/users/drashna/split/transport_sync.h @@ -6,7 +6,7 @@ #include "drashna.h" #ifdef OLED_ENABLE # include "oled/oled_stuff.h" -extern char keylog_str[OLED_KEYLOGGER_LENGTH]; +extern char keylog_str[]; #endif typedef union { diff --git a/util/uf2conv.py b/util/uf2conv.py index 7f5645414a2d..52d3861cba0c 100755 --- a/util/uf2conv.py +++ b/util/uf2conv.py @@ -8,6 +8,7 @@ import os.path import argparse import json +from time import sleep UF2_MAGIC_START0 = 0x0A324655 # "UF2\n" @@ -276,23 +277,25 @@ def error(msg): 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 error(msg): 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 fafae82a60a4..c2140fe351a2 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 951d4fc40d7b..000000000000 --- 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 a8396007ee09..000000000000 --- 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