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

4 files changed, 134 insertions, 0 deletions

diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
new file mode 100644
index 0000000000..911051c31a
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
@@ -0,0 +1,30 @@
+/* 
+Copyright 2022 Alex K
+
+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 */
+#undef VENDOR_ID
+#undef MANUFACTURER
+#undef PRODUCT
+
+#define VENDOR_ID       0xAF88
+#define MANUFACTURER    Droxx-FurFuzz
+#define PRODUCT         Carbon v2 4rk
+
+/* force N key rollover even on startup regardless of EEPROM setting */
+#define FORCE_NKRO
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
new file mode 100644
index 0000000000..1c6e2b982d
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
@@ -0,0 +1,71 @@
+// KBD67 Rev 2 ANSI Layout
+
+/* Copyright 2022 Alex K
+ *
+ * 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
+// #include "droxx.h"
+
+// make keycodes easier to change for the future
+#define DRXX        KC_TRNS
+
+// enumerate custom layer names for the keymap
+enum keymap_layers {
+    _DRXXMAIN = 0,
+    _DRXXFN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap Base Layer
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+   * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ BackSp│Hom│
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+   * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ BkSl│PgU│
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+   * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+   * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ ↑ │End│
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+   * │Ctrl│ Win│ Alt│          Space         │Alt│Fn │Ctl│ ← │ ↓ │ → │
+   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+   */
+[_DRXXMAIN] = LAYOUT_65_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_HOME,
+  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_PGUP,
+  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_PGDN,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_END,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                     KC_SPC,                        KC_RALT,     MO(_DRXXFN),     KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+  /* Keymap Fn Layer
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+   * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│    Del│Ins│
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+   * │     │RM-│RB+│RM+│   │RTg│   │   │   │   │   │   │   │     │Pau│
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+   * │      │RS-│RB-│RS+│   │   │   │   │   │   │   │   │        │SLk│
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+   * │        │   │DGu│EGu│   │   │   │   │   │   │   │      │   │PSr│
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+   * │    │    │    │                        │   │   │   │   │   │   │
+   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+   */
+[_DRXXFN] = LAYOUT_65_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_INS,
+  DRXX  ,   RGB_RMOD, RGB_VAI,  RGB_MOD,  DRXX,     RGB_TOG,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     KC_PAUS,
+  DRXX,     RGB_SPD,  RGB_VAD,  RGB_SPI,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_SLCK,
+  DRXX,     DRXX,     GUI_OFF,  GUI_ON,   DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_PSCR,
+  DRXX,     DRXX,     DRXX,                         DRXX,                         DRXX,          DRXX,          DRXX,     DRXX,     DRXX,     DRXX),
+};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
new file mode 100644
index 0000000000..26d686c977
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
@@ -0,0 +1,30 @@
+## Droxx's ANSI style keymap for the KBD67 REV 2 PCB
+
+* An ANSI keymap layout made by Alex for the KBD67 Rev 2
+* This keymap features two layers using basic Fn alternate keys on the second layer as well as lighting control
+
+![KBD67Rev2 Layout](https://i.imgur.com/DPSMhIX.png)
+
+### Layer 0 (_DRXXMAIN)
+
+The base QWERTY layer
+
+* Basic qwerty key layout with nothing other than an Fn key
+* Fn on the bottom row activates layer 1
+
+### Layer 1 (_DRXXFN)
+
+The function layer
+
+* Backspace will trigger KC_DEL until I find the KC_HOME key less useful.
+* Pressing T will toggle the keyboard underglow feature on and off.
+* Keys Q and E are used to change the underglow style of the keyboard.
+* Keys W and S modify the brightness of the underglow.
+* Keys A and D change the speed of the LED RGB animation.
+
+~~When Fn is held on layer 0, the arrow keys become a control surface for the LED baclighting~~
+~~The up arrow is used to cycle backlight modes, down arrow for toggling the backlight on or off,~~
+~~and the right and left for increasing and decreasing the brightness respectively.~~[^note]
+* X is used to disable the GUI key and C is used to enable the GUI key.
+
+[^note]: I don't have in-switch LEDs installed?
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk
new file mode 100644
index 0000000000..c9b5587d59
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk
@@ -0,0 +1,3 @@
+MOUSEKEY_ENABLE = no
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = yes