summaryrefslogtreecommitdiff
path: root/keyboards/percent
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/percent')
-rw-r--r--keyboards/percent/canoe/canoe.h53
-rw-r--r--keyboards/percent/canoe/info.json153
-rw-r--r--keyboards/percent/canoe_gen2/canoe_gen2.c2
-rw-r--r--keyboards/percent/canoe_gen2/canoe_gen2.h54
-rw-r--r--keyboards/percent/canoe_gen2/info.json293
5 files changed, 300 insertions, 255 deletions
diff --git a/keyboards/percent/canoe/canoe.h b/keyboards/percent/canoe/canoe.h
deleted file mode 100644
index 83d7c08bb5..0000000000
--- a/keyboards/percent/canoe/canoe.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define _x_ KC_NO
-
-#define LAYOUT_65_iso_blocker( \
- K0D, K0C, K0B, K0A, K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, K0E, \
- K1D, K1C, K1B, K1A, K19, K18, K17, K16, K15, K14, K13, K12, K11, K1E, \
- K2D, K2C, K2B, K2A, K29, K28, K27, K26, K25, K24, K23, K22, K10, K21, K2E, \
- K3D, K4A, K3C, K3B, K3A, K39, K38, K37, K36, K35, K34, K33, K32, K30, K3E, \
- K4D, K4C, K4B, K48, K44, K43, K42, K40, K4E \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { _x_, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, _x_, K42, K43, K44, _x_, _x_, _x_, K48, _x_, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K0D, K0C, K0B, K0A, K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, K0E, \
- K1D, K1C, K1B, K1A, K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, K1E, \
- K2D, K2C, K2B, K2A, K29, K28, K27, K26, K25, K24, K23, K22, K21, K2E, \
- K3D, K3C, K3B, K3A, K39, K38, K37, K36, K35, K34, K33, K32, K30, K3E, \
- K4D, K4C, K4B, K48, K44, K43, K42, K40, K4E \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { _x_, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, _x_, K42, K43, K44, _x_, _x_, _x_, K48, _x_, _x_, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT LAYOUT_65_ansi_blocker // added to not break existing checked in keymaps
-#define LAYOUT_iso LAYOUT_65_iso_blocker
diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json
index 8d57368916..fcbdf6bac8 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -25,12 +25,161 @@
"processor": "atmega32a",
"bootloader": "bootloadhid",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker",
+ "LAYOUT_iso": "LAYOUT_65_iso_blocker"
+ },
"layouts": {
"LAYOUT_65_iso_blocker": {
- "layout": [{"label":"K0D", "x":0, "y":0}, {"label":"K0C", "x":1, "y":0}, {"label":"K0B", "x":2, "y":0}, {"label":"K0A", "x":3, "y":0}, {"label":"K09", "x":4, "y":0}, {"label":"K08", "x":5, "y":0}, {"label":"K07", "x":6, "y":0}, {"label":"K06", "x":7, "y":0}, {"label":"K05", "x":8, "y":0}, {"label":"K04", "x":9, "y":0}, {"label":"K03", "x":10, "y":0}, {"label":"K02", "x":11, "y":0}, {"label":"K01", "x":12, "y":0}, {"label":"K00", "x":13, "y":0, "w":2}, {"label":"K0E", "x":15, "y":0}, {"label":"K1D", "x":0, "y":1, "w":1.5}, {"label":"K1C", "x":1.5, "y":1}, {"label":"K1B", "x":2.5, "y":1}, {"label":"K1A", "x":3.5, "y":1}, {"label":"K19", "x":4.5, "y":1}, {"label":"K18", "x":5.5, "y":1}, {"label":"K17", "x":6.5, "y":1}, {"label":"K16", "x":7.5, "y":1}, {"label":"K15", "x":8.5, "y":1}, {"label":"K14", "x":9.5, "y":1}, {"label":"K13", "x":10.5, "y":1}, {"label":"K12", "x":11.5, "y":1}, {"label":"K11", "x":12.5, "y":1}, {"label":"K1E", "x":15, "y":1}, {"label":"K2D", "x":0, "y":2, "w":1.75}, {"label":"K2C", "x":1.75, "y":2}, {"label":"K2B", "x":2.75, "y":2}, {"label":"K2A", "x":3.75, "y":2}, {"label":"K29", "x":4.75, "y":2}, {"label":"K28", "x":5.75, "y":2}, {"label":"K27", "x":6.75, "y":2}, {"label":"K26", "x":7.75, "y":2}, {"label":"K25", "x":8.75, "y":2}, {"label":"K24", "x":9.75, "y":2}, {"label":"K23", "x":10.75, "y":2}, {"label":"K22", "x":11.75, "y":2}, {"label":"K10", "x":12.75, "y":2}, {"label":"K21", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"K2E", "x":15, "y":2}, {"label":"K3D", "x":0, "y":3, "w":1.25}, {"label":"K4A", "x":1.25, "y":3}, {"label":"K3C", "x":2.25, "y":3}, {"label":"K3B", "x":3.25, "y":3}, {"label":"K3A", "x":4.25, "y":3}, {"label":"K39", "x":5.25, "y":3}, {"label":"K38", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K36", "x":8.25, "y":3}, {"label":"K35", "x":9.25, "y":3}, {"label":"K34", "x":10.25, "y":3}, {"label":"K33", "x":11.25, "y":3}, {"label":"K32", "x":12.25, "y":3, "w":1.75}, {"label":"K30", "x":14, "y":3}, {"label":"K3E", "x":15, "y":3}, {"label":"K4D", "x":0, "y":4, "w":1.25}, {"label":"K4C", "x":1.25, "y":4, "w":1.25}, {"label":"K4B", "x":2.5, "y":4, "w":1.25}, {"label":"K48", "x":3.75, "y":4, "w":6.25}, {"label":"K44", "x":10, "y":4, "w":1.25}, {"label":"K43", "x":11.25, "y":4, "w":1.25}, {"label":"K42", "x":13, "y":4}, {"label":"K40", "x":14, "y":4}, {"label":"K4E", "x":15, "y":4}]
+ "layout": [
+ {"label": "K0D", "matrix": [0, 13], "x": 0, "y": 0},
+ {"label": "K0C", "matrix": [0, 12], "x": 1, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "x": 2, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 3, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 4, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 5, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 6, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 8, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 9, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 10, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 11, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 12, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 13, "y": 0, "w": 2},
+ {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "K1D", "matrix": [1, 13], "x": 0, "y": 1, "w": 1.5},
+ {"label": "K1C", "matrix": [1, 12], "x": 1.5, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "x": 2.5, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 3.5, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 4.5, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 5.5, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 6.5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7.5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 8.5, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 9.5, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 10.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 11.5, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 12.5, "y": 1},
+ {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "K2D", "matrix": [2, 13], "x": 0, "y": 2, "w": 1.75},
+ {"label": "K2C", "matrix": [2, 12], "x": 1.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 2.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 3.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 4.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 5.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 6.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 8.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 9.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 10.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 11.75, "y": 2},
+ {"label": "K10", "matrix": [1, 0], "x": 12.75, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K3D", "matrix": [3, 13], "x": 0, "y": 3, "w": 1.25},
+ {"label": "K4A", "matrix": [4, 10], "x": 1.25, "y": 3},
+ {"label": "K3C", "matrix": [3, 12], "x": 2.25, "y": 3},
+ {"label": "K3B", "matrix": [3, 11], "x": 3.25, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 4.25, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 5.25, "y": 3},
+ {"label": "K38", "matrix": [3, 8], "x": 6.25, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 8.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 10.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 11.25, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "K30", "matrix": [3, 0], "x": 14, "y": 3},
+ {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K4D", "matrix": [4, 13], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K4C", "matrix": [4, 12], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "K4B", "matrix": [4, 11], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "K48", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "K44", "matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"label": "K43", "matrix": [4, 3], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "K42", "matrix": [4, 2], "x": 13, "y": 4},
+ {"label": "K40", "matrix": [4, 0], "x": 14, "y": 4},
+ {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_65_ansi_blocker": {
- "layout": [{"label":"K0D", "x":0, "y":0}, {"label":"K0C", "x":1, "y":0}, {"label":"K0B", "x":2, "y":0}, {"label":"K0A", "x":3, "y":0}, {"label":"K09", "x":4, "y":0}, {"label":"K08", "x":5, "y":0}, {"label":"K07", "x":6, "y":0}, {"label":"K06", "x":7, "y":0}, {"label":"K05", "x":8, "y":0}, {"label":"K04", "x":9, "y":0}, {"label":"K03", "x":10, "y":0}, {"label":"K02", "x":11, "y":0}, {"label":"K01", "x":12, "y":0}, {"label":"K00", "x":13, "y":0, "w":2}, {"label":"K0E", "x":15, "y":0}, {"label":"K1D", "x":0, "y":1, "w":1.5}, {"label":"K1C", "x":1.5, "y":1}, {"label":"K1B", "x":2.5, "y":1}, {"label":"K1A", "x":3.5, "y":1}, {"label":"K19", "x":4.5, "y":1}, {"label":"K18", "x":5.5, "y":1}, {"label":"K17", "x":6.5, "y":1}, {"label":"K16", "x":7.5, "y":1}, {"label":"K15", "x":8.5, "y":1}, {"label":"K14", "x":9.5, "y":1}, {"label":"K13", "x":10.5, "y":1}, {"label":"K12", "x":11.5, "y":1}, {"label":"K11", "x":12.5, "y":1}, {"label":"K10", "x":13.5, "y":1, "w":1.5}, {"label":"K1E", "x":15, "y":1}, {"label":"K2D", "x":0, "y":2, "w":1.75}, {"label":"K2C", "x":1.75, "y":2}, {"label":"K2B", "x":2.75, "y":2}, {"label":"K2A", "x":3.75, "y":2}, {"label":"K29", "x":4.75, "y":2}, {"label":"K28", "x":5.75, "y":2}, {"label":"K27", "x":6.75, "y":2}, {"label":"K26", "x":7.75, "y":2}, {"label":"K25", "x":8.75, "y":2}, {"label":"K24", "x":9.75, "y":2}, {"label":"K23", "x":10.75, "y":2}, {"label":"K22", "x":11.75, "y":2}, {"label":"K21", "x":12.75, "y":2, "w":2.25}, {"label":"K2E", "x":15, "y":2}, {"label":"K3D", "x":0, "y":3, "w":2.25}, {"label":"K3C", "x":2.25, "y":3}, {"label":"K3B", "x":3.25, "y":3}, {"label":"K3A", "x":4.25, "y":3}, {"label":"K39", "x":5.25, "y":3}, {"label":"K38", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K36", "x":8.25, "y":3}, {"label":"K35", "x":9.25, "y":3}, {"label":"K34", "x":10.25, "y":3}, {"label":"K33", "x":11.25, "y":3}, {"label":"K32", "x":12.25, "y":3, "w":1.75}, {"label":"K30", "x":14, "y":3}, {"label":"K3E", "x":15, "y":3}, {"label":"K4D", "x":0, "y":4, "w":1.25}, {"label":"K4C", "x":1.25, "y":4, "w":1.25}, {"label":"K4B", "x":2.5, "y":4, "w":1.25}, {"label":"K48", "x":3.75, "y":4, "w":6.25}, {"label":"K44", "x":10, "y":4, "w":1.25}, {"label":"K43", "x":11.25, "y":4, "w":1.25}, {"label":"K42", "x":13, "y":4}, {"label":"K40", "x":14, "y":4}, {"label":"K4E", "x":15, "y":4}]
+ "layout": [
+ {"label": "K0D", "matrix": [0, 13], "x": 0, "y": 0},
+ {"label": "K0C", "matrix": [0, 12], "x": 1, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "x": 2, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 3, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 4, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 5, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 6, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 8, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 9, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 10, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 11, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 12, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 13, "y": 0, "w": 2},
+ {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "K1D", "matrix": [1, 13], "x": 0, "y": 1, "w": 1.5},
+ {"label": "K1C", "matrix": [1, 12], "x": 1.5, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "x": 2.5, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 3.5, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 4.5, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 5.5, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 6.5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7.5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 8.5, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 9.5, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 10.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 11.5, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 12.5, "y": 1},
+ {"label": "K10", "matrix": [1, 0], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "K2D", "matrix": [2, 13], "x": 0, "y": 2, "w": 1.75},
+ {"label": "K2C", "matrix": [2, 12], "x": 1.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 2.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 3.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 4.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 5.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 6.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 8.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 9.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 10.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 11.75, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K3D", "matrix": [3, 13], "x": 0, "y": 3, "w": 2.25},
+ {"label": "K3C", "matrix": [3, 12], "x": 2.25, "y": 3},
+ {"label": "K3B", "matrix": [3, 11], "x": 3.25, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 4.25, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 5.25, "y": 3},
+ {"label": "K38", "matrix": [3, 8], "x": 6.25, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 8.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 10.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 11.25, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "K30", "matrix": [3, 0], "x": 14, "y": 3},
+ {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K4D", "matrix": [4, 13], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K4C", "matrix": [4, 12], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "K4B", "matrix": [4, 11], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "K48", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "K44", "matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"label": "K43", "matrix": [4, 3], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "K42", "matrix": [4, 2], "x": 13, "y": 4},
+ {"label": "K40", "matrix": [4, 0], "x": 14, "y": 4},
+ {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c
index 47ade5dd4f..e5beff54a3 100644
--- a/keyboards/percent/canoe_gen2/canoe_gen2.c
+++ b/keyboards/percent/canoe_gen2/canoe_gen2.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "canoe_gen2.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
setPinOutput(E6);
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.h b/keyboards/percent/canoe_gen2/canoe_gen2.h
deleted file mode 100644
index d4582eef25..0000000000
--- a/keyboards/percent/canoe_gen2/canoe_gen2.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_all LAYOUT_65_iso_blocker_split_bs
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
- k40, k41, k42, k46, k49, k4a, k4c, k4d, k4e \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
- {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
- {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, ___, k4c, k4d, k4e} \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
- k40, k41, k42, k46, k49, k4a, k4c, k4d, k4e \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
- {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, ___, k4c, k4d, k4e} \
-}
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
index 9426dd27b9..96d646c4a0 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -16,158 +16,161 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_iso_blocker_split_bs"
+ },
"layouts": {
"LAYOUT_65_ansi_blocker_split_bs": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
- {"x":15, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2, "w":2.25},
- {"x":15, "y":2},
-
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
-
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"x":10, "y":4, "w":1.25},
- {"x":11.25, "y":4, "w":1.25},
- {"x":13, "y":4},
- {"x":14, "y":4},
- {"x":15, "y":4}
+ {"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": [1, 13], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"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], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"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], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker_split_bs": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":15, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2},
- {"x":13.75, "y":1, "w":1.25, "h":2},
- {"x":15, "y":2},
-
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
-
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"x":10, "y":4, "w":1.25},
- {"x":11.25, "y":4, "w":1.25},
- {"x":13, "y":4},
- {"x":14, "y":4},
- {"x":15, "y":4}
+ {"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": [1, 13], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"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, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"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], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 22:01:17 +0000