From b1fe44345f4e2e8523e7b995d9ffcd388b70f865 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 28 Sep 2021 21:49:35 +0000
Subject: [PATCH] Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635)

* add LAYOUT_numpad_6x4

* tidy-up info.json data

* use GitHub account name for maintainer field
* remove meta key

* add matrix diagram to delphine.h

* update Community Layout support
---
 keyboards/mechlovin/delphine/delphine.h | 38 +++++++++++++++++++++++++
 keyboards/mechlovin/delphine/info.json  | 33 +++++++++++++++++++--
 keyboards/mechlovin/delphine/rules.mk   |  5 ++--
 3 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/keyboards/mechlovin/delphine/delphine.h b/keyboards/mechlovin/delphine/delphine.h
index 1112fc27ffde..da0254eeb400 100644
--- a/keyboards/mechlovin/delphine/delphine.h
+++ b/keyboards/mechlovin/delphine/delphine.h
@@ -18,6 +18,28 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┐
+ * │00 │01 │02 │03 │
+ * └───┴───┴───┴───┘
+ * ┌───┬───┬───┬───┐
+ * │10 │11 │12 │13 │
+ * ├───┼───┼───┼───┤   ┌───┐
+ * │20 │21 │22 │23 │   │   │
+ * ├───┼───┼───┼───┤   │23 │ 2u Plus
+ * │30 │31 │32 │33 │   │   │
+ * ├───┼───┼───┼───┤   ├───┤
+ * │40 │41 │42 │43 │   │   │
+ * ├───┼───┼───┼───┤   │43 │ 2u Enter
+ * │50 │51 │52 │53 │   │   │
+ * └───┴───┴───┴───┘   └───┘
+ * ┌───────┐
+ * │51     │ 2u 0/Ins
+ * └───────┘
+ */
+
 #define LAYOUT_ortho_6x4( \
     K00, K01, K02, K03,   \
     K10, K11, K12, K13,   \
@@ -33,3 +55,19 @@
     { K40,   K41,   K42,   K43   }, \
     { K50,   K51,   K52,   K53   }, \
 }
+
+#define LAYOUT_numpad_6x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22,      \
+    K30, K31, K32, K23, \
+    K40, K41, K42,      \
+    K51,      K52, K43  \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, XXX }, \
+    { K40, K41, K42, K43 }, \
+    { XXX, K51, K52, XXX }, \
+}
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index 36b6ac38abc3..38ae0a3beb50 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Delphine",
     "url": "",
-    "maintainer": "Team Mechlovin'",
+    "maintainer": "mechlovin",
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
@@ -30,7 +30,36 @@
                 {"label":"K52 (D3,D6)", "x":2, "y":5.25},
                 {"label":"K53 (D3,D2)", "x":3, "y":5.25}
             ]
+        },
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"label":"K00 (F0,F7)", "x":0, "y":0},
+                {"label":"K01 (F0,D7)", "x":1, "y":0},
+                {"label":"K02 (F0,D6)", "x":2, "y":0},
+                {"label":"K03 (F0,D2)", "x":3, "y":0},
+
+                {"label":"K10 (F1,F7)", "x":0, "y":1.25},
+                {"label":"K11 (F1,D7)", "x":1, "y":1.25},
+                {"label":"K12 (F1,D6)", "x":2, "y":1.25},
+                {"label":"K13 (F1,D2)", "x":3, "y":1.25},
+
+                {"label":"K20 (F4,F7)", "x":0, "y":2.25},
+                {"label":"K21 (F4,D7)", "x":1, "y":2.25},
+                {"label":"K22 (F4,D6)", "x":2, "y":2.25},
+
+                {"label":"K30 (F5,F7)", "x":0, "y":3.25},
+                {"label":"K31 (F5,D7)", "x":1, "y":3.25},
+                {"label":"K32 (F5,D6)", "x":2, "y":3.25},
+                {"label":"K23 (F4,D2)", "x":3, "y":2.25, "h":2},
+
+                {"label":"K40 (F6,F7)", "x":0, "y":4.25},
+                {"label":"K41 (F6,D7)", "x":1, "y":4.25},
+                {"label":"K42 (F6,D6)", "x":2, "y":4.25},
+
+                {"label":"K51 (D3,D7)", "x":0, "y":5.25, "w":2},
+                {"label":"K52 (D3,D6)", "x":2, "y":5.25},
+                {"label":"K43 (F6,D2)", "x":3, "y":4.25, "h":2}
+            ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk
index b7cb9d955dd2..be3533e85bcf 100644
--- a/keyboards/mechlovin/delphine/rules.mk
+++ b/keyboards/mechlovin/delphine/rules.mk
@@ -20,5 +20,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS = ortho_6x4
-DEFAULT_FOLDER = mechlovin/delphine/mono_led
\ No newline at end of file
+LAYOUTS = numpad_6x4 ortho_6x4
+
+DEFAULT_FOLDER = mechlovin/delphine/mono_led