summaryrefslogtreecommitdiffstats
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-11-07 05:42:59 +1100
committerGitHub <noreply@github.com>2022-11-06 18:42:59 +0000
commit5f9b7c035bdbbbfccfcf2bbfed7d153f5043fdce (patch)
tree9368b09f51c1dc3e91dfcab4fc0fe9fcaf6f5e91 /keyboards/handwired
parentd9e559a78e88e13ee8e5ad951d8bf3e6386f50c3 (diff)
`handwired/swiftrax/walter`: fix layout mismatch (#18974)
* `handwired/swiftrax/walter`: fix layout mismatch * Undo K4A removal, fix info.json instead
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/swiftrax/walter/info.json52
-rw-r--r--keyboards/handwired/swiftrax/walter/walter.h107
2 files changed, 78 insertions, 81 deletions
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index 72f3ce4f40..5de2a6f5c7 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -77,11 +77,12 @@
{"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
{"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
{"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
- {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
- {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
- {"label": "r4_07", "x": 13, "y": 4},
- {"label": "r4_08", "x": 14, "y": 4},
- {"label": "r4_09", "x": 15, "y": 4}
+ {"label": "r5_05", "x": 10, "y": 4},
+ {"label": "r5_06", "x": 11, "y": 4},
+ {"label": "r5_07", "x": 12, "y": 4},
+ {"label": "r4_08", "x": 13, "y": 4},
+ {"label": "r4_09", "x": 14, "y": 4},
+ {"label": "r4_10", "x": 15, "y": 4}
]
},
"LAYOUT_65_iso": {
@@ -115,8 +116,7 @@
{"label": "r2_11", "x": 10.5, "y": 1},
{"label": "r2_12", "x": 11.5, "y": 1},
{"label": "r2_13", "x": 12.5, "y": 1},
- {"label": "r2_14", "x": 13.5, "y": 1},
- {"label": "r2_15", "x": 15, "y": 1},
+ {"label": "r2_14", "x": 15, "y": 1},
{"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
{"label": "r3_02", "x": 1.75, "y": 2},
@@ -134,7 +134,6 @@
{"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
{"label": "r3_15", "x": 15, "y": 2},
-
{"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
{"label": "r4_02", "x": 1.25, "y": 3},
{"label": "r4_03", "x": 2.25, "y": 3},
@@ -155,11 +154,12 @@
{"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
{"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
{"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
- {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
- {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
- {"label": "r4_07", "x": 13, "y": 4},
- {"label": "r4_08", "x": 14, "y": 4},
- {"label": "r4_09", "x": 15, "y": 4}
+ {"label": "r5_05", "x": 10, "y": 4},
+ {"label": "r5_06", "x": 11, "y": 4},
+ {"label": "r5_07", "x": 12, "y": 4},
+ {"label": "r4_08", "x": 13, "y": 4},
+ {"label": "r4_09", "x": 14, "y": 4},
+ {"label": "r4_10", "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_splitbs": {
@@ -231,11 +231,12 @@
{"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
{"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
{"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
- {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
- {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
- {"label": "r4_07", "x": 13, "y": 4},
- {"label": "r4_08", "x": 14, "y": 4},
- {"label": "r4_09", "x": 15, "y": 4}
+ {"label": "r5_05", "x": 10, "y": 4},
+ {"label": "r5_06", "x": 11, "y": 4},
+ {"label": "r5_07", "x": 12, "y": 4},
+ {"label": "r4_08", "x": 13, "y": 4},
+ {"label": "r4_09", "x": 14, "y": 4},
+ {"label": "r4_10", "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_splitbs": {
@@ -270,8 +271,7 @@
{"label": "r2_11", "x": 10.5, "y": 1},
{"label": "r2_12", "x": 11.5, "y": 1},
{"label": "r2_13", "x": 12.5, "y": 1},
- {"label": "r2_14", "x": 13.5, "y": 1},
- {"label": "r2_15", "x": 15, "y": 1},
+ {"label": "r2_14", "x": 15, "y": 1},
{"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
{"label": "r3_02", "x": 1.75, "y": 2},
@@ -289,7 +289,6 @@
{"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
{"label": "r3_15", "x": 15, "y": 2},
-
{"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
{"label": "r4_02", "x": 1.25, "y": 3},
{"label": "r4_03", "x": 2.25, "y": 3},
@@ -310,11 +309,12 @@
{"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
{"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
{"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
- {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
- {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
- {"label": "r4_07", "x": 13, "y": 4},
- {"label": "r4_08", "x": 14, "y": 4},
- {"label": "r4_09", "x": 15, "y": 4}
+ {"label": "r5_05", "x": 10, "y": 4},
+ {"label": "r5_06", "x": 11, "y": 4},
+ {"label": "r5_07", "x": 12, "y": 4},
+ {"label": "r4_08", "x": 13, "y": 4},
+ {"label": "r4_09", "x": 14, "y": 4},
+ {"label": "r4_10", "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/handwired/swiftrax/walter/walter.h b/keyboards/handwired/swiftrax/walter/walter.h
index e761797866..a99e24e9a4 100644
--- a/keyboards/handwired/swiftrax/walter/walter.h
+++ b/keyboards/handwired/swiftrax/walter/walter.h
@@ -18,61 +18,58 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
+#define LAYOUT_65_ansi( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
+ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \
+ { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+ { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \
+}
- #define LAYOUT_65_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \
- { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,KC_NO,K2F }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F }, \
- }
+#define LAYOUT_65_iso( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
+ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
+ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \
+ { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F }, \
+ { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \
+}
+
+#define LAYOUT_65_ansi_splitbs( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+ { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+ { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \
+}
- #define LAYOUT_65_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \
- { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F }, \
- }
- #define LAYOUT_65_ansi_splitbs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F }, \
- }
#define LAYOUT_65_iso_splitbs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F }, \
- }
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
+ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+ { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F }, \
+ { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \
+}