From b520b352f952d83eb67187c0e062ce8f0dff1f79 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Sun, 18 Jun 2023 14:38:09 +0300
Subject: [PATCH] preonic/rev3{,_drop}: Fix layouts with 2u keys (#21114)
Apparently layouts with 2u keys were not correctly converted into the
`info.json` format (the old C layout macros used the arguments for such
keys multiple times to cover all possible 1u locations; this is not
supported in `info.json`, and the single matrix location for 2u keys was
chosen incorrectly in some cases). Fix the layout definitions to match
the real PCB wiring.
---
keyboards/preonic/rev3/info.json | 8 ++++----
keyboards/preonic/rev3_drop/info.json | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index d6d494e005..e69aacf144 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -90,7 +90,7 @@
{"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 4], "x": 4, "y": 4},
- {"matrix": [9, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
{"matrix": [9, 1], "x": 7, "y": 4},
{"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4},
@@ -223,7 +223,7 @@
{"matrix": [8, 1], "x": 1, "y": 4},
{"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4},
- {"matrix": [9, 4], "x": 4, "y": 4, "w": 2},
+ {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
{"matrix": [9, 0], "x": 6, "y": 4},
{"matrix": [9, 1], "x": 7, "y": 4},
{"matrix": [9, 2], "x": 8, "y": 4},
@@ -290,8 +290,8 @@
{"matrix": [8, 1], "x": 1, "y": 4},
{"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4},
- {"matrix": [9, 4], "x": 4, "y": 4, "w": 2},
- {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+ {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+ {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
{"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4},
{"matrix": [8, 4], "x": 10, "y": 4},
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index a3eac4eaf4..7e5eace3d5 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -89,7 +89,7 @@
{"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 4], "x": 4, "y": 4},
- {"matrix": [9, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
{"matrix": [9, 1], "x": 7, "y": 4},
{"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4},
@@ -290,7 +290,7 @@
{"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
- {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+ {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
{"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4},
{"matrix": [8, 4], "x": 10, "y": 4},