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

11 files changed, 392 insertions, 0 deletions

diff --git a/keyboards/montex/config.h b/keyboards/montex/config.h
new file mode 100644
index 0000000000..bad7b355fc
--- /dev/null
+++ b/keyboards/montex/config.h
@@ -0,0 +1,64 @@
+/* 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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Idobao
+#define PRODUCT         Montex
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 5
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
+#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* number of backlight levels */
+#define BACKLIGHT_PIN B6
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 3
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+
+
+#define RGB_DI_PIN B1
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 4
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/keyboards/montex/info.json b/keyboards/montex/info.json
new file mode 100644
index 0000000000..411bc53ace
--- /dev/null
+++ b/keyboards/montex/info.json
@@ -0,0 +1,45 @@
+{
+    "keyboard_name": "montex numpad",
+    "url": "https://www.idobao.net/products/ldobao-montex-pad-hot-swappable-mechanical-keyboard-kit",
+    "maintainer": "NachoxMacho",
+    "width": 5,
+    "height": 6,
+    "layouts": {
+        "LAYOUT_numpad_6x5": {
+            "layout": [
+                { "label": "0,0", "x": 0, "y": 0},
+                { "label": "0,1", "x": 1, "y": 0},
+                { "label": "0,2", "x": 2, "y": 0},
+                { "label": "0,3", "x": 3, "y": 0},
+                { "label": "0,4", "x": 4, "y": 0},
+
+                { "label": "1,0", "x": 0, "y": 1.25},
+                { "label": "1,1", "x": 1, "y": 1.25},
+                { "label": "1,2", "x": 2, "y": 1.25},
+                { "label": "1,3", "x": 3, "y": 1.25},
+                { "label": "1,4", "x": 4, "y": 1.25},
+
+                { "label": "2,0", "x": 0, "y": 2.25},
+                { "label": "2,1", "x": 1, "y": 2.25},
+                { "label": "2,2", "x": 2, "y": 2.25},
+                { "label": "2,3", "x": 3, "y": 2.25},
+
+                { "label": "3,0", "x": 0, "y": 3.25},
+                { "label": "3,1", "x": 1, "y": 3.25},
+                { "label": "3,2", "x": 2, "y": 3.25},
+                { "label": "3,3", "x": 3, "y": 3.25},
+                { "label": "3,4", "x": 4, "y": 2.25, "h": 2},
+
+                { "label": "4,0", "x": 0, "y": 4.25},
+                { "label": "4,1", "x": 1, "y": 4.25},
+                { "label": "4,2", "x": 2, "y": 4.25},
+                { "label": "4,3", "x": 3, "y": 4.25},
+
+                { "label": "5,0", "x": 0, "y": 5.25},
+                { "label": "5,1", "x": 1, "y": 5.25, "w": 2},
+                { "label": "5,2", "x": 3, "y": 5.25},
+                { "label": "5,3", "x": 4, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/montex/keymaps/default/keymap.c b/keyboards/montex/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a15c576cbb
--- /dev/null
+++ b/keyboards/montex/keymaps/default/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/keyboards/montex/montex.c b/keyboards/montex/montex.c
new file mode 100644
index 0000000000..4d3ecb1860
--- /dev/null
+++ b/keyboards/montex/montex.c
@@ -0,0 +1,17 @@
+/* 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 "montex.h"
diff --git a/keyboards/montex/montex.h b/keyboards/montex/montex.h
new file mode 100644
index 0000000000..d57097fa88
--- /dev/null
+++ b/keyboards/montex/montex.h
@@ -0,0 +1,35 @@
+/* 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/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_numpad_6x5( \
+	K00, K01, K02, K03, K04, \
+	K10, K11, K12, K13, K14, \
+	K20, K21, K22, K23,      \
+	K30, K31, K32, K33, K34, \
+	K40, K41, K42, K43,      \
+	K50, K51,      K52, K53  \
+) { \
+	{ K00,   K01,   K02,   K03,   K04 }, \
+	{ K10,   K11,   K12,   K13,   K14 }, \
+	{ K20,   K21,   K22,   K23,   K34 }, \
+	{ K30,   K31,   K32,   K33,   KC_NO }, \
+	{ K40,   K41,   K42,   K43,   KC_NO }, \
+	{ K50,   K51,   K52,   K53,   KC_NO }  \
+}
diff --git a/keyboards/montex/readme.md b/keyboards/montex/readme.md
new file mode 100644
index 0000000000..8c4a7226ce
--- /dev/null
+++ b/keyboards/montex/readme.md
@@ -0,0 +1,21 @@
+# IDOBAO MONTEX
+
+A hotswap numpad from IDOBAO.
+    
+## Support:
+
+* Keyboard Maintainer: [NachoxMacho](https://github.com/NachoxMacho)
+* Hardware Supported: IDOBAO MONTEX
+* Hardware Availability: [IDOBAO](https://www.idobao.net/products/ldobao-montex-pad-hot-swappable-mechanical-keyboard-kit)
+
+
+To jump to the bootloader, the default in the repository and stock on the board is to hold the 4th key on the top row and tap the first key in the top row. 
+On some stock keyboard firmware, the top and second from the top row pins have been reversed so you may need to press those keys on the second row.
+If none of that works, there is a reset button on the PCB underside which you can access by removing the back plate.
+Then press the button labeled SW2 located between the 2 upper LEDs.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make montex:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/montex/rules.mk b/keyboards/montex/rules.mk
new file mode 100644
index 0000000000..5a286ce0f1
--- /dev/null
+++ b/keyboards/montex/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
+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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
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