summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cannonkeys')
-rw-r--r--keyboards/cannonkeys/brutalv2_1800/info.json76
-rw-r--r--keyboards/cannonkeys/caerdroia/info.json76
-rw-r--r--keyboards/cannonkeys/chimera65_hs/info.json126
-rw-r--r--keyboards/cannonkeys/ellipse/info.json130
-rw-r--r--keyboards/cannonkeys/ellipse_hs/info.json124
-rw-r--r--keyboards/cannonkeys/moment/info.json128
-rw-r--r--keyboards/cannonkeys/moment_hs/info.json124
-rw-r--r--keyboards/cannonkeys/ortho60v2/info.json120
-rw-r--r--keyboards/cannonkeys/serenity/info.json74
-rw-r--r--keyboards/cannonkeys/typeb/info.json122
10 files changed, 550 insertions, 550 deletions
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json
index 0515152901..64ca1975b6 100644
--- a/keyboards/cannonkeys/brutalv2_1800/info.json
+++ b/keyboards/cannonkeys/brutalv2_1800/info.json
@@ -34,44 +34,44 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
- { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
- { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
- { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
- { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
- { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
- { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
- { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
- { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
- { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
- { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
- { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
- { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
- { "matrix": [0, 14], "x": 15.5, "y": 0.0 },
- { "matrix": [0, 15], "x": 16.5, "y": 0.0 },
- { "matrix": [0, 16], "x": 17.5, "y": 0.0 },
- { "matrix": [0, 17], "x": 18.5, "y": 0.0 },
- { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
- { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
- { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
- { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
- { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
- { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
- { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
- { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
- { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
- { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
- { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
- { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
- { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
- { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
- { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+ { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 },
+ { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 },
+ { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 },
+ { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 },
+ { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+ { "matrix": [0, 14], "x": 15.5, "y": 0 },
+ { "matrix": [0, 15], "x": 16.5, "y": 0 },
+ { "matrix": [0, 16], "x": 17.5, "y": 0 },
+ { "matrix": [0, 17], "x": 18.5, "y": 0 },
+ { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "!", "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, "y": 1.25 },
+ { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "matrix": [1, 13], "x": 13, "y": 1.25 },
+ { "matrix": [3, 12], "x": 14, "y": 1.25 },
{ "label": "Insert", "matrix": [1, 14], "x": 15.5, "y": 1.25 },
{ "label": "Home", "matrix": [1, 15], "x": 16.5, "y": 1.25 },
{ "label": "PgUp", "matrix": [1, 16], "x": 17.5, "y": 1.25 },
{ "matrix": [1, 17], "x": 18.5, "y": 1.25 },
- { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+ { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -89,7 +89,7 @@
{ "label": "End", "matrix": [2, 15], "x": 16.5, "y": 2.25 },
{ "label": "PgDn", "matrix": [2, 16], "x": 17.5, "y": 2.25 },
{ "matrix": [2, 17], "x": 18.5, "y": 2.25 },
- { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+ { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -106,7 +106,7 @@
{ "matrix": [3, 15], "x": 16.5, "y": 3.25 },
{ "matrix": [3, 16], "x": 17.5, "y": 3.25 },
{ "matrix": [3, 17], "x": 18.5, "y": 3.25 },
- { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+ { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
{ "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -124,11 +124,11 @@
{ "matrix": [4, 15], "x": 16.5, "y": 4.25 },
{ "matrix": [4, 16], "x": 17.5, "y": 4.25 },
{ "matrix": [4, 17], "x": 18.5, "y": 4.25 },
- { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+ { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
{ "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
- { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10.0, "y": 5.25 },
+ { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.25 },
{ "label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.25 },
{ "label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/info.json
index 9fb4da4c93..1b3bd40e67 100644
--- a/keyboards/cannonkeys/caerdroia/info.json
+++ b/keyboards/cannonkeys/caerdroia/info.json
@@ -31,41 +31,41 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
- { "matrix": [0, 10], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 13.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
- { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
- { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
- { "matrix": [0, 16], "x": 17.25, "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": [1, 4], "x": 4.0, "y": 1.25 },
- { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
- { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
- { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
- { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
- { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
- { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
- { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
- { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
- { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
- { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+ { "matrix": [0, 0], "x": 0, "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.5, "y": 0 },
+ { "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "matrix": [0, 9], "x": 9.5, "y": 0 },
+ { "matrix": [0, 10], "x": 11, "y": 0 },
+ { "matrix": [0, 11], "x": 12, "y": 0 },
+ { "matrix": [0, 12], "x": 13, "y": 0 },
+ { "matrix": [0, 13], "x": 14, "y": 0 },
+ { "matrix": [0, 14], "x": 15.25, "y": 0 },
+ { "matrix": [0, 15], "x": 16.25, "y": 0 },
+ { "matrix": [0, 16], "x": 17.25, "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, "y": 1.25 },
+ { "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "matrix": [1, 13], "x": 13, "y": 1.25 },
+ { "matrix": [3, 12], "x": 14, "y": 1.25 },
{ "matrix": [1, 14], "x": 15.25, "y": 1.25 },
{ "matrix": [1, 15], "x": 16.25, "y": 1.25 },
{ "matrix": [1, 16], "x": 17.25, "y": 1.25 },
- { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+ { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -82,7 +82,7 @@
{ "matrix": [2, 14], "x": 15.25, "y": 2.25 },
{ "matrix": [2, 15], "x": 16.25, "y": 2.25 },
{ "matrix": [2, 16], "x": 17.25, "y": 2.25 },
- { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+ { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -95,7 +95,7 @@
{ "matrix": [3, 10], "x": 10.75, "y": 3.25 },
{ "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
- { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
{ "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -108,13 +108,13 @@
{ "matrix": [4, 10], "x": 10.25, "y": 4.25 },
{ "matrix": [4, 11], "x": 11.25, "y": 4.25 },
{ "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
- { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+ { "matrix": [4, 13], "x": 14, "y": 4.25 },
{ "matrix": [4, 15], "x": 16.25, "y": 4.25 },
- { "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+ { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
{ "matrix": [5, 1], "x": 1.5, "y": 5.25 },
{ "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
- { "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
- { "matrix": [5, 11], "w": 1.5, "x": 11.0, "y": 5.25 },
+ { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+ { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
{ "matrix": [5, 12], "x": 12.5, "y": 5.25 },
{ "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
{ "matrix": [5, 14], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/info.json
index bea5e6b7c8..be1e83e190 100644
--- a/keyboards/cannonkeys/chimera65_hs/info.json
+++ b/keyboards/cannonkeys/chimera65_hs/info.json
@@ -30,70 +30,70 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "matrix": [1, 14], "x": 15.5, "y": 1.0 },
- { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "matrix": [2, 14], "x": 15.5, "y": 2.0 },
- { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.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], "x": 13, "y": 0 },
+ { "matrix": [0, 14], "x": 14, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "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], "x": 15.5, "y": 1 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "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, 13], "w": 2.25, "x": 12.75, "y": 2 },
+ { "matrix": [2, 14], "x": 15.5, "y": 2 },
+ { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
{ "matrix": [3, 13], "x": 14.25, "y": 3.25 },
- { "matrix": [3, 14], "x": 15.5, "y": 3.0 },
- { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
- { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
- { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
- { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
- { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4.0 },
+ { "matrix": [3, 14], "x": 15.5, "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, 10], "w": 1.5, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4 },
{ "matrix": [4, 12], "x": 13.25, "y": 4.25 },
{ "matrix": [4, 13], "x": 14.25, "y": 4.25 },
{ "matrix": [4, 14], "x": 15.25, "y": 4.25 }
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json
index 7788b893bf..461ec4971e 100644
--- a/keyboards/cannonkeys/ellipse/info.json
+++ b/keyboards/cannonkeys/ellipse/info.json
@@ -36,71 +36,71 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
- { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
- { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4.0 }
+ { "label": "Esc", "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": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "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], "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 },
+ { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "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": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Fn", "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 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+ { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+ { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json
index 76cb0cfae2..f83f26bcaa 100644
--- a/keyboards/cannonkeys/ellipse_hs/info.json
+++ b/keyboards/cannonkeys/ellipse_hs/info.json
@@ -26,68 +26,68 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "label": "Esc", "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": "Del", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "Bksp", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "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], "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], "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": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json
index 462c42d9b6..63da2b29e4 100644
--- a/keyboards/cannonkeys/moment/info.json
+++ b/keyboards/cannonkeys/moment/info.json
@@ -36,70 +36,70 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
- { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "label": "Esc", "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": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "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], "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 },
+ { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "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": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/info.json
index 721eb80ad2..098d0dc4cf 100644
--- a/keyboards/cannonkeys/moment_hs/info.json
+++ b/keyboards/cannonkeys/moment_hs/info.json
@@ -30,68 +30,68 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 14], "x": 13.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "label": "Esc", "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": "Bksp", "matrix": [0, 14], "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "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], "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], "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": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/info.json
index 03e1a28f30..0f7c6ba0c6 100644
--- a/keyboards/cannonkeys/ortho60v2/info.json
+++ b/keyboards/cannonkeys/ortho60v2/info.json
@@ -38,66 +38,66 @@
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
- { "label": "`", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": "0", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.0, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.0, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.0, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.0, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.0, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.0, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.0, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.0, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.0, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.0, "y": 1.0 },
- { "label": "Back Space", "matrix": [1, 11], "x": 11.0, "y": 1.0 },
- { "label": "Esc", "matrix": [2, 0], "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.0, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.0, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.0, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.0, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.0, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.0, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.0, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.0, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.0, "y": 2.0 },
- { "label": ";", "matrix": [2, 10], "x": 10.0, "y": 2.0 },
- { "label": "'", "matrix": [2, 11], "x": 11.0, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "x": 0.0, "y": 3.0 },
- { "label": "Z", "matrix": [3, 1], "x": 1.0, "y": 3.0 },
- { "label": "X", "matrix": [3, 2], "x": 2.0, "y": 3.0 },
- { "label": "C", "matrix": [3, 3], "x": 3.0, "y": 3.0 },
- { "label": "V", "matrix": [3, 4], "x": 4.0, "y": 3.0 },
- { "label": "B", "matrix": [3, 5], "x": 5.0, "y": 3.0 },
- { "label": "N", "matrix": [3, 6], "x": 6.0, "y": 3.0 },
- { "label": "M", "matrix": [3, 7], "x": 7.0, "y": 3.0 },
- { "label": ",", "matrix": [3, 8], "x": 8.0, "y": 3.0 },
- { "label": ".", "matrix": [3, 9], "x": 9.0, "y": 3.0 },
- { "label": "/", "matrix": [3, 10], "x": 10.0, "y": 3.0 },
- { "label": "Return", "matrix": [3, 11], "x": 11.0, "y": 3.0 },
- { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
- { "label": "Ctrl", "matrix": [4, 1], "x": 1.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "x": 2.0, "y": 4.0 },
- { "label": "Super", "matrix": [4, 3], "x": 3.0, "y": 4.0 },
- { "label": "Lower", "matrix": [4, 4], "x": 4.0, "y": 4.0 },
- { "matrix": [4, 5], "x": 5.0, "y": 4.0 },
- { "matrix": [4, 6], "x": 6.0, "y": 4.0 },
- { "label": "Raise", "matrix": [4, 7], "x": 7.0, "y": 4.0 },
- { "label": "&larr;", "matrix": [4, 8], "x": 8.0, "y": 4.0 },
- { "label": "&darr;", "matrix": [4, 9], "x": 9.0, "y": 4.0 },
- { "label": "&uarr;", "matrix": [4, 10], "x": 10.0, "y": 4.0 },
- { "label": "&rarr;", "matrix": [4, 11], "x": 11.0, "y": 4.0 }
+ { "label": "`", "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": "Del", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10, "y": 1 },
+ { "label": "Back Space", "matrix": [1, 11], "x": 11, "y": 1 },
+ { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9, "y": 2 },
+ { "label": ";", "matrix": [2, 10], "x": 10, "y": 2 },
+ { "label": "'", "matrix": [2, 11], "x": 11, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3 },
+ { "label": "X", "matrix": [3, 2], "x": 2, "y": 3 },
+ { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
+ { "label": "V", "matrix": [3, 4], "x": 4, "y": 3 },
+ { "label": "B", "matrix": [3, 5], "x": 5, "y": 3 },
+ { "label": "N", "matrix": [3, 6], "x": 6, "y": 3 },
+ { "label": "M", "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": "Return", "matrix": [3, 11], "x": 11, "y": 3 },
+ { "matrix": [4, 0], "x": 0, "y": 4 },
+ { "label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "x": 2, "y": 4 },
+ { "label": "Super", "matrix": [4, 3], "x": 3, "y": 4 },
+ { "label": "Lower", "matrix": [4, 4], "x": 4, "y": 4 },
+ { "matrix": [4, 5], "x": 5, "y": 4 },
+ { "matrix": [4, 6], "x": 6, "y": 4 },
+ { "label": "Raise", "matrix": [4, 7], "x": 7, "y": 4 },
+ { "label": "&larr;", "matrix": [4, 8], "x": 8, "y": 4 },
+ { "label": "&darr;", "matrix": [4, 9], "x": 9, "y": 4 },
+ { "label": "&uarr;", "matrix": [4, 10], "x": 10, "y": 4 },
+ { "label": "&rarr;", "matrix": [4, 11], "x": 11, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
index 9672161bfc..271589a75f 100644
--- a/keyboards/cannonkeys/serenity/info.json
+++ b/keyboards/cannonkeys/serenity/info.json
@@ -57,42 +57,42 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
- { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
- { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
- { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
- { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
- { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
- { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
- { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
- { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
- { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
- { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
- { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
- { "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
- { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
- { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
- { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
- { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
- { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
- { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
- { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
- { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
- { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
- { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
- { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
- { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
- { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
- { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
- { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
- { "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
- { "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+ { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 },
+ { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 },
+ { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 },
+ { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 },
+ { "label": "F13", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0 },
+ { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0 },
+ { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0 },
+ { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "!", "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, "y": 1.25 },
+ { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25 },
+ { "label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25 },
{ "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
{ "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
{ "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
- { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+ { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -109,7 +109,7 @@
{ "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
{ "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
{ "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
- { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+ { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -123,7 +123,7 @@
{ "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
{ "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
- { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+ { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
{ "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -138,11 +138,11 @@
{ "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 },
{ "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
{ "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
- { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+ { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
{ "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
- { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+ { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
{ "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
{ "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/info.json
index d09eb90026..b80474f46e 100644
--- a/keyboards/cannonkeys/typeb/info.json
+++ b/keyboards/cannonkeys/typeb/info.json
@@ -30,67 +30,67 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
- { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
- { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
- { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 6, "x": 4.0, "y": 4.0 },
- { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
- { "matrix": [4, 11], "x": 11.5, "y": 4.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], "x": 13, "y": 0 },
+ { "matrix": [2, 12], "x": 14, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "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": [2, 0], "w": 1.75, "x": 0, "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, 13], "w": 2.25, "x": 12.75, "y": 2 },
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 13], "x": 14, "y": 3 },
+ { "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 6, "x": 4, "y": 4 },
+ { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "x": 11.5, "y": 4 }
]
}
}