From 9bbe1e02b5702c2f5acf23ca7c6789f181020c48 Mon Sep 17 00:00:00 2001 From: Joy Date: Thu, 25 May 2023 12:25:12 +0800 Subject: [PATCH 01/22] Added rpk-001 keyboard --- keyboards/phentech/rpk_001/config.h | 34 ++++ keyboards/phentech/rpk_001/halconf.h | 10 + keyboards/phentech/rpk_001/info.json | 182 ++++++++++++++++++ .../phentech/rpk_001/keymaps/default/keymap.c | 52 +++++ .../phentech/rpk_001/keymaps/via/keymap.c | 62 ++++++ .../phentech/rpk_001/keymaps/via/rules.mk | 2 + keyboards/phentech/rpk_001/mcuconf.h | 9 + keyboards/phentech/rpk_001/readme.md | 25 +++ keyboards/phentech/rpk_001/rpk_001.c | 92 +++++++++ keyboards/phentech/rpk_001/rules.mk | 1 + 10 files changed, 469 insertions(+) create mode 100644 keyboards/phentech/rpk_001/config.h create mode 100644 keyboards/phentech/rpk_001/halconf.h create mode 100644 keyboards/phentech/rpk_001/info.json create mode 100644 keyboards/phentech/rpk_001/keymaps/default/keymap.c create mode 100644 keyboards/phentech/rpk_001/keymaps/via/keymap.c create mode 100644 keyboards/phentech/rpk_001/keymaps/via/rules.mk create mode 100644 keyboards/phentech/rpk_001/mcuconf.h create mode 100644 keyboards/phentech/rpk_001/readme.md create mode 100644 keyboards/phentech/rpk_001/rpk_001.c create mode 100644 keyboards/phentech/rpk_001/rules.mk diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h new file mode 100644 index 000000000000..f7b5a2ac56e0 --- /dev/null +++ b/keyboards/phentech/rpk_001/config.h @@ -0,0 +1,34 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Encoder */ +#define ENCODER_DIRECTION_FLIP + +/* LED */ +#define LED_PIN_ON_STATE 0 +#define LED_CAPS_LOCK_PIN C15 +#define LED_SCROLL_LOCK_PIN C0 + +/* LED Driver */ +#define DRIVER_1_CS B6 +#define DRIVER_1_EN B7 +#define DRIVER_COUNT 1 +#define RGB_MATRIX_LED_COUNT 67 + +/* SPI Config */ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 + +/* SPI Flash */ +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 +#define WEAR_LEVELING_BACKING_SIZE (4 * 1024) + +/* RGB Matrix*/ +#define RGB_DISABLE_WHEN_USB_SUSPENDED +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_KEYRELEASES diff --git a/keyboards/phentech/rpk_001/halconf.h b/keyboards/phentech/rpk_001/halconf.h new file mode 100644 index 000000000000..8760386e815f --- /dev/null +++ b/keyboards/phentech/rpk_001/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json new file mode 100644 index 000000000000..b5441d509a13 --- /dev/null +++ b/keyboards/phentech/rpk_001/info.json @@ -0,0 +1,182 @@ +{ + "manufacturer": "HENGCANG ELECTRONIC", + "keyboard_name": "RPK-001", + "maintainer": "JoyLee", + "url": "", + "processor": "WB32FQ95", + "bootloader": "wb32-dfu", + "usb": { + "device_version": "1.0.0", + "vid": "0x3555", + "pid": "0x2236", + "force_nkro": true, + "suspend_wakeup_delay": 1000 + }, + "diode_direction": "ROW2COL", + "features": { + "nkro": true, + "encoder": true, + "extrakey": true, + "bootmagic": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["A6", "A7", "C4", "C5", "B0", "B1", "B10", "B11", "B13", "B14", "B15", "C6", "C7", "C8", "C9"], + "rows": ["C3", "A0", "A3", "A4", "A5"] + }, + "encoder": { + "rotary": [ + {"pin_a": "A1", "pin_b": "A2"} + ] + }, + "rgb_matrix": { + "driver": "AW20216", + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 112, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 128, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 144, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 160, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x": 176, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x": 192, "y": 0 }, + { "flags": 4, "matrix": [0, 13], "x": 208, "y": 0 }, + + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16}, + { "flags": 4, "matrix": [1, 1], "x": 16, "y": 16}, + { "flags": 4, "matrix": [1, 2], "x": 32, "y": 16}, + { "flags": 4, "matrix": [1, 3], "x": 48, "y": 16}, + { "flags": 4, "matrix": [1, 4], "x": 64, "y": 16}, + { "flags": 4, "matrix": [1, 5], "x": 80, "y": 16}, + { "flags": 4, "matrix": [1, 6], "x": 96, "y": 16}, + { "flags": 4, "matrix": [1, 7], "x": 112, "y": 16}, + { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16}, + { "flags": 4, "matrix": [1, 9], "x": 144, "y": 16}, + { "flags": 4, "matrix": [1, 10], "x": 160, "y": 16}, + { "flags": 4, "matrix": [1, 11], "x": 176, "y": 16}, + { "flags": 4, "matrix": [1, 12], "x": 192, "y": 16}, + { "flags": 4, "matrix": [1, 13], "x": 208, "y": 16}, + { "flags": 4, "matrix": [1, 14], "x": 224, "y": 16}, + + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, + { "flags": 4, "matrix": [2, 1], "x": 16, "y": 32}, + { "flags": 4, "matrix": [2, 2], "x": 32, "y": 32}, + { "flags": 4, "matrix": [2, 3], "x": 48, "y": 32}, + { "flags": 4, "matrix": [2, 4], "x": 64, "y": 32}, + { "flags": 4, "matrix": [2, 5], "x": 80, "y": 32}, + { "flags": 4, "matrix": [2, 6], "x": 96, "y": 32}, + { "flags": 4, "matrix": [2, 7], "x": 112, "y": 32}, + { "flags": 4, "matrix": [2, 8], "x": 128, "y": 32}, + { "flags": 4, "matrix": [2, 9], "x": 144, "y": 32}, + { "flags": 4, "matrix": [2, 10], "x": 160, "y": 32}, + { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32}, + { "flags": 1, "matrix": [2, 12], "x": 192, "y": 32}, + { "flags": 4, "matrix": [2, 14], "x": 224, "y": 32}, + + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, + { "flags": 4, "matrix": [3, 2], "x": 32, "y": 48}, + { "flags": 4, "matrix": [3, 3], "x": 48, "y": 48}, + { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48}, + { "flags": 4, "matrix": [3, 5], "x": 80, "y": 48}, + { "flags": 4, "matrix": [3, 6], "x": 96, "y": 48}, + { "flags": 4, "matrix": [3, 7], "x": 112, "y": 48}, + { "flags": 4, "matrix": [3, 8], "x": 128, "y": 48}, + { "flags": 4, "matrix": [3, 9], "x": 144, "y": 48}, + { "flags": 4, "matrix": [3, 10], "x": 160, "y": 48}, + { "flags": 4, "matrix": [3, 11], "x": 176, "y": 48}, + { "flags": 1, "matrix": [4, 12], "x": 192, "y": 48}, + { "flags": 1, "matrix": [3, 13], "x": 208, "y": 48}, + { "flags": 4, "matrix": [3, 14], "x": 224, "y": 48}, + + { "flags": 1, "matrix": [4, 0], "x": 0, "y": 64}, + { "flags": 1, "matrix": [4, 1], "x": 16, "y": 64}, + { "flags": 1, "matrix": [4, 2], "x": 32, "y": 64}, + { "flags": 4, "matrix": [4, 5], "x": 80, "y": 64}, + { "flags": 1, "matrix": [4, 8], "x": 144, "y": 64}, + { "flags": 1, "matrix": [4, 9], "x": 160, "y": 64}, + { "flags": 4, "matrix": [4, 10], "x": 176, "y": 64}, + { "flags": 1, "matrix": [4, 11], "x": 192, "y": 64}, + { "flags": 1, "matrix": [4, 13], "x": 208, "y": 64}, + { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64} + ] + }, + "layouts": { + "LAYOUT_68_ansi": { + "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": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 15.5, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [1, 14], "x": 15.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "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": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [2, 14], "x": 15.5, "y": 1 }, + { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 13], "x": 14.25, "y": 3 }, + { "matrix": [3, 14], "x": 15.5, "y": 3 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 }, + { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 }, + { "matrix": [4, 10], "w": 1.25, "x": 12, "y": 4 }, + { "matrix": [4, 11], "x": 13.5, "y": 4 }, + { "matrix": [4, 13], "x": 14.5, "y": 4 }, + { "matrix": [4, 14], "x": 15.5, "y": 4 } + ] + } + } +} diff --git a/keyboards/phentech/rpk_001/keymaps/default/keymap.c b/keyboards/phentech/rpk_001/keymaps/default/keymap.c new file mode 100644 index 000000000000..8380f7fdf557 --- /dev/null +++ b/keyboards/phentech/rpk_001/keymaps/default/keymap.c @@ -0,0 +1,52 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌────┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Mute│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ │Home│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┬──┘ ├────┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ ┌───┐ │End │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴───┬───┘ │ ↑ │ └────┘ + * │Ctrl│GUI │Alt │ │Alt│Ctl│ FN │ ┌───┼───┼───┐ + * └────┴────┴────┴────────────────────────┴───┴───┴────┘ │ ← │ ↓ │ → │ + * └───┴───┴───┘ + */ + [0] = LAYOUT_68_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_MUTE, + 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_HOME, + 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, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_68_ansi( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_68_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT_68_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c new file mode 100644 index 000000000000..c9b490b8e39b --- /dev/null +++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c @@ -0,0 +1,62 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌────┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Mute│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ │Home│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┬──┘ ├────┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ ┌───┐ │End │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴───┬───┘ │ ↑ │ └────┘ + * │Ctrl│GUI │Alt │ │Alt│Ctl│ FN │ ┌───┼───┼───┐ + * └────┴────┴────┴────────────────────────┴───┴───┴────┘ │ ← │ ↓ │ → │ + * └───┴───┴───┘ + */ + [0] = LAYOUT_68_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_MUTE, + 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, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_68_ansi( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_68_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT_68_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +/* encoder; start */ +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/phentech/rpk_001/keymaps/via/rules.mk b/keyboards/phentech/rpk_001/keymaps/via/rules.mk new file mode 100644 index 000000000000..715838ecc5d9 --- /dev/null +++ b/keyboards/phentech/rpk_001/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes diff --git a/keyboards/phentech/rpk_001/mcuconf.h b/keyboards/phentech/rpk_001/mcuconf.h new file mode 100644 index 000000000000..ca0e017ebdf9 --- /dev/null +++ b/keyboards/phentech/rpk_001/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE diff --git a/keyboards/phentech/rpk_001/readme.md b/keyboards/phentech/rpk_001/readme.md new file mode 100644 index 000000000000..4f7365c2d109 --- /dev/null +++ b/keyboards/phentech/rpk_001/readme.md @@ -0,0 +1,25 @@ + +# RPK-001 + +[![p9HNfPg.png](https://s1.ax1x.com/2023/05/25/p9HNfPg.png)](https://imgse.com/i/p9HNfPg) + +* Keyboard Maintainer: [JoyLee](https://github.com/itarze) +* Hardware Supported: RPK-001 PCB + +Make example for this keyboard (after setting up your build environment): + + make rpk_001:default + +Flashing example for this keyboard: + + make rpk_001: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 press 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 diff --git a/keyboards/phentech/rpk_001/rpk_001.c b/keyboards/phentech/rpk_001/rpk_001.c new file mode 100644 index 000000000000..7528e5841317 --- /dev/null +++ b/keyboards/phentech/rpk_001/rpk_001.c @@ -0,0 +1,92 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +#ifdef RGB_MATRIX_ENABLE + +// clang-format off + +const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 0 Esc + {0, CS1_SW2, CS2_SW2, CS3_SW2 }, // 1 1 + {0, CS1_SW3, CS2_SW3, CS3_SW3 }, // 2 2 + {0, CS1_SW4, CS2_SW4, CS3_SW4 }, // 3 3 + {0, CS1_SW5, CS2_SW5, CS3_SW5 }, // 4 4 + {0, CS1_SW6, CS2_SW6, CS3_SW6 }, // 5 5 + {0, CS1_SW7, CS2_SW7, CS3_SW7 }, // 6 6 + {0, CS1_SW8, CS2_SW8, CS3_SW8 }, // 7 7 + {0, CS1_SW9, CS2_SW9, CS3_SW9 }, // 8 8 + {0, CS1_SW10, CS2_SW10, CS3_SW10 }, // 9 9 + {0, CS1_SW11, CS2_SW11, CS3_SW11 }, // 10 0 + {0, CS1_SW12, CS2_SW12, CS3_SW12 }, // 11 - + {0, CS16_SW1, CS17_SW1, CS18_SW1 }, // 12 = + {0, CS16_SW2, CS17_SW2, CS18_SW2 }, // 13 Backspace + + {0, CS4_SW1, CS5_SW1, CS6_SW1 }, // 14 Tab + {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 15 Q + {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 16 W + {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 17 E + {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 18 R + {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 19 T + {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 20 Y + {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 21 U + {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 22 I + {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 23 O + {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 24 P + {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 25 [ + {0, CS16_SW4, CS17_SW4, CS18_SW4 }, // 26 ] + {0, CS16_SW5, CS17_SW5, CS18_SW5 }, // 27 \| + {0, CS16_SW3, CS17_SW3, CS18_SW3 }, // 28 Del + + {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 29 Caps Lock + {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 30 A + {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 31 S + {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 32 D + {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 33 F + {0, CS7_SW6, CS8_SW6, CS9_SW6 }, // 34 G + {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 35 H + {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 36 J + {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 37 K + {0, CS7_SW10, CS8_SW10, CS9_SW10 }, // 38 L + {0, CS7_SW11, CS8_SW11, CS9_SW11 }, // 39 ; + {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 40 ' + {0, CS16_SW7, CS17_SW7, CS18_SW7 }, // 41 Enter + {0, CS16_SW6, CS17_SW6, CS18_SW6 }, // 42 Home + + {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 43 Shift_L + {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 44 Z + {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 45 X + {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 46 C + {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 47 V + {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 48 B + {0, CS10_SW8, CS11_SW8, CS12_SW8 }, // 49 N + {0, CS10_SW9, CS11_SW9, CS12_SW9 }, // 50 M + {0, CS10_SW10, CS11_SW10, CS12_SW10 }, // 51 , + {0, CS10_SW11, CS11_SW11, CS12_SW11 }, // 52 . + {0, CS10_SW12, CS11_SW12, CS12_SW12 }, // 53 / + {0, CS16_SW9, CS17_SW9, CS18_SW9 }, // 54 Shift_R + {0, CS16_SW10, CS17_SW10, CS18_SW10 }, // 55 Up + {0, CS16_SW8, CS17_SW8, CS18_SW8 }, // 56 END + + {0, CS13_SW1, CS14_SW1, CS15_SW1 }, // 57 Ctrl_L + {0, CS13_SW2, CS14_SW2, CS15_SW2 }, // 58 Win_L + {0, CS13_SW3, CS14_SW3, CS15_SW3 }, // 59 Alt_L + {0, CS13_SW6, CS14_SW6, CS15_SW6 }, // 60 Space + {0, CS13_SW9, CS14_SW9, CS15_SW9 }, // 61 Alt_R + {0, CS13_SW10, CS14_SW10, CS15_SW10 }, // 62 Ctrl_R + {0, CS13_SW11, CS14_SW11, CS15_SW11 }, // 63 FN + {0, CS13_SW12, CS14_SW12, CS15_SW12 }, // 64 Left + {0, CS16_SW12, CS17_SW12, CS18_SW12 }, // 65 Down + {0, CS16_SW11, CS17_SW11, CS18_SW11 }, // 66 Right +}; + +// clang-format on + +#endif // #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/phentech/rpk_001/rules.mk b/keyboards/phentech/rpk_001/rules.mk new file mode 100644 index 000000000000..002458405eed --- /dev/null +++ b/keyboards/phentech/rpk_001/rules.mk @@ -0,0 +1 @@ +WEAR_LEVELING_DRIVER = spi_flash From 99d0db970ed58486a00b02f6c077d2fc4fa7d039 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:28:33 +0800 Subject: [PATCH 02/22] Update keyboards/phentech/rpk_001/config.h Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h index f7b5a2ac56e0..f7ea3a893bcc 100644 --- a/keyboards/phentech/rpk_001/config.h +++ b/keyboards/phentech/rpk_001/config.h @@ -3,9 +3,6 @@ #pragma once -/* Encoder */ -#define ENCODER_DIRECTION_FLIP - /* LED */ #define LED_PIN_ON_STATE 0 #define LED_CAPS_LOCK_PIN C15 From 183e8786cfe73b9a45bf034dd7947dac9b778234 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:29:21 +0800 Subject: [PATCH 03/22] Update keyboards/phentech/rpk_001/rpk_001.c Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/rpk_001.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/rpk_001.c b/keyboards/phentech/rpk_001/rpk_001.c index 7528e5841317..9f1a11875969 100644 --- a/keyboards/phentech/rpk_001/rpk_001.c +++ b/keyboards/phentech/rpk_001/rpk_001.c @@ -1,7 +1,7 @@ // Copyright 2023 JoyLee (@itarze) // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE From c89fc234c6ee8550fc0583466275249ed7feaf5a Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:29:28 +0800 Subject: [PATCH 04/22] Update keyboards/phentech/rpk_001/readme.md Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/phentech/rpk_001/readme.md b/keyboards/phentech/rpk_001/readme.md index 4f7365c2d109..f543f7f1a6f3 100644 --- a/keyboards/phentech/rpk_001/readme.md +++ b/keyboards/phentech/rpk_001/readme.md @@ -8,11 +8,11 @@ Make example for this keyboard (after setting up your build environment): - make rpk_001:default + make phentech/rpk_001:default Flashing example for this keyboard: - make rpk_001:default:flash + make phentech/rpk_001: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). From 693cdba495ef1d4a27f1ec0476d6529ad06cf849 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:29:37 +0800 Subject: [PATCH 05/22] Update keyboards/phentech/rpk_001/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/keymaps/via/keymap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c index c9b490b8e39b..ff24dc7cd409 100644 --- a/keyboards/phentech/rpk_001/keymaps/via/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c @@ -32,22 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [2] = LAYOUT_68_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [3] = LAYOUT_68_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 3bada1e00cadb70288f38b45c64fd15e4663e251 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:29:49 +0800 Subject: [PATCH 06/22] Update keyboards/phentech/rpk_001/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../phentech/rpk_001/keymaps/default/keymap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/phentech/rpk_001/keymaps/default/keymap.c b/keyboards/phentech/rpk_001/keymaps/default/keymap.c index 8380f7fdf557..ed46f30cc410 100644 --- a/keyboards/phentech/rpk_001/keymaps/default/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/default/keymap.c @@ -32,21 +32,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [2] = LAYOUT_68_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [3] = LAYOUT_68_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 63baaea2ee35b59f79cb1c060fcab6b0083107ee Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:30:30 +0800 Subject: [PATCH 07/22] Update keyboards/phentech/rpk_001/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/keymaps/via/keymap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c index ff24dc7cd409..912122a3a549 100644 --- a/keyboards/phentech/rpk_001/keymaps/via/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c @@ -39,8 +39,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif From 8cd46dd1ae6ee116317f70dcba74e7f09e87228a Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:30:39 +0800 Subject: [PATCH 08/22] Update keyboards/phentech/rpk_001/info.json Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index b5441d509a13..012e4bead38e 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -26,7 +26,7 @@ }, "encoder": { "rotary": [ - {"pin_a": "A1", "pin_b": "A2"} + {"pin_a": "A2", "pin_b": "A1"} ] }, "rgb_matrix": { From bd2be220ac655d644a1fdf798463d8adcc0d6d43 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:30:49 +0800 Subject: [PATCH 09/22] Update keyboards/phentech/rpk_001/config.h Co-authored-by: Joel Challis --- keyboards/phentech/rpk_001/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h index f7ea3a893bcc..83b6acc7f932 100644 --- a/keyboards/phentech/rpk_001/config.h +++ b/keyboards/phentech/rpk_001/config.h @@ -3,10 +3,6 @@ #pragma once -/* LED */ -#define LED_PIN_ON_STATE 0 -#define LED_CAPS_LOCK_PIN C15 -#define LED_SCROLL_LOCK_PIN C0 /* LED Driver */ #define DRIVER_1_CS B6 From e540ce602a428b91599f3f9a2932ebfa9ae27162 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:36:58 +0800 Subject: [PATCH 10/22] Update info.json --- keyboards/phentech/rpk_001/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index 012e4bead38e..cbc8b04463ad 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -29,6 +29,10 @@ {"pin_a": "A2", "pin_b": "A1"} ] }, + "indicators": { + "caps_lock": "C15", + "scroll_lock": "C0" + }, "rgb_matrix": { "driver": "AW20216", "layout": [ From bcf39cfff9dff87a3d9bba2ddc7f164b5a8ab8fe Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:38:08 +0800 Subject: [PATCH 11/22] Update config.h --- keyboards/phentech/rpk_001/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h index 83b6acc7f932..a2a47b7e6e94 100644 --- a/keyboards/phentech/rpk_001/config.h +++ b/keyboards/phentech/rpk_001/config.h @@ -3,7 +3,6 @@ #pragma once - /* LED Driver */ #define DRIVER_1_CS B6 #define DRIVER_1_EN B7 From d50bf2af5b0851dca61dc4c0c663be55c68a8b50 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:49:43 +0800 Subject: [PATCH 12/22] Update info.json --- keyboards/phentech/rpk_001/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index cbc8b04463ad..8e2cdcc9213e 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -31,7 +31,8 @@ }, "indicators": { "caps_lock": "C15", - "scroll_lock": "C0" + "scroll_lock": "C0", + "on_state": 0 }, "rgb_matrix": { "driver": "AW20216", From 63e147a1a21a50a8bf3e5bc0731238e56ab606a0 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 25 May 2023 23:51:05 +0800 Subject: [PATCH 13/22] Update config.h --- keyboards/phentech/rpk_001/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h index a2a47b7e6e94..65436fae6e18 100644 --- a/keyboards/phentech/rpk_001/config.h +++ b/keyboards/phentech/rpk_001/config.h @@ -19,7 +19,7 @@ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 #define WEAR_LEVELING_BACKING_SIZE (4 * 1024) -/* RGB Matrix*/ +/* RGB Matrix */ #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES From 4185fa7316c7c0d9c5fe2a75abcac8713d7e49a1 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Fri, 26 May 2023 00:00:04 +0800 Subject: [PATCH 14/22] Update keymap.c --- keyboards/phentech/rpk_001/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/keymaps/default/keymap.c b/keyboards/phentech/rpk_001/keymaps/default/keymap.c index ed46f30cc410..44844e5dbf82 100644 --- a/keyboards/phentech/rpk_001/keymaps/default/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 2245868ae1d1c780d7056e4750f6f6462e97d082 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Fri, 26 May 2023 00:01:13 +0800 Subject: [PATCH 15/22] Update keymap.c --- keyboards/phentech/rpk_001/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c index 912122a3a549..9abbfa5658f3 100644 --- a/keyboards/phentech/rpk_001/keymaps/via/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 9b32158ba9fc8f1479d17f6a812f322f078f2ce8 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Fri, 26 May 2023 08:03:54 +0800 Subject: [PATCH 16/22] Update info.json --- keyboards/phentech/rpk_001/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index 8e2cdcc9213e..f82c69a5490d 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -7,7 +7,7 @@ "bootloader": "wb32-dfu", "usb": { "device_version": "1.0.0", - "vid": "0x3555", + "vid": "0xAC12", "pid": "0x2236", "force_nkro": true, "suspend_wakeup_delay": 1000 From 718866fa2ad71c12a8e9d80314aa172eb53f3f9f Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Mon, 29 May 2023 08:29:13 +0800 Subject: [PATCH 17/22] Update keyboards/phentech/rpk_001/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/phentech/rpk_001/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c index 9abbfa5658f3..320f7f141522 100644 --- a/keyboards/phentech/rpk_001/keymaps/via/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* encoder; start */ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; From 3c24c6d7cfcd57200a316e1ada37d308c6bc4828 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 17 Aug 2023 17:33:03 +0800 Subject: [PATCH 18/22] Update keyboards/phentech/rpk_001/info.json Co-authored-by: Duncan Sutherland --- keyboards/phentech/rpk_001/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index f82c69a5490d..1f7916b1e8e0 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -111,7 +111,7 @@ ] }, "layouts": { - "LAYOUT_68_ansi": { + "LAYOUT": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, From 250ee42bffe834a78bb7a478ed8cfe405c92b304 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 17 Aug 2023 17:33:15 +0800 Subject: [PATCH 19/22] Update keyboards/phentech/rpk_001/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/phentech/rpk_001/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/phentech/rpk_001/keymaps/default/keymap.c b/keyboards/phentech/rpk_001/keymaps/default/keymap.c index 44844e5dbf82..b07a7f64c05a 100644 --- a/keyboards/phentech/rpk_001/keymaps/default/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴────┘ │ ← │ ↓ │ → │ * └───┴───┴───┘ */ - [0] = LAYOUT_68_ansi( + [0] = LAYOUT( 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_MUTE, 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_HOME, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_68_ansi( + [1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 82dfe6ce7403ded6137fa1f8bf4aa3f922df4537 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Thu, 17 Aug 2023 17:33:23 +0800 Subject: [PATCH 20/22] Update keyboards/phentech/rpk_001/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/phentech/rpk_001/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c index 320f7f141522..99bfd5ad1509 100644 --- a/keyboards/phentech/rpk_001/keymaps/via/keymap.c +++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴────┘ │ ← │ ↓ │ → │ * └───┴───┴───┘ */ - [0] = LAYOUT_68_ansi( + [0] = LAYOUT( 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_MUTE, 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, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_68_ansi( + [1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 96f6cd151cfd115f32d263800ce3ade61c7e21cc Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Fri, 18 Aug 2023 23:17:52 +0800 Subject: [PATCH 21/22] Update keyboards/phentech/rpk_001/config.h Co-authored-by: Duncan Sutherland --- keyboards/phentech/rpk_001/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h index 65436fae6e18..05391a21ed79 100644 --- a/keyboards/phentech/rpk_001/config.h +++ b/keyboards/phentech/rpk_001/config.h @@ -3,7 +3,7 @@ #pragma once -/* LED Driver */ +/* RGB Config */ #define DRIVER_1_CS B6 #define DRIVER_1_EN B7 #define DRIVER_COUNT 1 From e992d8f6b9af18db643889f1e7c7ca7e433f7432 Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Fri, 1 Sep 2023 22:04:53 +0800 Subject: [PATCH 22/22] Update keyboards/phentech/rpk_001/info.json --- keyboards/phentech/rpk_001/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index 1f7916b1e8e0..105a126160b8 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -35,7 +35,7 @@ "on_state": 0 }, "rgb_matrix": { - "driver": "AW20216", + "driver": "aw20216", "layout": [ { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 },