summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-19 17:13:31 +0000
committerGitHub <noreply@github.com>2021-08-19 10:13:31 -0700
commit48a8682438d5708636c3260adfb6a75ac89ed05a (patch)
tree15d290871651e0e6eaa455140b5490688aae8471 /keyboards
parentc1484761889cee72e6695dea1bce0c70795f1ca1 (diff)
Linworks Whale75 Layout Macro refactor and Configurator fixes (#14059)
* info.json: human-friendly formatting * info.json: remove "w":1 instances * info.json: correct positions of Left, Down and Right Arrow keys * info.json: add LAYOUT_all data * move Home key to end of home row According to photographs of the keyboard, the fourth key down on the right side is physically on the home row. This commit moves the key argument and keycodes to the home row. * whale75.h: use QMK 3-character notation for matrix * whale75.h: add matrix diagram * add keyboard-level encoder functionality * info.json: correct key sequence on ISO layouts
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/linworks/whale75/info.json804
-rw-r--r--keyboards/linworks/whale75/keymaps/default/keymap.c8
-rw-r--r--keyboards/linworks/whale75/keymaps/via/keymap.c16
-rw-r--r--keyboards/linworks/whale75/whale75.c26
-rw-r--r--keyboards/linworks/whale75/whale75.h143
5 files changed, 569 insertions, 428 deletions
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index 7518afb9db..89fd24b390 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -1,364 +1,456 @@
{
- "keyboard_name": "Lx3 Whale 75",
- "maintainer": "ebastler",
- "width": 16.25,
- "height": 6.5,
- "layouts": {
- "LAYOUT_ansi": {
- "layout": [
- { "x": 0, "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": 11, "y": 0 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 15.25, "y": 0 },
+ "keyboard_name": "Lx3 Whale 75",
+ "maintainer": "ebastler",
+ "width": 16.25,
+ "height": 6.5,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"x":0, "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":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15.25, "y":0},
- { "x": 0, "y": 1.25 },
- { "x": 1, "y": 1.25 },
- { "x": 2, "y": 1.25 },
- { "x": 3, "y": 1.25 },
- { "x": 4, "y": 1.25 },
- { "x": 5, "y": 1.25 },
- { "x": 6, "y": 1.25 },
- { "x": 7, "y": 1.25 },
- { "x": 8, "y": 1.25 },
- { "x": 9, "y": 1.25 },
- { "x": 10, "y": 1.25 },
- { "x": 11, "y": 1.25 },
- { "x": 12, "y": 1.25 },
- { "x": 13, "y": 1.25, "w":2},
- { "x": 15.25, "y": 1.25 },
+ {"x":0, "y":1.25},
+ {"x":1, "y":1.25},
+ {"x":2, "y":1.25},
+ {"x":3, "y":1.25},
+ {"x":4, "y":1.25},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.25},
+ {"x":7, "y":1.25},
+ {"x":8, "y":1.25},
+ {"x":9, "y":1.25},
+ {"x":10, "y":1.25},
+ {"x":11, "y":1.25},
+ {"x":12, "y":1.25},
+ {"x":13, "y":1.25},
+ {"x":14, "y":1.25},
+ {"x":15.25, "y":1.25},
- { "x": 0, "y": 2.25, "w": 1.5 },
- { "x": 1.5, "y": 2.25 },
- { "x": 2.5, "y": 2.25 },
- { "x": 3.5, "y": 2.25 },
- { "x": 4.5, "y": 2.25 },
- { "x": 5.5, "y": 2.25 },
- { "x": 6.5, "y": 2.25 },
- { "x": 7.5, "y": 2.25 },
- { "x": 8.5, "y": 2.25 },
- { "x": 9.5, "y": 2.25 },
- { "x": 10.5, "y": 2.25 },
- { "x": 11.5, "y": 2.25 },
- { "x": 12.5, "y": 2.25 },
- { "x": 13.5, "y": 2.25, "w":1.5 },
- { "x": 15.25, "y": 2.25 },
+ {"x":0, "y":2.25, "w":1.5},
+ {"x":1.5, "y":2.25},
+ {"x":2.5, "y":2.25},
+ {"x":3.5, "y":2.25},
+ {"x":4.5, "y":2.25},
+ {"x":5.5, "y":2.25},
+ {"x":6.5, "y":2.25},
+ {"x":7.5, "y":2.25},
+ {"x":8.5, "y":2.25},
+ {"x":9.5, "y":2.25},
+ {"x":10.5, "y":2.25},
+ {"x":11.5, "y":2.25},
+ {"x":12.5, "y":2.25},
+ {"x":13.5, "y":2.25, "w":1.5},
+ {"x":15.25, "y":2.25},
- { "x": 0, "y": 3.25, "w": 1.75 },
- { "x": 1.75, "y": 3.25 },
- { "x": 2.75, "y": 3.25 },
- { "x": 3.75, "y": 3.25 },
- { "x": 4.75, "y": 3.25 },
- { "x": 5.75, "y": 3.25 },
- { "x": 6.75, "y": 3.25 },
- { "x": 7.75, "y": 3.25 },
- { "x": 8.75, "y": 3.25 },
- { "x": 9.75, "y": 3.25 },
- { "x": 10.75, "y": 3.25 },
- { "x": 11.75, "y": 3.25 },
- { "x": 12.75, "y": 3.25, "w":2.25 },
- { "x": 15.25, "y": 3.25 },
+ {"x":0, "y":3.25, "w":1.75},
+ {"x":1.75, "y":3.25},
+ {"x":2.75, "y":3.25},
+ {"x":3.75, "y":3.25},
+ {"x":4.75, "y":3.25},
+ {"x":5.75, "y":3.25},
+ {"x":6.75, "y":3.25},
+ {"x":7.75, "y":3.25},
+ {"x":8.75, "y":3.25},
+ {"x":9.75, "y":3.25},
+ {"x":10.75, "y":3.25},
+ {"x":11.75, "y":3.25},
+ {"x":12.75, "y":3.25},
+ {"x":13.75, "y":3.25, "w":1.25},
+ {"x":15.25, "y":3.25},
- { "x": 0, "y": 4.25, "w": 2.25 },
- { "x": 2.25, "y": 4.25 },
- { "x": 3.25, "y": 4.25 },
- { "x": 4.25, "y": 4.25 },
- { "x": 5.25, "y": 4.25 },
- { "x": 6.25, "y": 4.25 },
- { "x": 7.25, "y": 4.25 },
- { "x": 8.25, "y": 4.25 },
- { "x": 9.25, "y": 4.25 },
- { "x": 10.25, "y": 4.25 },
- { "x": 11.25, "y": 4.25 },
- { "x": 12.25, "y": 4.25, "w":1.75 },
- { "x": 14.25, "y": 4.5 },
+ {"x":0, "y":4.25, "w":1.25},
+ {"x":1.25, "y":4.25},
+ {"x":2.25, "y":4.25},
+ {"x":3.25, "y":4.25},
+ {"x":4.25, "y":4.25},
+ {"x":5.25, "y":4.25},
+ {"x":6.25, "y":4.25},
+ {"x":7.25, "y":4.25},
+ {"x":8.25, "y":4.25},
+ {"x":9.25, "y":4.25},
+ {"x":10.25, "y":4.25},
+ {"x":11.25, "y":4.25},
+ {"x":12.25, "y":4.25, "w":1.75},
+ {"x":14.25, "y":4.5},
- { "x": 0, "y": 5.25, "w": 1.25},
- { "x": 1.25, "y": 5.25, "w": 1.25},
- { "x": 2.5, "y": 5.25, "w": 1.25},
- { "x": 3.75, "y": 5.25, "w": 6.25},
- { "x": 10, "y": 5.25, "w": 1.5},
- { "x": 11.5, "y": 5.25, "w": 1.5},
- { "x": 13.25, "y": 5.25, "w": 1},
- { "x": 14.25, "y": 5.25, "w": 1},
- { "x": 15.25, "y": 5.25, "w": 1}
- ]
- },
- "LAYOUT_ansi_wkl": {
- "layout": [
- { "x": 0, "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": 11, "y": 0 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 15.25, "y": 0 },
-
- { "x": 0, "y": 1.25 },
- { "x": 1, "y": 1.25 },
- { "x": 2, "y": 1.25 },
- { "x": 3, "y": 1.25 },
- { "x": 4, "y": 1.25 },
- { "x": 5, "y": 1.25 },
- { "x": 6, "y": 1.25 },
- { "x": 7, "y": 1.25 },
- { "x": 8, "y": 1.25 },
- { "x": 9, "y": 1.25 },
- { "x": 10, "y": 1.25 },
- { "x": 11, "y": 1.25 },
- { "x": 12, "y": 1.25 },
- { "x": 13, "y": 1.25, "w":2},
- { "x": 15.25, "y": 1.25 },
-
- { "x": 0, "y": 2.25, "w": 1.5 },
- { "x": 1.5, "y": 2.25 },
- { "x": 2.5, "y": 2.25 },
- { "x": 3.5, "y": 2.25 },
- { "x": 4.5, "y": 2.25 },
- { "x": 5.5, "y": 2.25 },
- { "x": 6.5, "y": 2.25 },
- { "x": 7.5, "y": 2.25 },
- { "x": 8.5, "y": 2.25 },
- { "x": 9.5, "y": 2.25 },
- { "x": 10.5, "y": 2.25 },
- { "x": 11.5, "y": 2.25 },
- { "x": 12.5, "y": 2.25 },
- { "x": 13.5, "y": 2.25, "w":1.5 },
- { "x": 15.25, "y": 2.25 },
-
- { "x": 0, "y": 3.25, "w": 1.75 },
- { "x": 1.75, "y": 3.25 },
- { "x": 2.75, "y": 3.25 },
- { "x": 3.75, "y": 3.25 },
- { "x": 4.75, "y": 3.25 },
- { "x": 5.75, "y": 3.25 },
- { "x": 6.75, "y": 3.25 },
- { "x": 7.75, "y": 3.25 },
- { "x": 8.75, "y": 3.25 },
- { "x": 9.75, "y": 3.25 },
- { "x": 10.75, "y": 3.25 },
- { "x": 11.75, "y": 3.25 },
- { "x": 12.75, "y": 3.25, "w":2.25 },
- { "x": 15.25, "y": 3.25 },
-
- { "x": 0, "y": 4.25, "w": 2.25 },
- { "x": 2.25, "y": 4.25 },
- { "x": 3.25, "y": 4.25 },
- { "x": 4.25, "y": 4.25 },
- { "x": 5.25, "y": 4.25 },
- { "x": 6.25, "y": 4.25 },
- { "x": 7.25, "y": 4.25 },
- { "x": 8.25, "y": 4.25 },
- { "x": 9.25, "y": 4.25 },
- { "x": 10.25, "y": 4.25 },
- { "x": 11.25, "y": 4.25 },
- { "x": 12.25, "y": 4.25, "w":1.75 },
- { "x": 14.25, "y": 4.5 },
-
- { "x": 0, "y": 5.25, "w": 1.5},
- { "x": 1.5, "y": 5.25, "w": 1.5},
- { "x": 3, "y": 5.25, "w": 7},
- { "x": 10, "y": 5.25, "w": 1.5},
- { "x": 11.5, "y": 5.25, "w": 1.5},
- { "x": 13.25, "y": 5.25, "w": 1},
- { "x": 14.25, "y": 5.25, "w": 1},
- { "x": 15.25, "y": 5.25, "w": 1}
- ]
- },
- "LAYOUT_iso": {
- "layout": [
- { "x": 0, "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": 11, "y": 0 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 15.25, "y": 0 },
-
- { "x": 0, "y": 1.25 },
- { "x": 1, "y": 1.25 },
- { "x": 2, "y": 1.25 },
- { "x": 3, "y": 1.25 },
- { "x": 4, "y": 1.25 },
- { "x": 5, "y": 1.25 },
- { "x": 6, "y": 1.25 },
- { "x": 7, "y": 1.25 },
- { "x": 8, "y": 1.25 },
- { "x": 9, "y": 1.25 },
- { "x": 10, "y": 1.25 },
- { "x": 11, "y": 1.25 },
- { "x": 12, "y": 1.25 },
- { "x": 13, "y": 1.25, "w":2},
- { "x": 15.25, "y": 1.25 },
-
- { "x": 0, "y": 2.25, "w": 1.5 },
- { "x": 1.5, "y": 2.25 },
- { "x": 2.5, "y": 2.25 },
- { "x": 3.5, "y": 2.25 },
- { "x": 4.5, "y": 2.25 },
- { "x": 5.5, "y": 2.25 },
- { "x": 6.5, "y": 2.25 },
- { "x": 7.5, "y": 2.25 },
- { "x": 8.5, "y": 2.25 },
- { "x": 9.5, "y": 2.25 },
- { "x": 10.5, "y": 2.25 },
- { "x": 11.5, "y": 2.25 },
- { "x": 12.5, "y": 2.25 },
- { "x": 13.75, "y":2.25, "w":1.25, "h":2 },
- { "x": 15.25, "y": 2.25 },
-
- { "x": 0, "y": 3.25, "w": 1.75 },
- { "x": 1.75, "y": 3.25 },
- { "x": 2.75, "y": 3.25 },
- { "x": 3.75, "y": 3.25 },
- { "x": 4.75, "y": 3.25 },
- { "x": 5.75, "y": 3.25 },
- { "x": 6.75, "y": 3.25 },
- { "x": 7.75, "y": 3.25 },
- { "x": 8.75, "y": 3.25 },
- { "x": 9.75, "y": 3.25 },
- { "x": 10.75, "y": 3.25 },
- { "x": 11.75, "y": 3.25 },
- { "x": 12.75, "y": 3.25 },
- { "x": 15.25, "y": 3.25 },
-
- { "x": 0, "y": 4.25, "w": 1.25 },
- { "x": 1.25, "y": 4.25 },
- { "x": 2.25, "y": 4.25 },
- { "x": 3.25, "y": 4.25 },
- { "x": 4.25, "y": 4.25 },
- { "x": 5.25, "y": 4.25 },
- { "x": 6.25, "y": 4.25 },
- { "x": 7.25, "y": 4.25 },
- { "x": 8.25, "y": 4.25 },
- { "x": 9.25, "y": 4.25 },
- { "x": 10.25, "y": 4.25 },
- { "x": 11.25, "y": 4.25 },
- { "x": 12.25, "y": 4.25, "w":1.75 },
- { "x": 14.25, "y": 4.5 },
-
- { "x": 0, "y": 5.25, "w": 1.25},
- { "x": 1.25, "y": 5.25, "w": 1.25},
- { "x": 2.5, "y": 5.25, "w": 1.25},
- { "x": 3.75, "y": 5.25, "w": 6.25},
- { "x": 10, "y": 5.25, "w": 1.5},
- { "x": 11.5, "y": 5.25, "w": 1.5},
- { "x": 13.25, "y": 5.25, "w": 1},
- { "x": 14.25, "y": 5.25, "w": 1},
- { "x": 15.25, "y": 5.25, "w": 1}
- ]
- },
- "LAYOUT_iso_wkl": {
- "layout": [
- { "x": 0, "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": 11, "y": 0 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 15.25, "y": 0 },
-
- { "x": 0, "y": 1.25 },
- { "x": 1, "y": 1.25 },
- { "x": 2, "y": 1.25 },
- { "x": 3, "y": 1.25 },
- { "x": 4, "y": 1.25 },
- { "x": 5, "y": 1.25 },
- { "x": 6, "y": 1.25 },
- { "x": 7, "y": 1.25 },
- { "x": 8, "y": 1.25 },
- { "x": 9, "y": 1.25 },
- { "x": 10, "y": 1.25 },
- { "x": 11, "y": 1.25 },
- { "x": 12, "y": 1.25 },
- { "x": 13, "y": 1.25, "w":2},
- { "x": 15.25, "y": 1.25 },
-
- { "x": 0, "y": 2.25, "w": 1.5 },
- { "x": 1.5, "y": 2.25 },
- { "x": 2.5, "y": 2.25 },
- { "x": 3.5, "y": 2.25 },
- { "x": 4.5, "y": 2.25 },
- { "x": 5.5, "y": 2.25 },
- { "x": 6.5, "y": 2.25 },
- { "x": 7.5, "y": 2.25 },
- { "x": 8.5, "y": 2.25 },
- { "x": 9.5, "y": 2.25 },
- { "x": 10.5, "y": 2.25 },
- { "x": 11.5, "y": 2.25 },
- { "x": 12.5, "y": 2.25 },
- { "x": 13.75, "y":2.25, "w":1.25, "h":2 },
- { "x": 15.25, "y": 2.25 },
-
- { "x": 0, "y": 3.25, "w": 1.75 },
- { "x": 1.75, "y": 3.25 },
- { "x": 2.75, "y": 3.25 },
- { "x": 3.75, "y": 3.25 },
- { "x": 4.75, "y": 3.25 },
- { "x": 5.75, "y": 3.25 },
- { "x": 6.75, "y": 3.25 },
- { "x": 7.75, "y": 3.25 },
- { "x": 8.75, "y": 3.25 },
- { "x": 9.75, "y": 3.25 },
- { "x": 10.75, "y": 3.25 },
- { "x": 11.75, "y": 3.25 },
- { "x": 12.75, "y": 3.25 },
- { "x": 15.25, "y": 3.25 },
-
- { "x": 0, "y": 4.25, "w": 1.25 },
- { "x": 1.25, "y": 4.25 },
- { "x": 2.25, "y": 4.25 },
- { "x": 3.25, "y": 4.25 },
- { "x": 4.25, "y": 4.25 },
- { "x": 5.25, "y": 4.25 },
- { "x": 6.25, "y": 4.25 },
- { "x": 7.25, "y": 4.25 },
- { "x": 8.25, "y": 4.25 },
- { "x": 9.25, "y": 4.25 },
- { "x": 10.25, "y": 4.25 },
- { "x": 11.25, "y": 4.25 },
- { "x": 12.25, "y": 4.25, "w":1.75 },
- { "x": 14.25, "y": 4.5 },
-
- { "x": 0, "y": 5.25, "w": 1.5},
- { "x": 1.5, "y": 5.25, "w": 1.5},
- { "x": 3, "y": 5.25, "w": 7},
- { "x": 10, "y": 5.25, "w": 1.5},
- { "x": 11.5, "y": 5.25, "w": 1.5},
- { "x": 13.25, "y": 5.25, "w": 1},
- { "x": 14.25, "y": 5.25, "w": 1},
- { "x": 15.25, "y": 5.25, "w": 1}
- ]
+ {"x":0, "y":5.25, "w":1.25},
+ {"x":1.25, "y":5.25, "w":1.25},
+ {"x":2.5, "y":5.25, "w":1.25},
+ {"x":3.75, "y":5.25, "w":6.25},
+ {"x":10, "y":5.25, "w":1.5},
+ {"x":11.5, "y":5.25, "w":1.5},
+ {"x":13.25, "y":5.5},
+ {"x":14.25, "y":5.5},
+ {"x":15.25, "y":5.5}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"x":0, "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":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15.25, "y":0},
+
+ {"x":0, "y":1.25},
+ {"x":1, "y":1.25},
+ {"x":2, "y":1.25},
+ {"x":3, "y":1.25},
+ {"x":4, "y":1.25},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.25},
+ {"x":7, "y":1.25},
+ {"x":8, "y":1.25},
+ {"x":9, "y":1.25},
+ {"x":10, "y":1.25},
+ {"x":11, "y":1.25},
+ {"x":12, "y":1.25},
+ {"x":13, "y":1.25, "w":2},
+ {"x":15.25, "y":1.25},
+
+ {"x":0, "y":2.25, "w":1.5},
+ {"x":1.5, "y":2.25},
+ {"x":2.5, "y":2.25},
+ {"x":3.5, "y":2.25},
+ {"x":4.5, "y":2.25},
+ {"x":5.5, "y":2.25},
+ {"x":6.5, "y":2.25},
+ {"x":7.5, "y":2.25},
+ {"x":8.5, "y":2.25},
+ {"x":9.5, "y":2.25},
+ {"x":10.5, "y":2.25},
+ {"x":11.5, "y":2.25},
+ {"x":12.5, "y":2.25},
+ {"x":13.5, "y":2.25, "w":1.5},
+ {"x":15.25, "y":2.25},
+
+ {"x":0, "y":3.25, "w":1.75},
+ {"x":1.75, "y":3.25},
+ {"x":2.75, "y":3.25},
+ {"x":3.75, "y":3.25},
+ {"x":4.75, "y":3.25},
+ {"x":5.75, "y":3.25},
+ {"x":6.75, "y":3.25},
+ {"x":7.75, "y":3.25},
+ {"x":8.75, "y":3.25},
+ {"x":9.75, "y":3.25},
+ {"x":10.75, "y":3.25},
+ {"x":11.75, "y":3.25},
+ {"x":12.75, "y":3.25, "w":2.25},
+ {"x":15.25, "y":3.25},
+
+ {"x":0, "y":4.25, "w":2.25},
+ {"x":2.25, "y":4.25},
+ {"x":3.25, "y":4.25},
+ {"x":4.25, "y":4.25},
+ {"x":5.25, "y":4.25},
+ {"x":6.25, "y":4.25},
+ {"x":7.25, "y":4.25},
+ {"x":8.25, "y":4.25},
+ {"x":9.25, "y":4.25},
+ {"x":10.25, "y":4.25},
+ {"x":11.25, "y":4.25},
+ {"x":12.25, "y":4.25, "w":1.75},
+ {"x":14.25, "y":4.5},
+
+ {"x":0, "y":5.25, "w":1.25},
+ {"x":1.25, "y":5.25, "w":1.25},
+ {"x":2.5, "y":5.25, "w":1.25},
+ {"x":3.75, "y":5.25, "w":6.25},
+ {"x":10, "y":5.25, "w":1.5},
+ {"x":11.5, "y":5.25, "w":1.5},
+ {"x":13.25, "y":5.5},
+ {"x":14.25, "y":5.5},
+ {"x":15.25, "y":5.5}
+ ]
+ },
+ "LAYOUT_ansi_wkl": {
+ "layout": [
+ {"x":0, "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":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15.25, "y":0},
+
+ {"x":0, "y":1.25},
+ {"x":1, "y":1.25},
+ {"x":2, "y":1.25},
+ {"x":3, "y":1.25},
+ {"x":4, "y":1.25},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.25},
+ {"x":7, "y":1.25},
+ {"x":8, "y":1.25},
+ {"x":9, "y":1.25},
+ {"x":10, "y":1.25},
+ {"x":11, "y":1.25},
+ {"x":12, "y":1.25},
+ {"x":13, "y":1.25, "w":2},
+ {"x":15.25, "y":1.25},
+
+ {"x":0, "y":2.25, "w":1.5},
+ {"x":1.5, "y":2.25},
+ {"x":2.5, "y":2.25},
+ {"x":3.5, "y":2.25},
+ {"x":4.5, "y":2.25},
+ {"x":5.5, "y":2.25},
+ {"x":6.5, "y":2.25},
+ {"x":7.5, "y":2.25},
+ {"x":8.5, "y":2.25},
+ {"x":9.5, "y":2.25},
+ {"x":10.5, "y":2.25},
+ {"x":11.5, "y":2.25},
+ {"x":12.5, "y":2.25},
+ {"x":13.5, "y":2.25, "w":1.5},
+ {"x":15.25, "y":2.25},
+
+ {"x":0, "y":3.25, "w":1.75},
+ {"x":1.75, "y":3.25},
+ {"x":2.75, "y":3.25},
+ {"x":3.75, "y":3.25},
+ {"x":4.75, "y":3.25},
+ {"x":5.75, "y":3.25},
+ {"x":6.75, "y":3.25},
+ {"x":7.75, "y":3.25},
+ {"x":8.75, "y":3.25},
+ {"x":9.75, "y":3.25},
+ {"x":10.75, "y":3.25},
+ {"x":11.75, "y":3.25},
+ {"x":12.75, "y":3.25, "w":2.25},
+ {"x":15.25, "y":3.25},
+
+ {"x":0, "y":4.25, "w":2.25},
+ {"x":2.25, "y":4.25},
+ {"x":3.25, "y":4.25},
+ {"x":4.25, "y":4.25},
+ {"x":5.25, "y":4.25},
+ {"x":6.25, "y":4.25},
+ {"x":7.25, "y":4.25},
+ {"x":8.25, "y":4.25},
+ {"x":9.25, "y":4.25},
+ {"x":10.25, "y":4.25},
+ {"x":11.25, "y":4.25},
+ {"x":12.25, "y":4.25, "w":1.75},
+ {"x":14.25, "y":4.5},
+
+ {"x":0, "y":5.25, "w":1.5},
+ {"x":1.5, "y":5.25, "w":1.5},
+ {"x":3, "y":5.25, "w":7},
+ {"x":10, "y":5.25, "w":1.5},
+ {"x":11.5, "y":5.25, "w":1.5},
+ {"x":13.25, "y":5.5},
+ {"x":14.25, "y":5.5},
+ {"x":15.25, "y":5.5}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"x":0, "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":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15.25, "y":0},
+
+ {"x":0, "y":1.25},
+ {"x":1, "y":1.25},
+ {"x":2, "y":1.25},
+ {"x":3, "y":1.25},
+ {"x":4, "y":1.25},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.25},
+ {"x":7, "y":1.25},
+ {"x":8, "y":1.25},
+ {"x":9, "y":1.25},
+ {"x":10, "y":1.25},
+ {"x":11, "y":1.25},
+ {"x":12, "y":1.25},
+ {"x":13, "y":1.25, "w":2},
+ {"x":15.25, "y":1.25},
+
+ {"x":0, "y":2.25, "w":1.5},
+ {"x":1.5, "y":2.25},
+ {"x":2.5, "y":2.25},
+ {"x":3.5, "y":2.25},
+ {"x":4.5, "y":2.25},
+ {"x":5.5, "y":2.25},
+ {"x":6.5, "y":2.25},
+ {"x":7.5, "y":2.25},
+ {"x":8.5, "y":2.25},
+ {"x":9.5, "y":2.25},
+ {"x":10.5, "y":2.25},
+ {"x":11.5, "y":2.25},
+ {"x":12.5, "y":2.25},
+ {"x":15.25, "y":2.25},
+
+ {"x":0, "y":3.25, "w":1.75},
+ {"x":1.75, "y":3.25},
+ {"x":2.75, "y":3.25},
+ {"x":3.75, "y":3.25},
+ {"x":4.75, "y":3.25},
+ {"x":5.75, "y":3.25},
+ {"x":6.75, "y":3.25},
+ {"x":7.75, "y":3.25},
+ {"x":8.75, "y":3.25},
+ {"x":9.75, "y":3.25},
+ {"x":10.75, "y":3.25},
+ {"x":11.75, "y":3.25},
+ {"x":12.75, "y":3.25},
+ {"x":13.75, "y":2.25, "w":1.25, "h":2},
+ {"x":15.25, "y":3.25},
+
+ {"x":0, "y":4.25, "w":1.25},
+ {"x":1.25, "y":4.25},
+ {"x":2.25, "y":4.25},
+ {"x":3.25, "y":4.25},
+ {"x":4.25, "y":4.25},
+ {"x":5.25, "y":4.25},
+ {"x":6.25, "y":4.25},
+ {"x":7.25, "y":4.25},
+ {"x":8.25, "y":4.25},
+ {"x":9.25, "y":4.25},
+ {"x":10.25, "y":4.25},
+ {"x":11.25, "y":4.25},
+ {"x":12.25, "y":4.25, "w":1.75},
+ {"x":14.25, "y":4.5},
+
+ {"x":0, "y":5.25, "w":1.25},
+ {"x":1.25, "y":5.25, "w":1.25},
+ {"x":2.5, "y":5.25, "w":1.25},
+ {"x":3.75, "y":5.25, "w":6.25},
+ {"x":10, "y":5.25, "w":1.5},
+ {"x":11.5, "y":5.25, "w":1.5},
+ {"x":13.25, "y":5.5},
+ {"x":14.25, "y":5.5},
+ {"x":15.25, "y":5.5}
+ ]
+ },
+ "LAYOUT_iso_wkl": {
+ "layout": [
+ {"x":0, "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":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15.25, "y":0},
+
+ {"x":0, "y":1.25},
+ {"x":1, "y":1.25},
+ {"x":2, "y":1.25},
+ {"x":3, "y":1.25},
+ {"x":4, "y":1.25},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.25},
+ {"x":7, "y":1.25},
+ {"x":8, "y":1.25},
+ {"x":9, "y":1.25},
+ {"x":10, "y":1.25},
+ {"x":11, "y":1.25},
+ {"x":12, "y":1.25},
+ {"x":13, "y":1.25, "w":2},
+ {"x":15.25, "y":1.25},
+
+ {"x":0, "y":2.25, "w":1.5},
+ {"x":1.5, "y":2.25},
+ {"x":2.5, "y":2.25},
+ {"x":3.5, "y":2.25},
+ {"x":4.5, "y":2.25},
+ {"x":5.5, "y":2.25},
+ {"x":6.5, "y":2.25},
+ {"x":7.5, "y":2.25},
+ {"x":8.5, "y":2.25},
+ {"x":9.5, "y":2.25},
+ {"x":10.5, "y":2.25},
+ {"x":11.5, "y":2.25},
+ {"x":12.5, "y":2.25},
+ {"x":15.25, "y":2.25},
+
+ {"x":0, "y":3.25, "w":1.75},
+ {"x":1.75, "y":3.25},
+ {"x":2.75, "y":3.25},
+ {"x":3.75, "y":3.25},
+ {"x":4.75, "y":3.25},
+ {"x":5.75, "y":3.25},
+ {"x":6.75, "y":3.25},
+ {"x":7.75, "y":3.25},
+ {"x":8.75, "y":3.25},
+ {"x":9.75, "y":3.25},
+ {"x":10.75, "y":3.25},
+ {"x":11.75, "y":3.25},
+ {"x":12.75, "y":3.25},
+ {"x":13.75, "y":2.25, "w":1.25, "h":2},
+ {"x":15.25, "y":3.25},
+
+ {"x":0, "y":4.25, "w":1.25},
+ {"x":1.25, "y":4.25},
+ {"x":2.25, "y":4.25},
+ {"x":3.25, "y":4.25},
+ {"x":4.25, "y":4.25},
+ {"x":5.25, "y":4.25},
+ {"x":6.25, "y":4.25},
+ {"x":7.25, "y":4.25},
+ {"x":8.25, "y":4.25},
+ {"x":9.25, "y":4.25},
+ {"x":10.25, "y":4.25},
+ {"x":11.25, "y":4.25},
+ {"x":12.25, "y":4.25, "w":1.75},
+ {"x":14.25, "y":4.5},
+
+ {"x":0, "y":5.25, "w":1.5},
+ {"x":1.5, "y":5.25, "w":1.5},
+ {"x":3, "y":5.25, "w":7},
+ {"x":10, "y":5.25, "w":1.5},
+ {"x":11.5, "y":5.25, "w":1.5},
+ {"x":13.25, "y":5.5},
+ {"x":14.25, "y":5.5},
+ {"x":15.25, "y":5.5}
+ ]
+ }
}
- }
}
diff --git a/keyboards/linworks/whale75/keymaps/default/keymap.c b/keyboards/linworks/whale75/keymaps/default/keymap.c
index a2298865ef..8aa21048eb 100644
--- a/keyboards/linworks/whale75/keymaps/default/keymap.c
+++ b/keyboards/linworks/whale75/keymaps/default/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_MUTE,
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_TRNS, KC_BSPC, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME,
+ 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC, BL_INC, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI, KC_MPLY,
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_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_PGDN,
- 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_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_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, MO(1), KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/linworks/whale75/keymaps/via/keymap.c b/keyboards/linworks/whale75/keymaps/via/keymap.c
index 3412e8397f..eab5f110d1 100644
--- a/keyboards/linworks/whale75/keymaps/via/keymap.c
+++ b/keyboards/linworks/whale75/keymaps/via/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_MUTE,
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_TRNS, KC_BSPC, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME,
+ 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
@@ -30,16 +30,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC, BL_INC, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_MPLY,
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_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_PGDN,
- 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_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_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
),
[2] = LAYOUT_all( /* keymap for layer 2 */
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, 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
),
@@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_T