Merge branch 'master' into meteor

7 files changed, 269 insertions, 0 deletions

diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h
new file mode 100644
index 0000000000..12be8ba27b
--- /dev/null
+++ b/keyboards/longnald/corin/config.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 Longnald <support@longnald.com>
+ * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.com>
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5633
+#define PRODUCT_ID      0x1024
+#define DEVICE_VER      0x0004
+#define MANUFACTURER    Longnald
+#define PRODUCT         Corin
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { F4, F0, B2, B3, D5 }
+#define MATRIX_COL_PINS { F7, F6, F1, F5, B1, E6, D4, B7, D1, D2, D0, B4, B6, C6, C7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 64
+#    define RGBLIGHT_HUE_STEP 20
+#    define RGBLIGHT_SAT_STEP 20
+#    define RGBLIGHT_VAL_STEP 40
+#    define RGBLIGHT_LIMIT_VAL 200
+#    define RGBLIGHT_SLEEP
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#endif
diff --git a/keyboards/longnald/corin/corin.c b/keyboards/longnald/corin/corin.c
new file mode 100644
index 0000000000..fabe3686d8
--- /dev/null
+++ b/keyboards/longnald/corin/corin.c
@@ -0,0 +1,19 @@
+/* 
+ * Copyright (C) 2020 Longnald <support@longnald.com>
+ * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.com>
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+
+#include "corin.h"
\ No newline at end of file
diff --git a/keyboards/longnald/corin/corin.h b/keyboards/longnald/corin/corin.h
new file mode 100644
index 0000000000..fa727c3c78
--- /dev/null
+++ b/keyboards/longnald/corin/corin.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2020 Longnald <support@longnald.com>
+ * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.com>
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_64_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
+         K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E  \
+) \
+{ \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E   }, \
+    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO }, \
+    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }  \
+}
diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json
new file mode 100644
index 0000000000..e0faf22090
--- /dev/null
+++ b/keyboards/longnald/corin/info.json
@@ -0,0 +1,77 @@
+{
+  "keyboard_name": "Corin",
+  "url": "https://github.com/longnald/corin",
+  "maintainer": "Seaton Jiang <seaton@vtrois.com>",
+  "width": 15,
+  "height": 5,
+  "layouts": {
+    "LAYOUT_64_ansi": {
+      "layout": [
+        { "label": "K00 (F4,F7)", "x": 0, "y": 0 },
+        { "label": "K01 (F4,F6)", "x": 1, "y": 0 },
+        { "label": "K02 (F4,F1)", "x": 2, "y": 0 },
+        { "label": "K03 (F4,F5)", "x": 3, "y": 0 },
+        { "label": "K04 (F4,B1)", "x": 4, "y": 0 },
+        { "label": "K05 (F4,E6)", "x": 5, "y": 0 },
+        { "label": "K06 (F4,D6)", "x": 6, "y": 0 },
+        { "label": "K07 (F4,B7)", "x": 7, "y": 0 },
+        { "label": "K08 (F4,D1)", "x": 8, "y": 0 },
+        { "label": "K09 (F4,D2)", "x": 9, "y": 0 },
+        { "label": "K0A (F4,D0)", "x": 10, "y": 0 },
+        { "label": "K0B (F4,B4)", "x": 11, "y": 0 },
+        { "label": "K0C (F4,B6)", "x": 12, "y": 0 },
+        { "label": "K0E (F4,C7)", "x": 13, "y": 0, "w": 2 },
+        { "label": "K10 (F0,F7)", "x": 0, "y": 1, "w": 1.5 },
+        { "label": "K12 (F0,F1)", "x": 1.5, "y": 1 },
+        { "label": "K13 (F0,F5)", "x": 2.5, "y": 1 },
+        { "label": "K14 (F0,B1)", "x": 3.5, "y": 1 },
+        { "label": "K15 (F0,E6)", "x": 4.5, "y": 1 },
+        { "label": "K16 (F0,D6)", "x": 5.5, "y": 1 },
+        { "label": "K17 (F0,B7)", "x": 6.5, "y": 1 },
+        { "label": "K18 (F0,D1)", "x": 7.5, "y": 1 },
+        { "label": "K19 (F0,D2)", "x": 8.5, "y": 1 },
+        { "label": "K1A (F0,D0)", "x": 9.5, "y": 1 },
+        { "label": "K1B (F0,B4)", "x": 10.5, "y": 1 },
+        { "label": "K1C (F0,B6)", "x": 11.5, "y": 1 },
+        { "label": "K1D (F0,C6)", "x": 12.5, "y": 1 },
+        { "label": "K1E (F0,C7)", "x": 13.5, "y": 1, "w": 1.5 },
+        { "label": "K20 (B2,F7)", "x": 0, "y": 2, "w": 1.75 },
+        { "label": "K22 (B2,F1)", "x": 1.75, "y": 2 },
+        { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 },
+        { "label": "K24 (B2,B1)", "x": 3.75, "y": 2 },
+        { "label": "K25 (B2,E6)", "x": 4.75, "y": 2 },
+        { "label": "K26 (B2,D6)", "x": 5.75, "y": 2 },
+        { "label": "K27 (B2,B7)", "x": 6.75, "y": 2 },
+        { "label": "K28 (B2,D1)", "x": 7.75, "y": 2 },
+        { "label": "K29 (B2,D2)", "x": 8.75, "y": 2 },
+        { "label": "K2A (B2,D0)", "x": 9.75, "y": 2 },
+        { "label": "K2B (B2,B4)", "x": 10.75, "y": 2 },
+        { "label": "K2C (B2,B6)", "x": 11.75, "y": 2 },
+        { "label": "K2D (B2,C6)", "x": 12.75, "y": 2, "w": 2.25 },
+        { "label": "K31 (B3,F6)", "x": 0, "y": 3, "w": 2 },
+        { "label": "K32 (B3,F1)", "x": 2, "y": 3 },
+        { "label": "K33 (B3,F5)", "x": 3, "y": 3 },
+        { "label": "K34 (B3,B1)", "x": 4, "y": 3 },
+        { "label": "K35 (B3,E6)", "x": 5, "y": 3 },
+        { "label": "K36 (B3,D6)", "x": 6, "y": 3 },
+        { "label": "K37 (B3,B7)", "x": 7, "y": 3 },
+        { "label": "K38 (B3,D1)", "x": 8, "y": 3 },
+        { "label": "K39 (B3,D2)", "x": 9, "y": 3 },
+        { "label": "K3A (B3,D0)", "x": 10, "y": 3 },
+        { "label": "K3B (B3,B4)", "x": 11, "y": 3 },
+        { "label": "K3C (B3,B6)", "x": 12, "y": 3 },
+        { "label": "K3D (B3,C6)", "x": 13, "y": 3 },
+        { "label": "K3E (B3,C7)", "x": 14, "y": 3 },
+        { "label": "K40 (D5,F7)", "x": 0, "y": 4, "w": 1.25 },
+        { "label": "K41 (D5,F6)", "x": 1.25, "y": 4, "w": 1.25 },
+        { "label": "K43 (D5,F5)", "x": 2.5, "y": 4, "w": 1.25 },
+        { "label": "K46 (D5,D6)", "x": 3.75, "y": 4, "w": 6.25 },
+        { "label": "K4A (D5,D0)", "x": 10, "y": 4 },
+        { "label": "K4B (D5,B4)", "x": 11, "y": 4 },
+        { "label": "K4C (D5,B6)", "x": 12, "y": 4 },
+        { "label": "K4D (D5,C6)", "x": 13, "y": 4 },
+        { "label": "K4E (D5,C7)", "x": 14, "y": 4 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/longnald/corin/keymaps/default/keymap.c b/keyboards/longnald/corin/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c8906efc59
--- /dev/null
+++ b/keyboards/longnald/corin/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 Longnald <support@longnald.com>
+ * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.com>
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_64_ansi(
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 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_SLSH, KC_HOME, KC_UP, KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_64_ansi(
+        KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, 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_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_NO, KC_PGDN,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    ),
+    [2] = LAYOUT_64_ansi(
+        KC_NO, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_G, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, KC_NO,
+        KC_NO, KC_NO, LAG_NRM, 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, LAG_SWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        MO(3), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    ),
+    [3] = LAYOUT_64_ansi(
+        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, RESET, 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/longnald/corin/readme.md b/keyboards/longnald/corin/readme.md
new file mode 100644
index 0000000000..116baa7d28
--- /dev/null
+++ b/keyboards/longnald/corin/readme.md
@@ -0,0 +1,15 @@
+# Corin
+
+![Corin view](https://github.com/longnald/corin/raw/master/view/view-1.jpg)
+
+Corin is a 64-key keyboard that adds 4 more arrow keys than a regular 60% keyboard made and sold by Seaton Jiang.
+
+- Keyboard Maintainer: [Longnald](https://github.com/longnald) & [Seaton Jiang](https://github.com/seatonjiang)
+- Hardware Supported: [Corin PCB (uses 32U4)](https://github.com/longnald/corin)
+- Hardware Availability: [wwww.longnald.com](https://wwww.longnald.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make longnald/corin:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/longnald/corin/rules.mk b/keyboards/longnald/corin/rules.mk
new file mode 100644
index 0000000000..965087c1a6
--- /dev/null
+++ b/keyboards/longnald/corin/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 = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # 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 = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output