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

Added kiserdesigns keyboard folder and Madeline keyboard (#21857 )
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2024-12-12 21:00:58 +00:00 · 2023-09-03 04:34:41 +00:00 · 2023-09-02 21:34:09 -07:00 · 2023-09-03 04:33:12 +00:00 · 2023-09-02 21:32:40 -07:00 · 2023-09-03 04:13:17 +00:00
31 changed files with 1120 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -95,6 +95,7 @@ secrets.tar
 # Python things
 __pycache__
 .python-version
+.venv

 # Prerequisites for updating ChibiOS
 /util/fmpp*
--- a/keyboards/1upkeyboards/1upsuper16v3/config.h
+++ b/keyboards/1upkeyboards/1upsuper16v3/config.h
@ -0,0 +1,22 @@
+/* Copyright 2023 ziptyze
+ *
+ * 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
+
+#define RGB_MATRIX_LED_COUNT 48
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
--- a/keyboards/1upkeyboards/1upsuper16v3/info.json
+++ b/keyboards/1upkeyboards/1upsuper16v3/info.json
@ -0,0 +1,164 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "1upsuper16v3",
+    "maintainer": "ziptyze",
+    "bootloader": "rp2040",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP20", "pin_b": "GP21"},
+            {"pin_a": "GP25", "pin_b": "GP26"},
+            {"pin_a": "GP2", "pin_b": "GP3"},
+            {"pin_a": "GP6", "pin_b": "GP7"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP23", "GP24", "GP4", "GP5"],
+            ["GP19", "GP27", "GP1", "GP8"],
+            ["GP18", "GP28", "GP0", "GP9"],
+            ["GP17", "GP16", "GP15", "GP11"]
+        ]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"x": 99, "y": 1, "flags": 2},
+            {"x": 70, "y": 1, "flags": 2},
+            {"x": 42, "y": 1, "flags": 2},
+            {"x": 14, "y": 1, "flags": 2},
+            {"x": 4, "y": 4, "flags": 2},
+            {"x": 4, "y": 12, "flags": 2},
+            {"matrix": [0, 0], "x": 28, "y": 8, "flags": 4},
+            {"matrix": [0, 1], "x": 84, "y": 8, "flags": 4},
+            {"x": 4, "y": 20, "flags": 2},
+            {"x": 4, "y": 28, "flags": 2},
+            {"matrix": [1, 0], "x": 28, "y": 24, "flags": 4},
+            {"matrix": [1, 1], "x": 84, "y": 24, "flags": 4},
+            {"x": 4, "y": 36, "flags": 2},
+            {"x": 4, "y": 44, "flags": 2},
+            {"matrix": [2, 0], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [2, 1], "x": 84, "y": 40, "flags": 4},
+            {"x": 4, "y": 52, "flags": 2},
+            {"x": 4, "y": 60, "flags": 2},
+            {"x": 14, "y": 63, "flags": 2},
+            {"matrix": [3, 0], "x": 28, "y": 56, "flags": 4},
+            {"x": 42, "y": 63, "flags": 2},
+            {"x": 70, "y": 63, "flags": 2},
+            {"matrix": [3, 1], "x": 84, "y": 56, "flags": 4},
+            {"x": 99, "y": 63, "flags": 2},
+            {"x": 126, "y": 63, "flags": 2},
+            {"matrix": [3, 2], "x": 140, "y": 56, "flags": 4},
+            {"x": 154, "y": 63, "flags": 2},
+            {"x": 182, "y": 63, "flags": 2},
+            {"matrix": [3, 3], "x": 196, "y": 56, "flags": 4},
+            {"x": 210, "y": 63, "flags": 2},
+            {"x": 220, "y": 60, "flags": 2},
+            {"x": 220, "y": 52, "flags": 2},
+            {"x": 220, "y": 44, "flags": 2},
+            {"matrix": [2, 3], "x": 196, "y": 40, "flags": 4},
+            {"matrix": [2, 2], "x": 140, "y": 40, "flags": 4},
+            {"x": 220, "y": 36, "flags": 2},
+            {"x": 220, "y": 28, "flags": 2},
+            {"matrix": [1, 3], "x": 196, "y": 24, "flags": 4},
+            {"matrix": [1, 2], "x": 140, "y": 24, "flags": 4},
+            {"x": 220, "y": 20, "flags": 2},
+            {"x": 220, "y": 12, "flags": 2},
+            {"matrix": [0, 3], "x": 196, "y": 8, "flags": 4},
+            {"matrix": [0, 2], "x": 140, "y": 8, "flags": 4},
+            {"x": 220, "y": 4, "flags": 2},
+            {"x": 210, "y": 1, "flags": 2},
+            {"x": 182, "y": 1, "flags": 2},
+            {"x": 154, "y": 1, "flags": 2},
+            {"x": 126, "y": 1, "flags": 2}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5610",
+        "vid": "0x6F75"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "community_layouts": ["ortho_4x4"],
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                {"label": "00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "10", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "11", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "20", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "21", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "30", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "31", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "32", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "33", "matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}
--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
@ -0,0 +1,39 @@
+/* Copyright 2023 ziptyze
+ *
+ * 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_ortho_4x4(
+        KC_P7, KC_P8, KC_P9,   KC_PMNS,
+        KC_P4, KC_P5, KC_P6,   KC_PPLS,
+        KC_P1, KC_P2, KC_P3,   KC_PSLS,
+        MO(1), KC_P0, KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+        RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk
@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/keymap.c
@ -0,0 +1,39 @@
+/* Copyright 2023 ziptyze
+ *
+ * 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_ortho_4x4(
+        KC_P7, KC_P8, KC_P9,   KC_PMNS,
+        KC_P4, KC_P5, KC_P6,   KC_PPLS,
+        KC_P1, KC_P2, KC_P3,   KC_PSLS,
+        MO(1), KC_P0, KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+        RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/rules.mk
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/rules.mk
@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/1upsuper16v3/readme.md
+++ b/keyboards/1upkeyboards/1upsuper16v3/readme.md
@ -0,0 +1,22 @@
+# 1upSuper16v3
+
+This keyboard is the Super16v3 from 1upkeyboards, a 4x4 macropad with the option for up to four encoders in the top row.  Notable features include in-switch per-key addressable RGB LEDs and thirty two 1mm underglow RGB LEDs; for bright and smooth lighting effects. The Super16v3 utilises an rp2040 microcontroller, wired using direct pins.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/1upsuper16v3:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/1upsuper16v3: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix. For this keyboard it is the top left button
+* **Physical reset button**: Hold the button on the back of the PCB and plug in the keyboard
--- a/keyboards/1upkeyboards/1upsuper16v3/rules.mk
+++ b/keyboards/1upkeyboards/1upsuper16v3/rules.mk
--- a/keyboards/kiserdesigns/madeline/config.h
+++ b/keyboards/kiserdesigns/madeline/config.h
@ -0,0 +1,25 @@
+/* Copyright 2021 Noah Kiser (NCKiser)
+ *
+ * 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
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+#define RP2040_FLASH_GENERIC_03H
--- a/keyboards/kiserdesigns/madeline/info.json
+++ b/keyboards/kiserdesigns/madeline/info.json
@ -0,0 +1,77 @@
+{
+    "manufacturer": "rubybuilds",
+    "keyboard_name": "Madeline",
+    "maintainer": "NCKiser",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP13", "pin_b": "GP15"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3"],
+        "rows": ["GP5", "GP4", "GP12", "GP7"]
+    },
+    "processor": "RP2040",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "url": "https://qmk.fm/keyboards",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6D64",
+        "vid": "0x5242"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0, "w": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
+        }
+    }
+}
--- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
+++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
@ -0,0 +1,53 @@
+/* Copyright 2021 Noah Kiser (NCKiser)
+ *
+ * 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
+
+enum layers {
+    _BASE,
+    _NUM_SYM
+};
+
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+        KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_ENT,
+        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,
+        KC_LCTL, KC_LALT, KC_BSPC, KC_NUM_SPC, KC_RGUI, KC_RCTL
+    ),
+
+    [_NUM_SYM] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_ESC, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_BSPC,
+        KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
+    };
+#endif
--- a/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk
+++ b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk
@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/kiserdesigns/madeline/readme.md
+++ b/keyboards/kiserdesigns/madeline/readme.md
@ -0,0 +1,23 @@
+# Madeline
+
+![Madeline](https://i.imgur.com/MBT5kg2h.jpg)
+
+*A cool QAZ-Alice hybrid designed based on the Adalyn by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [Rossman360](https://github.com/Rossman360)*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Madeline PCB, rp2040
+* Hardware Availability: kb.rubybuilds.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/madeline:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/madeline: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).
+## Bootloader
+Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly double-tap the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
--- a/keyboards/kiserdesigns/madeline/rules.mk
+++ b/keyboards/kiserdesigns/madeline/rules.mk
@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/redragon/k667/config.h
+++ b/keyboards/redragon/k667/config.h
@ -0,0 +1,28 @@
+/* Copyright 2023 temp4gh
+ *
+ * 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
+
+
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_ADDR_2 0b1010011
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 45
+#define DRIVER_2_LED_TOTAL 45
+
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
+
--- a/keyboards/redragon/k667/halconf.h
+++ b/keyboards/redragon/k667/halconf.h
@ -0,0 +1,22 @@
+/* Copyright 2023 temp4gh
+ *
+ * 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_next <halconf.h>
+
+#undef HAL_USE_I2C
+#define HAL_USE_I2C TRUE
--- a/keyboards/redragon/k667/info.json
+++ b/keyboards/redragon/k667/info.json
@ -0,0 +1,237 @@
+{
+    "manufacturer": "redragon",
+    "keyboard_name": "k667",
+    "bootloader": "stm32duino",
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 2
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "B8",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "C4", "C5", "B0", "B1", "C6", "C7", "C8", "C9", "A8", "A9", "A10", "A13", "A14", "A15"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_wave": true,
+            "pixel_flow": true
+        },
+        "driver": "is31fl3733",
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 2, "flags": 4},
+            {"matrix": [0, 2], "x": 34, "y": 2, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 2, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 2, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 2, "flags": 4},
+            {"matrix": [0, 6], "x": 95, "y": 2, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 2, "flags": 4},
+            {"matrix": [0, 8], "x": 122, "y": 2, "flags": 4},
+            {"matrix": [0, 9], "x": 136, "y": 2, "flags": 4},
+            {"matrix": [0, 10], "x": 157, "y": 2, "flags": 4},
+            {"matrix": [0, 11], "x": 170, "y": 2, "flags": 4},
+            {"matrix": [0, 12], "x": 184, "y": 2, "flags": 4},
+            {"matrix": [0, 13], "x": 198, "y": 2, "flags": 4},
+            {"matrix": [0, 14], "x": 217, "y": 2, "flags": 4},
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 4},
+            {"matrix": [1, 1], "x": 20, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 34, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 14, "flags": 4},
+            {"matrix": [1, 4], "x": 61, "y": 14, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 14, "flags": 4},
+            {"matrix": [1, 6], "x": 89, "y": 14, "flags": 4},
+            {"matrix": [1, 7], "x": 102, "y": 14, "flags": 4},
+            {"matrix": [1, 8], "x": 116, "y": 14, "flags": 4},
+            {"matrix": [1, 9], "x": 129, "y": 14, "flags": 4},
+            {"matrix": [1, 10], "x": 143, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 157, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 170, "y": 14, "flags": 4},
+            {"matrix": [1, 13], "x": 190, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 217, "y": 14, "flags": 4},
+            {"matrix": [2, 0], "x": 10, "y": 24, "flags": 4},
+            {"matrix": [2, 1], "x": 27, "y": 24, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 24, "flags": 4},
+            {"matrix": [2, 3], "x": 54, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 68, "y": 24, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 24, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 24, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 24, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 24, "flags": 4},
+            {"matrix": [2, 9], "x": 136, "y": 24, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 24, "flags": 4},
+            {"matrix": [2, 11], "x": 163, "y": 24, "flags": 4},
+            {"matrix": [2, 12], "x": 177, "y": 24, "flags": 4},
+            {"matrix": [2, 13], "x": 194, "y": 24, "flags": 4},
+            {"matrix": [2, 14], "x": 217, "y": 24, "flags": 4},
+            {"matrix": [3, 0], "x": 12, "y": 34, "flags": 4},
+            {"matrix": [3, 1], "x": 30, "y": 34, "flags": 4},
+            {"matrix": [3, 2], "x": 44, "y": 34, "flags": 4},
+            {"matrix": [3, 3], "x": 58, "y": 34, "flags": 4},
+            {"matrix": [3, 4], "x": 71, "y": 34, "flags": 4},
+            {"matrix": [3, 5], "x": 85, "y": 34, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 34, "flags": 4},
+            {"matrix": [3, 7], "x": 112, "y": 34, "flags": 4},
+            {"matrix": [3, 8], "x": 126, "y": 34, "flags": 4},
+            {"matrix": [3, 9], "x": 140, "y": 34, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 34, "flags": 4},
+            {"matrix": [3, 11], "x": 167, "y": 34, "flags": 4},
+            {"x": 180, "y": 34, "flags": 4},
+            {"matrix": [3, 13], "x": 189, "y": 34, "flags": 4},
+            {"matrix": [3, 14], "x": 217, "y": 34, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 44, "flags": 4},
+            {"x": 24, "y": 44, "flags": 4},
+            {"matrix": [4, 2], "x": 38, "y": 44, "flags": 4},
+            {"matrix": [4, 3], "x": 51, "y": 44, "flags": 4},
+            {"matrix": [4, 4], "x": 65, "y": 44, "flags": 4},
+            {"matrix": [4, 5], "x": 78, "y": 44, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 44, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 44, "flags": 4},
+            {"matrix": [4, 8], "x": 119, "y": 44, "flags": 4},
+            {"matrix": [4, 9], "x": 133, "y": 44, "flags": 4},
+            {"matrix": [4, 10], "x": 147, "y": 44, "flags": 4},
+            {"matrix": [4, 11], "x": 160, "y": 44, "flags": 4},
+            {"matrix": [4, 12], "x": 179, "y": 44, "flags": 4},
+            {"matrix": [4, 13], "x": 201, "y": 46, "flags": 4},
+            {"matrix": [4, 14], "x": 217, "y": 44, "flags": 4},
+            {"matrix": [5, 0], "x": 8, "y": 54, "flags": 4},
+            {"matrix": [5, 1], "x": 25, "y": 54, "flags": 4},
+            {"matrix": [5, 2], "x": 43, "y": 54, "flags": 4},
+            {"x": 67, "y": 57, "flags": 4},
+            {"x": 80, "y": 57, "flags": 4},
+            {"x": 94, "y": 54, "flags": 4},
+            {"matrix": [5, 6], "x": 107, "y": 57, "flags": 4},
+            {"x": 120, "y": 57, "flags": 4},
+            {"matrix": [5, 9], "x": 143, "y": 54, "flags": 4},
+            {"matrix": [5, 10], "x": 157, "y": 54, "flags": 4},
+            {"matrix": [5, 11], "x": 170, "y": 54, "flags": 4},
+            {"matrix": [5, 12], "x": 187, "y": 56, "flags": 4},
+            {"matrix": [5, 13], "x": 201, "y": 56, "flags": 4},
+            {"matrix": [5, 14], "x": 214, "y": 56, "flags": 4},
+            {"x": 207, "y": 23, "flags": 8},
+            {"x": 207, "y": 27, "flags": 8}
+        ]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0021",
+        "vid": "0x369B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "END", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "BSPC", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "HOME", "matrix": [1, 14], "x": 16.5, "y": 1.25},
+                {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "BSLS", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "DEL", "matrix": [2, 14], "x": 16.5, "y": 2.25},
+                {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "ENT", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "PGUP", "matrix": [3, 14], "x": 16.5, "y": 3.25},
+                {"label": "LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "RSFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "UP", "matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"label": "PGDN", "matrix": [4, 14], "x": 16.5, "y": 4.25},
+                {"label": "LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "SPC", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "RALT", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "MO(1)", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "RCTL", "matrix": [5, 11], "x": 13, "y": 5.25, "w": 1.25},
+                {"label": "LEFT", "matrix": [5, 12], "x": 14.25, "y": 5.25},
+                {"label": "DOWN", "matrix": [5, 13], "x": 15.25, "y": 5.25},
+                {"label": "RGHT", "matrix": [5, 14], "x": 16.5, "y": 5.25}
+            ]
+        }
+    }
+}
--- a/keyboards/redragon/k667/k667.c
+++ b/keyboards/redragon/k667/k667.c
@ -0,0 +1,112 @@
+/* Copyright 2023 temp4gh
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+    {0, G_1,    I_1,    H_1},            
+    {0, G_3,    I_3,    H_3},    
+    {0, G_4,    I_4,    H_4},    
+    {0, G_5,    I_5,    H_5},    
+    {0, G_6,    I_6,    H_6},    
+    {0, G_7,    I_7,    H_7},    
+    {0, G_8,    I_8,    H_8},    
+    {0, G_9,    I_9,    H_9},    
+    {0, G_10,   I_10,   H_10},    
+    {0, G_11,   I_11,   H_11},    
+    {0, G_12,   I_12,   H_12},    
+    {0, G_13,   I_13,   H_13},    
+    {0, G_14,   I_14,   H_14},    
+    {0, G_15,   I_15,   H_15},    
+    {0, D_1,    F_1,    E_1},        
+    {0, D_2,    F_2,    E_2},   
+    {0, D_3,    F_3,    E_3},    
+    {0, D_4,    F_4,    E_4},    
+    {0, D_5,    F_5,    E_5},    
+    {0, D_6,    F_6,    E_6},    
+    {0, D_7,    F_7,    E_7},    
+    {0, D_8,    F_8,    E_8},    
+    {0, D_9,    F_9,    E_9},    
+    {0, D_10,   F_10,   E_10},    
+    {0, D_11,   F_11,   E_11},    
+    {0, D_12,   F_12,   E_12},    
+    {0, D_13,   F_13,   E_13},    
+    {0, D_14,   F_14,   E_14},    
+    {0, D_15,   F_15,   E_15},    
+    {0, A_1,    C_1,    B_1},        
+    {0, A_2,    C_2,    B_2},   
+    {0, A_3,    C_3,    B_3},    
+    {0, A_4,    C_4,    B_4},    
+    {0, A_5,    C_5,    B_5},    
+    {0, A_6,    C_6,    B_6},    
+    {0, A_7,    C_7,    B_7},    
+    {0, A_8,    C_8,    B_8},    
+    {0, A_9,    C_9,    B_9},    
+    {0, A_10,   C_10,   B_10},    
+    {0, A_11,   C_11,   B_11},    
+    {0, A_12,   C_12,   B_12},    
+    {0, A_13,   C_13,   B_13},    
+    {0, A_14,   C_14,   B_14},    
+    {0, A_15,   C_15,   B_15},        
+    {1, G_1,    I_1,    H_1},        
+    {1, G_2,    I_2,    H_2},   
+    {1, G_3,    I_3,    H_3},    
+    {1, G_4,    I_4,    H_4},    
+    {1, G_5,    I_5,    H_5},    
+    {1, G_6,    I_6,    H_6},    
+    {1, G_7,    I_7,    H_7},    
+    {1, G_8,    I_8,    H_8},    
+    {1, G_9,    I_9,    H_9},    
+    {1, G_10,   I_10,   H_10},    
+    {1, G_11,   I_11,   H_11},    
+    {1, G_12,   I_12,   H_12},    
+    {1, G_13,   I_13,   H_13},    
+    {1, G_14,   I_14,   H_14},    
+    {1, G_15,   I_15,   H_15},    
+    {1, D_1,    F_1,    E_1},        
+    {1, D_2,    F_2,    E_2},   
+    {1, D_3,    F_3,    E_3},    
+    {1, D_4,    F_4,    E_4},    
+    {1, D_5,    F_5,    E_5},    
+    {1, D_6,    F_6,    E_6},    
+    {1, D_7,    F_7,    E_7},    
+    {1, D_8,    F_8,    E_8},    
+    {1, D_9,    F_9,    E_9},    
+    {1, D_10,   F_10,   E_10},    
+    {1, D_11,   F_11,   E_11},    
+    {1, D_12,   F_12,   E_12},    
+    {1, D_13,   F_13,   E_13},    
+    {1, D_14,   F_14,   E_14},    
+    {1, D_15,   F_15,   E_15},    
+    {1, A_1,    C_1,    B_1},        
+    {1, A_2,    C_2,    B_2},   
+    {1, A_3,    C_3,    B_3},        
+    {1, A_5,    C_5,    B_5},    
+    {1, A_6,    C_6,    B_6},    
+    {1, A_7,    C_7,    B_7},    
+    {1, A_8,    C_8,    B_8},    
+    {1, A_9,    C_9,    B_9},    
+    {1, A_10,   C_10,   B_10},    
+    {1, A_11,   C_11,   B_11},    
+    {1, A_12,   C_12,   B_12},    
+    {1, A_13,   C_13,   B_13},    
+    {1, A_14,   C_14,   B_14},    
+    {1, A_15,   C_15,   B_15},      
+    {0, G_2,    I_2,    H_2},
+    {1, A_4,    C_4,    B_4}
+};
+#endif
--- a/keyboards/redragon/k667/keymaps/default/keymap.c
+++ b/keyboards/redragon/k667/keymaps/default/keymap.c
@ -0,0 +1,42 @@
+/* Copyright 2023 temp4gh
+ *
+ * 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
+
+enum layer_names
+{
+    _BASE,
+    _FnLay,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  
+    [_BASE] = LAYOUT(    
+    KC_ESC,           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_END,
+    KC_GRV,  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_DEL,
+    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_PGUP,
+    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_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                   KC_RALT, MO(_FnLay), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FnLay] = LAYOUT(
+    QK_BOOT,          KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY,  KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,          XXXXXXX, XXXXXXX,
+    XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX,                            RGB_TOG,                   XXXXXXX, _______,   XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI
+    )    
+};
--- a/keyboards/redragon/k667/mcuconf.h
+++ b/keyboards/redragon/k667/mcuconf.h
@ -0,0 +1,22 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
--- a/keyboards/redragon/k667/readme.md
+++ b/keyboards/redragon/k667/readme.md
@ -0,0 +1,21 @@
+# K667
+
+![k667](https://i.imgur.com/7K5h5Obh.jpg)
+
+A customizable 75% keyboard.
+
+- Keyboard Maintainer: [temp4gh](https://github.com/temp4gh)
+- Hardware Supported: K667 PCB
+- Hardware Availability: www.redragonzone.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make redragon/k667:default
+
+Flashing example for this keyboard:
+
+    make redragon/k667:default:flash
+
+**Reset Key**: Hold down the key located at *K10*, commonly programmed as *Grave* while plugging in the keyboard.
+
+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).
--- a/keyboards/redragon/k667/rules.mk
+++ b/keyboards/redragon/k667/rules.mk
@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/wolf/m6_c/config.h
+++ b/keyboards/wolf/m6_c/config.h
@ -0,0 +1,10 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 6
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES 
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
--- a/keyboards/wolf/m6_c/info.json
+++ b/keyboards/wolf/m6_c/info.json
@ -0,0 +1,101 @@
+{
+    "manufacturer": "Rama",
+    "keyboard_name": "M6-C",
+    "maintainer": "ToastyStoemp",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B7"],
+        "rows": ["B2", "B3"]
+    },
+    "processor": "atmega32u4",
+    "ws2812": {
+        "pin": "D5"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "animations": {
+            "solid_color": true,
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "layout": [
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 243, "y": 0 },
+            { "flags": 4, "matrix": [1, 2], "x": 244, "y": 64 },
+            { "flags": 4, "matrix": [1, 1], "x": 122, "y": 64 },
+            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 64 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0060",
+        "vid": "0x5453"
+    },
+    "community_layouts": ["ortho_2x3"],
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 }
+            ]
+        }
+    }
+}
--- a/keyboards/wolf/m6_c/keymaps/default/keymap.c
+++ b/keyboards/wolf/m6_c/keymaps/default/keymap.c
@ -0,0 +1,12 @@
+// Copyright 2020-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ortho_2x3(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, KC_6
+    )
+};
--- a/keyboards/wolf/m6_c/keymaps/via/keymap.c
+++ b/keyboards/wolf/m6_c/keymaps/via/keymap.c
@ -0,0 +1,12 @@
+// Copyright 2020-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ortho_2x3(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, KC_6
+    )
+};
--- a/keyboards/wolf/m6_c/keymaps/via/rules.mk
+++ b/keyboards/wolf/m6_c/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/wolf/m6_c/readme.md
+++ b/keyboards/wolf/m6_c/readme.md
@ -0,0 +1,24 @@
+# M6-C
+
+![M6-C](https://i.imgur.com/gkRotHh.jpeg)
+
+The following is the QMK Firmware for the M6-C PCB.
+
+* Keyboard Maintainer: [Wolf](https://github.com/ToastyStoemp)
+* Hardware Supported: M6-C PCB
+* Hardware Availability: https://ramaworks.store/products/m6-c
+
+Make example for this keyboard (after setting up your build environment):
+
+	make wolf/m6_c:default
+
+Flashing example for this keyboard:
+
+    make wolf/m6_c: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).
+
+## Bootloader Enter the bootloader in 3 ways: 
+* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch)
+* **Physical reset button**: Double press the button through the pinhole in the case
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`
--- a/keyboards/wolf/m6_c/rules.mk
+++ b/keyboards/wolf/m6_c/rules.mk
@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 8000000
--- a/tmk_core/protocol/host.h
+++ b/tmk_core/protocol/host.h
@ -23,9 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host_driver.h"
 #include "led.h"

-#define IS_LED_ON(leds, led_name) ((leds) & (1 << (led_name)))
-#define IS_LED_OFF(leds, led_name) (~(leds) & (1 << (led_name)))
-
 #ifdef __cplusplus
 extern "C" {
 #endif
Author	SHA1	Message	Date
QMK Bot	911c715f49	Merge remote-tracking branch 'origin/master' into develop	2023-09-03 04:34:41 +00:00
NCKiser	8ad43a965f	Added kiserdesigns keyboard folder and Madeline keyboard (#21857 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2023-09-02 21:34:09 -07:00
QMK Bot	23bd6f16f9	Merge remote-tracking branch 'origin/master' into develop	2023-09-03 04:33:12 +00:00
Wolf Van Herreweghe	47e72a95ef	Add M6-C Keyboard Firmware (#21852 ) Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf <contact@vwolf.be>	2023-09-02 21:32:40 -07:00
QMK Bot	5c16bb4fc4	Merge remote-tracking branch 'origin/master' into develop	2023-09-03 04:13:17 +00:00
temp4gh	04ce3497ab	[keyboard] add redragon/k667 (#21417 ) Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: syc <squall_sha@163.com>	2023-09-02 21:12:43 -07:00
QMK Bot	e149340351	Merge remote-tracking branch 'origin/master' into develop	2023-09-03 03:44:34 +00:00
ziptyze	b03b49fca3	Add 1upkeyboards Super16v3 (#21665 ) Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>	2023-09-02 20:43:58 -07:00
Ryan	a74647c1fa	Remove old `IS_LED_ON/OFF()` macros (#21878 )	2023-09-03 03:24:52 +01:00
QMK Bot	c6b979b162	Merge remote-tracking branch 'origin/master' into develop	2023-09-03 01:25:36 +00:00
Frank Ebel	633d92a68b	chore: ignore virtual environment directory (#20905 )	2023-09-03 02:24:57 +01:00