Update the support for lazydesigners/dimple (#14797)

Co-authored-by: Ryan <fauxpark@gmail.com>

31 files changed, 1026 insertions, 31 deletions

diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index d5bab811ee..7ed6da4064 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -57,3 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
 #endif
+
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
new file mode 100644
index 0000000000..dbe70f821f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/info.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Dimple", 
+    "url": "http://lazydesigners.cn", 
+    "maintainer": "Jacky@LAZYDESIGNERS", 
+    "layouts": {
+        "LAYOUT_ortho_2u": {
+            "layout": [
+              {"label":"Esc", "x":0, "y":0, "w":1.25},
+              {"label":"Q", "x":1.25, "y":0},
+              {"label":"W", "x":2.25, "y":0},
+              {"label":"E", "x":3.25, "y":0},
+              {"label":"R", "x":4.25, "y":0},
+              {"label":"T", "x":5.25, "y":0},
+              {"label":"Y", "x":6.25, "y":0},
+              {"label":"U", "x":7.25, "y":0},
+              {"label":"I", "x":8.25, "y":0},
+              {"label":"O", "x":9.25, "y":0},
+              {"label":"P", "x":10.25, "y":0},
+              {"label":"BackSpace", "x":11.25, "y":0, "w":1.25},
+              {"label":"Tab", "x":0, "y":1, "w":1.25},
+              {"label":"A", "x":1.25, "y":1},
+              {"label":"S", "x":2.25, "y":1},
+              {"label":"D", "x":3.25, "y":1},
+              {"label":"F", "x":4.25, "y":1},
+              {"label":"G", "x":5.25, "y":1},
+              {"label":"H", "x":6.25, "y":1},
+              {"label":"J", "x":7.25, "y":1},
+              {"label":"K", "x":8.25, "y":1},
+              {"label":"L", "x":9.25, "y":1},
+              {"label":"'", "x":10.25, "y":1},
+              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+              {"label":"Shift", "x":0, "y":2, "w":1.25},
+              {"label":"Z", "x":1.25, "y":2},
+              {"label":"X", "x":2.25, "y":2},
+              {"label":"C", "x":3.25, "y":2},
+              {"label":"V", "x":4.25, "y":2},
+              {"label":"B", "x":5.25, "y":2},
+              {"label":"N", "x":6.25, "y":2},
+              {"label":"M", "x":7.25, "y":2},
+              {"label":",", "x":8.25, "y":2},
+              {"label":".", "x":9.25, "y":2},
+              {"label":"Up", "x":10.25, "y":2},
+              {"label":"FN", "x":11.25, "y":2, "w":1.25},
+              {"label":"Ctrl", "x":0.75, "y":3},
+              {"label":"Gui", "x":1.75, "y":3},
+              {"label":"Alt", "x":2.75, "y":3},
+              {"label":"Space", "x":3.75, "y":3, "w":2},
+              {"label":"FN", "x":5.75, "y":3},
+              {"label":"Space", "x":6.75, "y":3, "w":2},
+              {"label":"Left", "x":8.75, "y":3},
+              {"label":"Down", "x":9.75, "y":3},
+              {"label":"Right", "x":10.75, "y":3}
+           ]
+        },
+        "LAYOUT_ortho_3u": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "w":1.25},
+                {"label":"Q", "x":1.25, "y":0},
+                {"label":"W", "x":2.25, "y":0},
+                {"label":"E", "x":3.25, "y":0},
+                {"label":"R", "x":4.25, "y":0},
+                {"label":"T", "x":5.25, "y":0},
+                {"label":"Y", "x":6.25, "y":0},
+                {"label":"U", "x":7.25, "y":0},
+                {"label":"I", "x":8.25, "y":0},
+                {"label":"O", "x":9.25, "y":0},
+                {"label":"P", "x":10.25, "y":0},
+                {"label":"BackSpace", "x":11.25, "y":0, "w":1.25},
+                {"label":"Tab", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":"'", "x":10.25, "y":1},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+                {"label":"Shift", "x":0, "y":2, "w":1.25},
+                {"label":"Z", "x":1.25, "y":2},
+                {"label":"X", "x":2.25, "y":2},
+                {"label":"C", "x":3.25, "y":2},
+                {"label":"V", "x":4.25, "y":2},
+                {"label":"B", "x":5.25, "y":2},
+                {"label":"N", "x":6.25, "y":2},
+                {"label":"M", "x":7.25, "y":2},
+                {"label":",", "x":8.25, "y":2},
+                {"label":".", "x":9.25, "y":2},
+                {"label":"Up", "x":10.25, "y":2},
+                {"label":"FN", "x":11.25, "y":2, "w":1.25},
+                {"label":"Ctrl", "x":0.75, "y":3},
+                {"label":"Gui", "x":1.75, "y":3},
+                {"label":"Alt", "x":2.75, "y":3},
+                {"label":"Raise", "x":3.75, "y":3},
+                {"label":"FN", "x":4.75, "y":3,"w":3},
+                {"label":"Lower", "x":7.75, "y":3},
+                {"label":"Left", "x":8.75, "y":3},
+                {"label":"Down", "x":9.75, "y":3},
+                {"label":"Right", "x":10.75, "y":3}
+           ]
+        },
+        "LAYOUT_ortho_7u": {
+            "layout": [
+                    {"label":"Esc", "x":0, "y":0, "w":1.25},
+                    {"label":"Q", "x":1.25, "y":0},
+                    {"label":"W", "x":2.25, "y":0},
+                    {"label":"E", "x":3.25, "y":0},
+                    {"label":"R", "x":4.25, "y":0},
+                    {"label":"T", "x":5.25, "y":0},
+                    {"label":"Y", "x":6.25, "y":0},
+                    {"label":"U", "x":7.25, "y":0},
+                    {"label":"I", "x":8.25, "y":0},
+                    {"label":"O", "x":9.25, "y":0},
+                    {"label":"P", "x":10.25, "y":0},
+                    {"label":"Back<br>Space", "x":11.25, "y":0, "w":1.25},
+                    {"label":"Tab", "x":0, "y":1, "w":1.25},
+                    {"label":"A", "x":1.25, "y":1},
+                    {"label":"S", "x":2.25, "y":1},
+                    {"label":"D", "x":3.25, "y":1},
+                    {"label":"F", "x":4.25, "y":1},
+                    {"label":"G", "x":5.25, "y":1},
+                    {"label":"H", "x":6.25, "y":1},
+                    {"label":"J", "x":7.25, "y":1},
+                    {"label":"K", "x":8.25, "y":1},
+                    {"label":"L", "x":9.25, "y":1},
+                    {"label":"'", "x":10.25, "y":1},
+                    {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+                    {"label":"Shift", "x":0, "y":2, "w":1.25},
+                    {"label":"Z", "x":1.25, "y":2},
+                    {"label":"X", "x":2.25, "y":2},
+                    {"label":"C", "x":3.25, "y":2},
+                    {"label":"V", "x":4.25, "y":2},
+                    {"label":"B", "x":5.25, "y":2},
+                    {"label":"N", "x":6.25, "y":2},
+                    {"label":"M", "x":7.25, "y":2},
+                    {"label":",", "x":8.25, "y":2},
+                    {"label":".", "x":9.25, "y":2},
+                    {"label":"Up", "x":10.25, "y":2},
+                    {"label":"FN", "x":11.25, "y":2, "w":1.25},
+                    {"label":"Ctrl", "x":0.75, "y":3},
+                    {"label":"Gui", "x":1.75, "y":3},
+                    {"label":"Space", "x":2.75, "y":3, "w":7},
+                    {"label":"Down", "x":9.75, "y":3},
+                    {"label":"Right", "x":10.75, "y":3}
+           ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6fd8f5875f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+/*
+ * ,------------------------------------------------------------------.
+ * |Esc    | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |------------------------------------------------------------------|
+ * |Tab/LT2| A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  |Enter|
+ * |------------------------------------------------------------------|
+ * | Shift | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | Up | MO(2)  |
+ * |------------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/LT1  | MO(2)|   Spc   |Left|Down|Rght|
+ *      `---------------------------------------------------------'
+ */
+
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2u(
+        KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC, KC_SPC,  KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_ortho_2u(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO, 
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_TRNS, KC_NO,   KC_TRNS,          KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT_ortho_2u(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+};
diff --git a/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c
new file mode 100644
index 0000000000..32b71b75df
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+/*
+ * ,------------------------------------------------------------------.
+ * |Esc    | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |------------------------------------------------------------------|
+ * |Tab/LT2| A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  |Enter|
+ * |------------------------------------------------------------------|
+ * | Shift | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | Up | MO(2)  |
+ * |------------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/LT1  | MO(2)|   Spc   |Left|Down|Rght|
+ *      `---------------------------------------------------------'
+ */
+
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2u(
+        KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC, KC_SPC,  KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_ortho_2u(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO, 
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_TRNS, KC_NO,   KC_TRNS,          KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT_ortho_2u(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+    [3] = LAYOUT_ortho_2u(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+};
diff --git a/keyboards/lazydesigners/dimple/keymaps/via/rules.mk b/keyboards/lazydesigners/dimple/ortho/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
+++ b/keyboards/lazydesigners/dimple/ortho/keymaps/via/rules.mk
diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.c b/keyboards/lazydesigners/dimple/ortho/ortho.c
new file mode 100644
index 0000000000..da76fde176
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/ortho.c
@@ -0,0 +1,15 @@
+/*
+ Copyright 2021 LAZYDESIGNERS
+ 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/>.
+*/
+
+#include "ortho.h"
diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.h b/keyboards/lazydesigners/dimple/ortho/ortho.h
new file mode 100644
index 0000000000..592cf47de3
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/ortho.h
@@ -0,0 +1,91 @@
+/*
+ Copyright 2021 LAZYDESIGNERS
+ 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"
+
+/*
+ *  ,-------------------------------------------------------------.
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *      |    |    |    |   2U    |    |    2U   |    |    |    |
+ *      `------------------------------------------------------'
+ */
+
+#define LAYOUT_ortho_2u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
+
+/*
+ *  ,-------------------------------------------------------------.
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *      |    |    |    |    |      3U      |    |    |    |    |
+ *      `------------------------------------------------------'
+ */
+
+#define LAYOUT_ortho_3u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
+
+/*
+ *  ,-------------------------------------------------------------.
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *      |    |    |               7U                 |    |    |
+ *      `------------------------------------------------------'
+ */
+
+#define LAYOUT_ortho_7u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	K300,       K302,             K305,             K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
+	{ K300,  KC_NO, K302,  KC_NO, KC_NO, K305,  KC_NO, KC_NO, K308,  K309,  KC_NO, KC_NO }  \
+}
+
+
diff --git a/keyboards/lazydesigners/dimple/ortho/rules.mk b/keyboards/lazydesigners/dimple/ortho/rules.mk
new file mode 100644
index 0000000000..902a3d4bbc
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/rules.mk
@@ -0,0 +1,3 @@
+# Disable unsupported hardware
+BACKLIGHT_SUPPORTED = no
+RGBLIGHT_ENABLE = no
diff --git a/keyboards/lazydesigners/dimple/readme.md b/keyboards/lazydesigners/dimple/readme.md
index 04b4b438d6..2e15cec2b9 100644
--- a/keyboards/lazydesigners/dimple/readme.md
+++ b/keyboards/lazydesigners/dimple/readme.md
@@ -4,13 +4,22 @@
 
 A 40% custom keyboard designed and produced by [LazyDesigners](http://lazydesigners.cn).
 
-Keyboard Maintainer: [Erovia](https://github.com/Erovia)  
-Hardware Supported: Dimple  
-Hardware Availability: Check for GBs on [Geekhack](https://geekhack.org) and on [LazyDesigner's homepage.](http://lazydesigners.cn)
+* Keyboard Maintainer: [Erovia](https://github.com/Erovia) / [Jacky@LAZYDESIGNERS](https://github.com/jackytrabbit)
+* Hardware Supported: Dimple by LAZYDESIGNERS
+* Hardware Availability: Check on [LAZYDESIGNERS's homepage.](http://lazydesigners.cn)
+
+Detail versions:
+
+ 1. Dimple Round 1 in 2019 (Use dimple/staggered/Rev1)
+ 2. Dimple Round 2 Hotswap in 2021 (Use dimple/staggered/Rev2)
+ 3. Dimple Round 2 Solder in 2021 (Use dimple/staggered/Rev3)
+ 4. Dimple Round 2 OrthoStrange (Use dimple/ortho)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lazydesigners/dimple:default:dfu
+    make lazydesigners/dimple/staggered/rev1:default
+    make lazydesigners/dimple/staggered/rev2:default
+    make lazydesigners/dimple/ortho:default
 
 To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
 
diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk
index 0581d54ba8..ee586a38e1 100644
--- a/keyboards/lazydesigners/dimple/rules.mk
+++ b/keyboards/lazydesigners/dimple/rules.mk
@@ -8,12 +8,16 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes        # Audio control and System control
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
 
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
+DEFAULT_FOLDER = lazydesigners/dimple/staggered/rev1
diff --git a/keyboards/lazydesigners/dimple/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 4cfa1e6f18..4cfa1e6f18 100644
--- a/keyboards/lazydesigners/dimple/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
diff --git a/keyboards/lazydesigners/dimple/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
index d23c8e8a6e..65b81ff4e1 100644
--- a/keyboards/lazydesigners/dimple/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
@@ -108,14 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 };
 
-void led_set_user(uint8_t usb_led) {
-if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-	dimple_led_on();
-	} else {
-	dimple_led_off();
-	}
-}
-
+#ifdef KEYBOARD_lazydesigner_dimple_staggered_rev1
 layer_state_t layer_state_set_user(layer_state_t state) {
 	state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 	switch (get_highest_layer(state)) {
@@ -134,3 +127,4 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 	}
 	return state;
 }
+#endif
diff --git a/keyboards/lazydesigners/dimple/keymaps/default/readme.md b/keyboards/lazydesigners/dimple/staggered/keymaps/default/readme.md
index c334b6c367..c334b6c367 100644
--- a/keyboards/lazydesigners/dimple/keymaps/default/readme.md
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/default/readme.md
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
new file mode 100644
index 0000000000..214ff982c6
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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
+
+#define TAPPING_TERM 170
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
new file mode 100644
index 0000000000..6f893e187f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
@@ -0,0 +1,162 @@
+/* Copyright 2019 Erovia
+ *
+ * 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/>.
+ */
+#include QMK_KEYBOARD_H
+#include "erovia.h"
+
+// Left space on tap, LOWER on hold
+#define SPC_LOW LT(_LOWER, KC_TAB)
+// Left space on tap, UPPER on hold
+#define SPC_UPR LT(_RAISE, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ * ,---------------------------------------------------------------.
+ * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |---------------------------------------------------------------|
+ * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  .   |
+ * |---------------------------------------------------------------|
+ * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
+ * |---------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
+ *      `-----------------------------------------------------'
+ */
+
+	[_QWERTY] = LAYOUT(
+		KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		VIM_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_DOT,
+		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   TD_ENTR,
+		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
+	),
+
+/*
+ * ,---------------------------------------------------------------.
+ * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |---------------------------------------------------------------|
+ * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  '   |
+ * |---------------------------------------------------------------|
+ * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
+ * |--------------------------------------------