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

6 files changed, 243 insertions, 0 deletions

diff --git a/keyboards/id67/default_rgb/config.h b/keyboards/id67/default_rgb/config.h
new file mode 100644
index 0000000000..fbf99cf673
--- /dev/null
+++ b/keyboards/id67/default_rgb/config.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 Tybera
+ *
+ * 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       0x6964 /* "id" */
+#define PRODUCT_ID      0x0067
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID67
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { B0, B1, B2, B3, F7 }
+#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F0
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 77
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//     #define RGBLIGHT_EFFECT_BREATHING
+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//     #define RGBLIGHT_EFFECT_SNAKE
+//     #define RGBLIGHT_EFFECT_KNIGHT
+//     #define RGBLIGHT_EFFECT_CHRISTMAS
+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//     #define RGBLIGHT_EFFECT_RGB_TEST
+//     #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/id67/default_rgb/default_rgb.c b/keyboards/id67/default_rgb/default_rgb.c
new file mode 100644
index 0000000000..972b0b8b06
--- /dev/null
+++ b/keyboards/id67/default_rgb/default_rgb.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Tybera
+ *
+ * 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 "default_rgb.h"
diff --git a/keyboards/id67/default_rgb/default_rgb.h b/keyboards/id67/default_rgb/default_rgb.h
new file mode 100644
index 0000000000..7c0a6d5aa8
--- /dev/null
+++ b/keyboards/id67/default_rgb/default_rgb.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Tybera
+ *
+ * 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_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2E,   \
+    K30,       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,   K0D,   K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
+    { K30,   KC_NO, 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/id67/default_rgb/info.json b/keyboards/id67/default_rgb/info.json
new file mode 100644
index 0000000000..f3114121c1
--- /dev/null
+++ b/keyboards/id67/default_rgb/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "ID67",
+    "url": "",
+    "maintainer": "qmk",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"K00 (B0,C7)", "x":0, "y":0},
+                {"label":"K01 (B0,F6)", "x":1, "y":0},
+                {"label":"K02 (B0,F5)", "x":2, "y":0},
+                {"label":"K03 (B0,F4)", "x":3, "y":0},
+                {"label":"K04 (B0,F1)", "x":4, "y":0},
+                {"label":"K05 (B0,B7)", "x":5, "y":0},
+                {"label":"K06 (B0,D5)", "x":6, "y":0},
+                {"label":"K07 (B0,D1)", "x":7, "y":0},
+                {"label":"K08 (B0,D2)", "x":8, "y":0},
+                {"label":"K09 (B0,D3)", "x":9, "y":0},
+                {"label":"K0A (B0,D4)", "x":10, "y":0},
+                {"label":"K0B (B0,D0)", "x":11, "y":0},
+                {"label":"K0C (B0,D6)", "x":12, "y":0},
+                {"label":"K0D (B0,D7)", "x":13, "y":0, "w":2},
+                {"label":"K0E (B0,B4)", "x":15, "y":0},
+
+                {"label":"K10 (B1,C7)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,F6)", "x":1.5, "y":1},
+                {"label":"K12 (B1,F5)", "x":2.5, "y":1},
+                {"label":"K13 (B1,F4)", "x":3.5, "y":1},
+                {"label":"K14 (B1,F1)", "x":4.5, "y":1},
+                {"label":"K15 (B1,B7)", "x":5.5, "y":1},
+                {"label":"K16 (B1,D5)", "x":6.5, "y":1},
+                {"label":"K17 (B1,D1)", "x":7.5, "y":1},
+                {"label":"K18 (B1,D2)", "x":8.5, "y":1},
+                {"label":"K19 (B1,D3)", "x":9.5, "y":1},
+                {"label":"K1A (B1,D4)", "x":10.5, "y":1},
+                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
+                {"label":"K1C (B1,D6)", "x":12.5, "y":1},
+                {"label":"K1D (B1,D7)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B1,B4)", "x":15, "y":1},
+
+                {"label":"K20 (B2,C7)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B2,F6)", "x":1.75, "y":2},
+                {"label":"K22 (B2,F5)", "x":2.75, "y":2},
+                {"label":"K23 (B2,F4)", "x":3.75, "y":2},
+                {"label":"K24 (B2,F1)", "x":4.75, "y":2},
+                {"label":"K25 (B2,B7)", "x":5.75, "y":2},
+                {"label":"K26 (B2,D5)", "x":6.75, "y":2},
+                {"label":"K27 (B2,D1)", "x":7.75, "y":2},
+                {"label":"K28 (B2,D2)", "x":8.75, "y":2},
+                {"label":"K29 (B2,D3)", "x":9.75, "y":2},
+                {"label":"K2A (B2,D4)", "x":10.75, "y":2},
+                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
+                {"label":"K2D (B2,D7)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B2,B4)", "x":15, "y":2},
+
+                {"label":"K30 (B3,C7)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (B3,F5)", "x":2.25, "y":3},
+                {"label":"K33 (B3,F4)", "x":3.25, "y":3},
+                {"label":"K34 (B3,F1)", "x":4.25, "y":3},
+                {"label":"K35 (B3,B7)", "x":5.25, "y":3},
+                {"label":"K36 (B3,D5)", "x":6.25, "y":3},
+                {"label":"K37 (B3,D1)", "x":7.25, "y":3},
+                {"label":"K38 (B3,D2)", "x":8.25, "y":3},
+                {"label":"K39 (B3,D3)", "x":9.25, "y":3},
+                {"label":"K3A (B3,D4)", "x":10.25, "y":3},
+                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
+                {"label":"K3C (B3,D6)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (B3,D7)", "x":14, "y":3},
+                {"label":"K3E (B3,B4)", "x":15, "y":3},
+
+                {"label":"K40 (F7,C7)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (F7,F6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K43 (F7,F4)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (F7,D5)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (F7,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (F7,D6)", "x":13, "y":4},
+                {"label":"K4D (F7,D7)", "x":14, "y":4},
+                {"label":"K4E (F7,B4)", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/id67/default_rgb/readme.md b/keyboards/id67/default_rgb/readme.md
new file mode 100644
index 0000000000..9559384f1e
--- /dev/null
+++ b/keyboards/id67/default_rgb/readme.md
@@ -0,0 +1,19 @@
+# IDOBAO ID67
+
+A 65% hotswap keyboard from IDOBAO.
+
+## ANSI support:
+
+* Keyboard Maintainer: Tybera
+* Hardware Supported: IDOBAO ID67
+* Hardware Availability: [IDOBAO](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make id67/default_rgb:default
+
+Flashing example for this keyboard:
+
+    make id67/default_rgb:default:flash
+
+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/id67/default_rgb/rules.mk b/keyboards/id67/default_rgb/rules.mk
new file mode 100644
index 0000000000..574f0067fb
--- /dev/null
+++ b/keyboards/id67/default_rgb/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 = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
+
+LAYOUTS = 65_ansi_blocker