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

9 files changed, 375 insertions, 0 deletions

diff --git a/keyboards/latin17rgb/config.h b/keyboards/latin17rgb/config.h
new file mode 100644
index 0000000000..013899f600
--- /dev/null
+++ b/keyboards/latin17rgb/config.h
@@ -0,0 +1,104 @@
+ /* Copyright 2021 18438880
+  * 
+  * 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
+
+/* USB Device descriptor parameter */
+#include "config_common.h"
+#define VENDOR_ID       0x7C88 // "hw" = haierwangwei2005
+#define PRODUCT_ID      0x7C97 // "lp" = latin17RGB
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    18438880
+#define PRODUCT         Latin17RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
+#define MATRIX_COL_PINS {F7, F6, F5, F4}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+//#ifndef LINK_TIME_OPTIMIZATION_ENABLE
+//#    define NO_ACTION_MACRO
+//#    define NO_ACTION_FUNCTION
+//#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define DISABLE_RGB_MATRIX_BAND_SAT
+#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define DISABLE_RGB_MATRIX_SPLASH
+#    define DISABLE_RGB_MATRIX_MULTISPLASH
+#    define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 0b1110100 AD <-> GND
+// 0b1110111 AD <-> VCC
+// 0b1110101 AD <-> SCL
+// 0b1110110 AD <-> SDA
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110110
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 25
+#define DRIVER_2_LED_TOTAL 24
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#endif
+#define RGB_DI_PIN B7
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 8
+#define RGBLIGHT_HUE_STEP 5
+#define RGBLIGHT_SAT_STEP 5
+#define RGBLIGHT_VAL_STEP 5
+#define RGBLIGHT_SLEEP
+#endif
+
+
diff --git a/keyboards/latin17rgb/info.json b/keyboards/latin17rgb/info.json
new file mode 100644
index 0000000000..d236aea8c2
--- /dev/null
+++ b/keyboards/latin17rgb/info.json
@@ -0,0 +1,34 @@
+{
+  "keyboard_name": "latin17rgb",
+  "url": "",
+  "maintainer": "18438880",
+  "width": 5,
+  "height": 4,
+  "layouts": {
+    "LAYOUT_numpad_5x4": {
+      "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":1, "h":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+
+                {"x":0, "y":4, "w":2},
+                {"x":2, "y":4},
+                {"x":3, "y":3, "h":2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/latin17rgb/keymaps/default/keymap.c b/keyboards/latin17rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..58e01b1a2b
--- /dev/null
+++ b/keyboards/latin17rgb/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+ /* Copyright 2021 18438880
+  * 
+  * 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_numpad_5x4( 
+	    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+	    KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P0,            KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_numpad_5x4( 
+	    RGB_TOG, RGB_MOD, KC_PMNS, _______,
+	    _______, _______, _______,
+        _______, _______, _______, KC_PGDN,
+        _______, _______, _______,
+        _______,          _______, _______
+	),
+};
diff --git a/keyboards/latin17rgb/keymaps/via/keymap.c b/keyboards/latin17rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a73da5eb89
--- /dev/null
+++ b/keyboards/latin17rgb/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2021 18438880
+  * 
+  * 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_numpad_5x4( 
+	    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+	    KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P0,            KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_numpad_5x4(
+	    RGB_TOG, RGB_MOD, KC_PMNS, _______,
+	    _______, _______, _______,
+        _______, _______, _______, KC_PGDN,
+        _______, _______, _______,
+        _______,          _______, _______
+	),
+    [2] = LAYOUT_numpad_5x4(
+	    _______, _______, _______, _______,
+	    _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______,
+        _______,          _______, _______
+	),
+    [3] = LAYOUT_numpad_5x4(
+	    _______, _______, _______, _______,
+	    _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______,
+        _______,          _______, _______
+	),
+};
diff --git a/keyboards/latin17rgb/keymaps/via/rules.mk b/keyboards/latin17rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/latin17rgb/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/latin17rgb/latin17rgb.c b/keyboards/latin17rgb/latin17rgb.c
new file mode 100644
index 0000000000..8d9eaae8ae
--- /dev/null
+++ b/keyboards/latin17rgb/latin17rgb.c
@@ -0,0 +1,70 @@
+ /* Copyright 2021 18438880
+  * 
+  * 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 "latin17rgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+	{0, C1_3,  C2_3,  C3_3},// BL1
+    {0, C1_4,  C2_4,  C3_4},// BL2
+    {0, C1_5,  C2_5,  C3_5},// BL3
+    {0, C1_11, C2_11, C3_11},// BL4
+    {0, C1_12, C2_12, C3_12},// BL5
+    {0, C1_13, C2_13, C3_13},// BL6
+    {0, C1_6,  C2_6,  C3_6},// BL7
+    {0, C1_7,  C2_7,  C3_7},//BL8 
+    {0, C1_8,  C2_8,  C3_8},// BL9
+    {0, C1_14, C2_14, C3_14},// BL10
+    {0, C1_15, C2_15, C3_15},// BL11
+    {0, C1_16,C2_16,C3_16},// BL12
+    {0, C7_1,  C8_1,  C9_1},// BL13
+    {0, C9_2,  C8_2,  C7_2},// BL14
+    {0, C9_3, C8_3, C7_3},//BL15
+    {0, C9_5, C8_5, C7_5},// BL16
+    {0, C9_6, C8_6, C7_6},// BL17
+	
+};
+
+led_config_t g_led_config = {
+    {
+        { 0,      1,       2,      3},
+        { 4,      5,       6,      7},
+        { 8,      9,      10, NO_LED},
+        { 11,     12,     13,     14},
+        { 15,     16, NO_LED, NO_LED},
+    },
+    {
+        { 48, 32},{ 48, 48},{ 64, 48},{ 80, 48},
+        { 16, 32},{ 16, 48}, { 32, 48},{ 64, 64},
+        { 80, 16},{ 64, 32},{ 80, 32},
+        {112,  0},{128,  0},{144,  0},{160,  0},
+        {128, 16},{144, 16}
+    },
+    {
+        4, 4, 4, 1,
+        1, 1, 4, 1,
+        1, 4, 4,
+        1, 4, 4, 4,
+        4, 4
+    }
+};
+#endif
diff --git a/keyboards/latin17rgb/latin17rgb.h b/keyboards/latin17rgb/latin17rgb.h
new file mode 100644
index 0000000000..f4ed4bf0c8
--- /dev/null
+++ b/keyboards/latin17rgb/latin17rgb.h
@@ -0,0 +1,36 @@
+ /* Copyright 2021 18438880
+  * 
+  * 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 XXX KC_NO
+
+#define LAYOUT_numpad_5x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12,      \
+    K20, K21, K22, K13, \
+    K30, K31, K32,      \
+    K40,      K41, K33  \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22      }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41           }  \
+}
+
+#define LAYOUT_pad LAYOUT_numpad_5x4
diff --git a/keyboards/latin17rgb/readme.md b/keyboards/latin17rgb/readme.md
new file mode 100644
index 0000000000..775055f27a
--- /dev/null
+++ b/keyboards/latin17rgb/readme.md
@@ -0,0 +1,20 @@
+# Latin17RGB
+
+![Latin17rgb](https://i.imgur.com/UoGWpw9l.jpg)
+
+  RGB PAD use IS31FL3731 IC
+
+* Keyboard Maintainer: [18438880](https://github.com/18438880)
+* Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make latin17rgb:default
+
+Flashing example for this keyboard:
+
+    make latin17rgb:default:flash
+
+To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).
+
+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/latin17rgb/rules.mk b/keyboards/latin17rgb/rules.mk
new file mode 100644
index 0000000000..dd7bab746d
--- /dev/null
+++ b/keyboards/latin17rgb/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite        # 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 = no               # USB Nkey Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no          # Enable Bluetooth
+AUDIO_ENABLE = no              # Audio output
+NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
+
+LAYOUTS = numpad_5x4