From f87cd8e8a02bf89d05737a19fd54e8ec6f63f90f Mon Sep 17 00:00:00 2001
From: Trent Hoh <trenthoh@gmail.com>
Date: Sun, 29 Aug 2021 19:09:43 +0800
Subject: [Keyboard] Corrected layout for np24 by YMDK (#14096)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/ymdk/np24/u4rgb6/info.json | 43 +++++++++++++++++++++++++++++++-----
 keyboards/ymdk/np24/u4rgb6/u4rgb6.h  | 26 +++++++++++++++++-----
 2 files changed, 58 insertions(+), 11 deletions(-)

(limited to 'keyboards/ymdk/np24/u4rgb6')

diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index 313eeabff7..fa8ff1fd01 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -37,37 +37,70 @@
                 {"x": 3, "y": 5.25}
             ]
         },
-        "LAYOUT_ortho_4x6": {
+        "LAYOUT_ortho_4x6_right": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
                 {"x": 2, "y": 0},
                 {"x": 3, "y": 0},
                 {"x": 4, "y": 0},
-                {"x": 5.25, "y": 0},
+                {"x": 5, "y": 0, "w": 1.5},
 
                 {"x": 0, "y": 1},
                 {"x": 1, "y": 1},
                 {"x": 2, "y": 1},
                 {"x": 3, "y": 1},
                 {"x": 4, "y": 1},
-                {"x": 5.25, "y": 1},
+                {"x": 5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2},
                 {"x": 1, "y": 2},
                 {"x": 2, "y": 2},
                 {"x": 3, "y": 2},
                 {"x": 4, "y": 2},
-                {"x": 5.25, "y": 2},
+                {"x": 5, "y": 2, "w": 1.5},
 
                 {"x": 0, "y": 3},
                 {"x": 1, "y": 3},
                 {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
-                {"x": 5.25, "y": 3}
+                {"x": 5, "y": 3, "w": 1.5}
             ]
         },
+
+        "LAYOUT_ortho_4x6_left": {
+            "layout": [
+                {"x": 0, "y": 0, "w": 1.5},
+                {"x": 1.5, "y": 0},
+                {"x": 2.5, "y": 0},
+                {"x": 3.5, "y": 0},
+                {"x": 4.5, "y": 0},
+                {"x": 5.5, "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": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+
+                {"x": 0, "y": 3, "w": 1.5},
+                {"x": 1.5, "y": 3},
+                {"x": 2.5, "y": 3},
+                {"x": 3.5, "y": 3},
+                {"x": 4.5, "y": 3},
+                {"x": 5.5, "y": 3}
+            ]
+        },
+
         "LAYOUT_numpad_6x4": {
             "layout": [
                 {"x": 0, "y": 0},
diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h b/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
index 83ec486887..7615cf2bed 100644
--- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
+++ b/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
@@ -36,18 +36,32 @@
     { k05, k15, k25, k35 }  \
 }
 
-#define LAYOUT_ortho_4x6( \
+#define LAYOUT_ortho_4x6_right( \
     k00, k01, k02, k03, k04, k05, \
     k10, k11, k12, k13, k14, k15, \
     k20, k21, k22, k23, k24, k25, \
     k30, k31, k32, k33, k34, k35  \
 ) { \
-    { k00, k10, k20, k30 }, \
-    { k01, k11, k21, k31 }, \
-    { k02, k12, k22, k32 }, \
-    { k03, k13, k23, k33 }, \
+    { k05, k15, k25, k35 }, \
     { k04, k14, k24, k34 }, \
-    { k05, k15, k25, k35 }  \
+    { k03, k13, k23, k33 }, \
+    { k02, k12, k22, k32 }, \
+    { k01, k11, k21, k31 }, \
+    { k00, k10, k20, k30 }  \
+}
+
+#define LAYOUT_ortho_4x6_left( \
+    k00, k01, k02, k03, k04, k05, \
+    k10, k11, k12, k13, k14, k15, \
+    k20, k21, k22, k23, k24, k25, \
+    k30, k31, k32, k33, k34, k35  \
+) { \
+    { k30, k20, k10, k00 }, \
+    { k31, k21, k11, k01 }, \
+    { k32, k22, k12, k02 }, \
+    { k33, k23, k13, k03 }, \
+    { k34, k24, k14, k04 }, \
+    { k35, k25, k15, k05 }  \
 }
 
 #define LAYOUT_numpad_6x4( \
-- 
cgit v1.2.3