Merge remote-tracking branch 'origin/master' into develop

3 files changed, 118 insertions, 10 deletions

diff --git a/keyboards/lazydesigners/dimpleplus/dimpleplus.h b/keyboards/lazydesigners/dimpleplus/dimpleplus.h
index 7664b87605..93199dc6e0 100644
--- a/keyboards/lazydesigners/dimpleplus/dimpleplus.h
+++ b/keyboards/lazydesigners/dimpleplus/dimpleplus.h
@@ -19,15 +19,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #define LAYOUT( \
-    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,  K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       \
-    K400,        K402, K403, K404,        K406,      K407, K408, K409        \
+      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,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,         \
+      K400,         K402,  K403,  K404,         K406,         K407,  K408,  K409          \
 ) { \
-    { 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,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO }, \
-    { K400,  KC_NO, K402,  K403,  K404,  KC_NO, K406,  K407,  K408,  K409,  KC_NO, KC_NO }  \
+    { 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,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO },  \
+    { K400,  KC_NO, K402,  K403,  K404,  KC_NO, K406,  K407,  K408,  K409,  KC_NO, KC_NO }   \
+}
+
+#define LAYOUT_7u( \
+      K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,         \
+      K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  \
+      K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,         K211,  \
+      K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,         \
+      K400,         K402,         K404,                       K408,  K409                 \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010           },  \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,   K111   },  \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO,  K211   },  \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310           },  \
+    { K400,  KC_NO, K402,  KC_NO, K404,  KC_NO, KC_NO, KC_NO, K408,  K409,  KC_NO,  KC_NO  }   \
 }
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index 4ad13f3746..e7a028e550 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -63,6 +63,60 @@
                 {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
                 {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
             ]
+        },
+        "LAYOUT_7u": {
+            "layout": [
+                {"label":"K000 (B3,F1)", "x":0, "y":0},
+                {"label":"K001 (B3,D5)", "x":1.5, "y":0},
+                {"label":"K002 (B3,F6)", "x":2.5, "y":0},
+                {"label":"K003 (B3,F7)", "x":3.5, "y":0},
+                {"label":"K004 (B3,C7)", "x":4.5, "y":0},
+                {"label":"K005 (B3,C6)", "x":5.5, "y":0},
+                {"label":"K006 (B3,B6)", "x":6.5, "y":0},
+                {"label":"K007 (B3,B5)", "x":7.5, "y":0},
+                {"label":"K008 (B3,B4)", "x":8.5, "y":0},
+                {"label":"K009 (B3,D7)", "x":9.5, "y":0},
+                {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2.0},
+                {"label":"K100 (F0,F1)", "x":0, "y":1.25},
+                {"label":"K101 (F0,D5)", "x":1, "y":1.25},
+                {"label":"K102 (F0,F6)", "x":2, "y":1.25},
+                {"label":"K103 (F0,F7)", "x":3, "y":1.25},
+                {"label":"K104 (F0,C7)", "x":4, "y":1.25},
+                {"label":"K105 (F0,C6)", "x":5, "y":1.25},
+                {"label":"K106 (F0,B6)", "x":6, "y":1.25},
+                {"label":"K107 (F0,B5)", "x":7, "y":1.25},
+                {"label":"K108 (F0,B4)", "x":8, "y":1.25},
+                {"label":"K109 (F0,D7)", "x":9, "y":1.25},
+                {"label":"K110 (F0,D6)", "x":10, "y":1.25},
+                {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5},
+                {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25},
+                {"label":"K201 (E6,D5)", "x":1.25, "y":2.25},
+                {"label":"K202 (E6,F6)", "x":2.25, "y":2.25},
+                {"label":"K203 (E6,F7)", "x":3.25, "y":2.25},
+                {"label":"K204 (E6,C7)", "x":4.25, "y":2.25},
+                {"label":"K205 (E6,C6)", "x":5.25, "y":2.25},
+                {"label":"K206 (E6,B6)", "x":6.25, "y":2.25},
+                {"label":"K207 (E6,B5)", "x":7.25, "y":2.25},
+                {"label":"K208 (E6,B4)", "x":8.25, "y":2.25},
+                {"label":"K209 (E6,D7)", "x":9.25, "y":2.25},
+                {"label":"K211 (E6,D4)", "x":10.25, "y":2.25, "w":2.25},
+                {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75},
+                {"label":"K301 (F4,D5)", "x":1.75, "y":3.25},
+                {"label":"K302 (F4,F6)", "x":2.75, "y":3.25},
+                {"label":"K303 (F4,F7)", "x":3.75, "y":3.25},
+                {"label":"K304 (F4,C7)", "x":4.75, "y":3.25},
+                {"label":"K305 (F4,C6)", "x":5.75, "y":3.25},
+                {"label":"K306 (F4,B6)", "x":6.75, "y":3.25},
+                {"label":"K307 (F4,B5)", "x":7.75, "y":3.25},
+                {"label":"K308 (F4,B4)", "x":8.75, "y":3.25},
+                {"label":"K309 (F4,D7)", "x":9.75, "y":3.25},
+                {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
+                {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
+                {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
+                {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7.00},
+                {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
+                {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
+            ]
         }
     }
 }
diff --git a/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c b/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c
new file mode 100644
index 0000000000..16724b5461
--- /dev/null
+++ b/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2020 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_7u(
+        KC_ESC,    KC_1,    KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+        KC_GRV,    KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,      KC_BSPC,
+        KC_TAB,    KC_A,    KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,                KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_RSFT,
+        KC_LCTL,            KC_LGUI,                      KC_SPC,             KC_RALT,  MO(1)
+    ),
+    [1] = LAYOUT_7u(
+        RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+        KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,   KC_DEL,
+        KC_TAB,   KC_UNDS,  KC_SCLN,  KC_BSLS,  KC_QUOT,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_UP,               KC_SLSH,
+        KC_LSFT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_MSTP,  KC_MPLY,  KC_MFFD,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_RSFT,
+        KC_CAPS,            MO(2),                        KC_SPC,             KC_NO,    KC_TRNS
+    ),
+    [2] = LAYOUT_7u(
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_RMOD, RGB_MOD,  RGB_VAD,  RGB_VAI,  RGB_SPD,  RGB_SPI,  KC_TRNS,             KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_TOG,  RGB_HUD,  RGB_HUI,  RGB_SAD,  RGB_SAI,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,            KC_TRNS,                      KC_TRNS,            KC_TRNS,  KC_TRNS
+    )
+};