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

4 files changed, 121 insertions, 0 deletions

diff --git a/layouts/default/numpad_6x5/default_numpad_6x5/keymap.c b/layouts/default/numpad_6x5/default_numpad_6x5/keymap.c
new file mode 100644
index 0000000000..27ef07d19d
--- /dev/null
+++ b/layouts/default/numpad_6x5/default_numpad_6x5/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2021 NachoxMacho
+*
+* 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] = {
+    /*
+     * ┌───┌───┬───┬───┬───┐
+     * │ ` │Esc│Tab│MO1│Bsp│
+     * ├───┼───┼───┼───┼───┤
+     * │ , │Num│ / │ * │ - │
+     * ├───┼───┼───┼───┼───┤
+     * │Gui│ 7 │ 8 │ 9 │   │
+     * ├───┼───┼───┼───┤ + │
+     * │Alt│ 4 │ 5 │ 6 │   │
+     * ├───┼───┼───┼───┼───┤
+     * │Shi│ 1 │ 2 │ 3 │   │
+     * ├───┼───┴───┼───┤Ent│
+     * │Ctr│ 0     │ . │   │
+     * └───┴───────┴───┴───┘
+     */
+    [0] = LAYOUT_numpad_6x5(
+        KC_GRAVE,  KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
+        KC_COMMA,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LGUI,   KC_P7,   KC_P8,   KC_P9,
+        KC_LALT,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSHIFT, KC_P1,   KC_P2,   KC_P3,
+        KC_LCTRL,  KC_P0,            KC_PDOT, KC_PENT
+    ),
+
+    /*
+     * ┌───┌───┐───┬───┬───┐
+     * │ ` │Rst│Tab│MO1│Bsp│
+     * ├───┼───┘───┼───┼───┤
+     * │ , │Num│ / │ * │ - │
+     * ├───┼───┼───┼───┼───┤
+     * │Gui│Hom│ ↑ │PgU│   │
+     * ├───┼───┼───┼───┤ + │
+     * │Alt│ ← │   │ → │   │
+     * ├───┼───┼───┼───┤───┤
+     * │Shi│End│ ↓ │PgD│   │
+     * ├───┼───┴───┼───┤Ent│
+     * │Ctr│Insert │Del│   │
+     * └───┴───────┴───┘───┘
+     */
+    [1] = LAYOUT_numpad_6x5(
+        _______, RESET,   _______, _______, _______,
+        _______, _______, _______, _______, _______,
+        _______, KC_HOME, KC_UP,   KC_PGUP,
+        _______, KC_LEFT, XXXXXXX, KC_RGHT, _______,
+        _______, KC_END,  KC_DOWN, KC_PGDN,
+        _______, KC_INS,           KC_DEL,  _______
+    )
+};
diff --git a/layouts/default/numpad_6x5/info.json b/layouts/default/numpad_6x5/info.json
new file mode 100644
index 0000000000..eff9614c3d
--- /dev/null
+++ b/layouts/default/numpad_6x5/info.json
@@ -0,0 +1,45 @@
+{
+    "keyboard_name": "6x5 number pad layout",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 5,
+    "height": 6,
+    "layouts": {
+        "LAYOUT_numpad_6x5": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":2, "h":2},
+
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":4},
+
+                {"x":0, "y":5},
+                {"x":1, "y":5, "w":2},
+                {"x":3, "y":5},
+                {"x":4, "y":4, "h":2}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/numpad_6x5/layout.json b/layouts/default/numpad_6x5/layout.json
new file mode 100644
index 0000000000..4204c99c5e
--- /dev/null
+++ b/layouts/default/numpad_6x5/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"","","","",""],
+["","","","",""],
+["","","","",{h:2},""],
+["","","",""],
+["","","","",{h:2},""],
+["",{w:2},"",""]
diff --git a/layouts/default/numpad_6x5/readme.md b/layouts/default/numpad_6x5/readme.md
new file mode 100644
index 0000000000..0c6d0959e3
--- /dev/null
+++ b/layouts/default/numpad_6x5/readme.md
@@ -0,0 +1,3 @@
+# numpad_6x5
+
+    LAYOUT_numpad_6x5