From 0f77bee99cff99208b7a6276ba880a7d732de19e Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Sun, 20 Nov 2022 09:05:49 +0800 Subject: [PATCH 01/21] add tofu_2 keyboard support --- keyboards/dztech/tofu/ii/ii.c | 17 ++ keyboards/dztech/tofu/ii/ii.h | 22 +++ keyboards/dztech/tofu/ii/info.json | 5 + .../dztech/tofu/ii/keymaps/default/keymap.c | 44 +++++ keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 44 +++++ keyboards/dztech/tofu/ii/keymaps/via/rules.mk | 1 + keyboards/dztech/tofu/ii/readme.md | 22 +++ keyboards/dztech/tofu/ii/rules.mk | 1 + keyboards/dztech/tofu/ii/v1/config.h | 88 +++++++++ keyboards/dztech/tofu/ii/v1/halconf.h | 21 +++ keyboards/dztech/tofu/ii/v1/info.json | 171 ++++++++++++++++++ keyboards/dztech/tofu/ii/v1/mcuconf.h | 22 +++ keyboards/dztech/tofu/ii/v1/readme.md | 22 +++ keyboards/dztech/tofu/ii/v1/rules.mk | 0 keyboards/dztech/tofu/ii/v1/v1.c | 102 +++++++++++ keyboards/dztech/tofu/ii/v1/v1.h | 35 ++++ 16 files changed, 617 insertions(+) create mode 100644 keyboards/dztech/tofu/ii/ii.c create mode 100644 keyboards/dztech/tofu/ii/ii.h create mode 100644 keyboards/dztech/tofu/ii/info.json create mode 100644 keyboards/dztech/tofu/ii/keymaps/default/keymap.c create mode 100644 keyboards/dztech/tofu/ii/keymaps/via/keymap.c create mode 100644 keyboards/dztech/tofu/ii/keymaps/via/rules.mk create mode 100644 keyboards/dztech/tofu/ii/readme.md create mode 100644 keyboards/dztech/tofu/ii/rules.mk create mode 100644 keyboards/dztech/tofu/ii/v1/config.h create mode 100644 keyboards/dztech/tofu/ii/v1/halconf.h create mode 100644 keyboards/dztech/tofu/ii/v1/info.json create mode 100644 keyboards/dztech/tofu/ii/v1/mcuconf.h create mode 100644 keyboards/dztech/tofu/ii/v1/readme.md create mode 100644 keyboards/dztech/tofu/ii/v1/rules.mk create mode 100644 keyboards/dztech/tofu/ii/v1/v1.c create mode 100644 keyboards/dztech/tofu/ii/v1/v1.h diff --git a/keyboards/dztech/tofu/ii/ii.c b/keyboards/dztech/tofu/ii/ii.c new file mode 100644 index 000000000000..861cc5e04775 --- /dev/null +++ b/keyboards/dztech/tofu/ii/ii.c @@ -0,0 +1,17 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#include "ii.h" diff --git a/keyboards/dztech/tofu/ii/ii.h b/keyboards/dztech/tofu/ii/ii.h new file mode 100644 index 000000000000..d3e2c46d274b --- /dev/null +++ b/keyboards/dztech/tofu/ii/ii.h @@ -0,0 +1,22 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#pragma once + +#ifdef KEYBOARD_dztech_tofu_ii_v1 + #include "v1.h" +#endif +#include "quantum.h" diff --git a/keyboards/dztech/tofu/ii/info.json b/keyboards/dztech/tofu/ii/info.json new file mode 100644 index 000000000000..8dee5e0cbc38 --- /dev/null +++ b/keyboards/dztech/tofu/ii/info.json @@ -0,0 +1,5 @@ +{ + "keyboard_name": "TOFU_II", + "manufacturer": "DZTECH", + "maintainer": "DZTECH" +} diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c new file mode 100644 index 000000000000..2e396f919487 --- /dev/null +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_GESC, 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_BSLASH, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), + [1] = LAYOUT_all( + KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN, + KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), + [2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c new file mode 100644 index 000000000000..2e396f919487 --- /dev/null +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -0,0 +1,44 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_GESC, 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_BSLASH, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), + [1] = LAYOUT_all( + KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN, + KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), + [2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/dztech/tofu/ii/keymaps/via/rules.mk b/keyboards/dztech/tofu/ii/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/dztech/tofu/ii/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/dztech/tofu/ii/readme.md b/keyboards/dztech/tofu/ii/readme.md new file mode 100644 index 000000000000..94950987ffe4 --- /dev/null +++ b/keyboards/dztech/tofu/ii/readme.md @@ -0,0 +1,22 @@ +# TOFU_II +A customizable 66 key RGB keyboard. + +* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681) +* Hardware Supported: TOFU_II +* Hardware Availability: [KBDfans](https://kbdfans.com/) + +## Bootloader mode + +Enter the bootloader in 3 ways: + +* Bootmagic reset: Hold down the left top key then plug in the USB cable. +* Physical reset button: Double tap the reset button. +* Keycode in layout: Press the key mapped to QK_BOOT if it is available. + +## Making firmware + +Make example for this keyboard (after setting up your build environment): + + make dztech/tofu/ii/v1:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/dztech/tofu/ii/rules.mk b/keyboards/dztech/tofu/ii/rules.mk new file mode 100644 index 000000000000..c08cfdaae907 --- /dev/null +++ b/keyboards/dztech/tofu/ii/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = dztech/tofu/ii/v1 diff --git a/keyboards/dztech/tofu/ii/v1/config.h b/keyboards/dztech/tofu/ii/v1/config.h new file mode 100644 index 000000000000..a0c1240cdd89 --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/config.h @@ -0,0 +1,88 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#pragma once +#define I2C1_SDA_PIN GP2 +#define I2C1_SCL_PIN GP3 +#define I2C_DRIVER I2CD2 + +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U + +#ifdef RGB_MATRIX_ENABLE +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define USB_SUSPEND_WAKEUP_DELAY 5000 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_LED_PROCESS_LIMIT 4 +# define RGB_MATRIX_LED_FLUSH_LIMIT 26 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +# define DRIVER_ADDR_1 0b1010000 +# define DRIVER_ADDR_2 0b1011111 +# define DRIVER_COUNT 2 +# define DRIVER_1_LED_TOTAL 46 +# define DRIVER_2_LED_TOTAL 20 +# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#endif diff --git a/keyboards/dztech/tofu/ii/v1/halconf.h b/keyboards/dztech/tofu/ii/v1/halconf.h new file mode 100644 index 000000000000..2afac582dd38 --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#pragma once + +#define HAL_USE_I2C TRUE + +#include_next diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json new file mode 100644 index 000000000000..e5a70e886af2 --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -0,0 +1,171 @@ +{ + "bootloader": "rp2040", + "debounce": 5, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP25", "GP24", "GP23", "GP1", "GP7", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12"], + "rows": ["GP29", "GP28", "GP27", "GP26", "GP22"] + }, + "matrix_size": { + "cols": 15, + "rows": 5 + }, + "processor": "RP2040", + "rgb_matrix": { + "driver": "IS31FL3737", + "layout": [ + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 }, + { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 }, + { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 }, + { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 }, + { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 }, + { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 }, + { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 }, + { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 }, + { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 }, + { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 }, + { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 }, + { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 }, + { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 }, + { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, + { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 }, + { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 }, + { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 }, + { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 }, + { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 }, + { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 }, + { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 }, + { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 }, + { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 }, + { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 }, + { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 }, + { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 }, + { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 }, + { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 }, + { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 }, + { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 }, + { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 }, + { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 }, + { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 }, + { "flags": 1, "matrix": [4, 8], "x": 151, "y": 64 }, + { "flags": 1, "matrix": [4, 10], "x": 170, "y": 64 }, + { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 }, + { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 }, + { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 } + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x1427", + "vid": "0x445A" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 }, + { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, + { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 13], "w": 1, "x": 14, "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, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 }, + { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 }, + { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 }, + { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 } + ] + } + } +} diff --git a/keyboards/dztech/tofu/ii/v1/mcuconf.h b/keyboards/dztech/tofu/ii/v1/mcuconf.h new file mode 100644 index 000000000000..e19f696e19c1 --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#pragma once + +#include_next + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/dztech/tofu/ii/v1/readme.md b/keyboards/dztech/tofu/ii/v1/readme.md new file mode 100644 index 000000000000..25e2d9e687f6 --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/readme.md @@ -0,0 +1,22 @@ +# TOFU_II +A customizable 66 key RGB keyboard. + +* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681) +* Hardware Supported: TOFU_II +* Hardware Availability: [KBDfans](https://kbdfans.com/) + +## Bootloader mode + +Enter the bootloader in 3 ways: + +* Bootmagic reset: Hold down the left top key then plug in the USB cable. +* Physical reset button: Double tap the reset button. +* Keycode in layout: Press the key mapped to QK_BOOT if it is available. + +## Making firmware + +Make example for this keyboard (after setting up your build environment): + + make dztech/tofu/ii:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/dztech/tofu/ii/v1/rules.mk b/keyboards/dztech/tofu/ii/v1/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c new file mode 100644 index 000000000000..c38c18244133 --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -0,0 +1,102 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#include "v1.h" + +#ifdef RGB_MATRIX_ENABLE + +const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { + { 1, K_12, J_12, L_12 }, + { 1, K_11, J_11, L_11 }, + { 1, K_10, J_10, L_10 }, + { 1, K_9, J_9, L_9 }, + { 1, K_8, J_8, L_8 }, + { 1, K_7, J_7, L_7 }, + { 1, K_6, J_6, L_6 }, + { 1, K_5, J_5, L_5 }, + { 1, K_4, J_4, L_4 }, + { 1, K_3, J_3, L_3 }, + { 1, K_2, J_2, L_2 }, + { 1, K_1, J_1, L_1 }, + { 1, H_1, G_1, I_1 }, + { 1, H_2, G_2, I_2 }, + { 1, H_3, G_3, I_3 }, + + { 0, B_12, A_12, C_12 }, + { 0, B_11, A_11, C_11 }, + { 0, B_10, A_10, C_10 }, + { 0, B_9, A_9, C_9 }, + { 0, B_8, A_8, C_8 }, + { 0, B_7, A_7, C_7 }, + { 0, B_6, A_6, C_6 }, + { 0, B_5, A_5, C_5 }, + { 0, B_4, A_4, C_4 }, + { 0, B_3, A_3, C_3 }, + { 0, B_2, A_2, C_2 }, + { 0, B_1, A_1, C_1 }, + { 1, H_6, G_6, I_6 }, + { 1, H_5, G_5, I_5 }, + { 1, H_4, G_4, I_4 }, + + { 0, E_12, D_12, F_12 }, + { 0, E_11, D_11, F_11 }, + { 0, E_10, D_10, F_10 }, + { 0, E_9, D_9, F_9 }, + { 0, E_8, D_8, F_8 }, + { 0, E_7, D_7, F_7 }, + { 0, E_6, D_6, F_6 }, + { 0, E_5, D_5, F_5 }, + { 0, E_4, D_4, F_4 }, + { 0, E_3, D_3, F_3 }, + { 0, E_2, D_2, F_2 }, + { 0, E_1, D_1, F_1 }, + { 1, H_7, G_7, I_7 }, + { 1, H_8, G_8, I_8 }, + + { 0, H_12, G_12, I_12 }, + { 0, H_11, G_11, I_11 }, + { 0, H_10, G_10, I_10 }, + { 0, H_9, G_9, I_9 }, + { 0, H_8, G_8, I_8 }, + { 0, H_7, G_7, I_7 }, + { 0, H_6, G_6, I_6 }, + { 0, H_5, G_5, I_5 }, + { 0, H_4, G_4, I_4 }, + { 0, H_3, G_3, I_3 }, + { 0, H_2, G_2, I_2 }, + { 0, H_1, G_1, I_1 }, + { 0, K_9, J_9, L_9 }, + + { 0, K_12, J_12, L_12 }, + { 0, K_11, J_11, L_11 }, + { 0, K_10, J_10, L_10 }, + { 0, K_7, J_7, L_7 }, + { 0, K_4, J_4, L_4 }, + { 0, K_2, J_2, L_2 }, + { 0, K_1, J_1, L_1 }, + { 0, K_6, J_6, L_6 }, + { 0, K_5, J_5, L_5 }, +}; + +__attribute__ ((weak)) +void rgb_matrix_indicators_user(void) +{ + if (host_keyboard_led_state().caps_lock) + { + rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); + } +} +#endif diff --git a/keyboards/dztech/tofu/ii/v1/v1.h b/keyboards/dztech/tofu/ii/v1/v1.h new file mode 100644 index 000000000000..63fdad1afe2d --- /dev/null +++ b/keyboards/dztech/tofu/ii/v1/v1.h @@ -0,0 +1,35 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +#define LAYOUT_all( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ + K40, K41, K42, K46, K48, K4A, K4C, K4D, K4E \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX }, \ + { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, XXX, K4C, K4D, K4E } \ +} From d9e91ba1e5f06d7b11f1f16626e2cdd9d3627c8a Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:26:47 +0800 Subject: [PATCH 02/21] Update keyboards/dztech/tofu/ii/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 2e396f919487..636655690111 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -29,16 +29,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), - [2] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [3] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; From 49cf20be5bdae1236b08e7adf4e4ce3b7a49432f Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:26:57 +0800 Subject: [PATCH 03/21] Update keyboards/dztech/tofu/ii/v1/info.json Co-authored-by: Joel Challis --- keyboards/dztech/tofu/ii/v1/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json index e5a70e886af2..26a314742160 100644 --- a/keyboards/dztech/tofu/ii/v1/info.json +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -15,10 +15,6 @@ "cols": ["GP25", "GP24", "GP23", "GP1", "GP7", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12"], "rows": ["GP29", "GP28", "GP27", "GP26", "GP22"] }, - "matrix_size": { - "cols": 15, - "rows": 5 - }, "processor": "RP2040", "rgb_matrix": { "driver": "IS31FL3737", From 2b8f76d649e6b8e39cbe91170bd4e80181cbe355 Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:27:23 +0800 Subject: [PATCH 04/21] Update keyboards/dztech/tofu/ii/v1/v1.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/v1/v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index c38c18244133..f1ebc4af727d 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -88,7 +88,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { { 0, K_2, J_2, L_2 }, { 0, K_1, J_1, L_1 }, { 0, K_6, J_6, L_6 }, - { 0, K_5, J_5, L_5 }, + { 0, K_5, J_5, L_5 }, }; __attribute__ ((weak)) From ade182d8722e30b6b1d6bacd32014c356f5bd474 Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:27:28 +0800 Subject: [PATCH 05/21] Update keyboards/dztech/tofu/ii/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index 2e396f919487..22cf47c7186c 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_GESC, 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, + QK_GESC, 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_BSLASH, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, From 9779d4534ed2bbb8ff4e6510edad63fd661ead11 Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:27:39 +0800 Subject: [PATCH 06/21] Update keyboards/dztech/tofu/ii/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index 22cf47c7186c..65a03bbbfe95 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( - KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, From 847bf515f54acbed94b7d73495ea43e9ab0e79fa Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:27:49 +0800 Subject: [PATCH 07/21] Update keyboards/dztech/tofu/ii/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index 65a03bbbfe95..fe569346099c 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, - KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN, + KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT_all( From 6a19d7db97af2277214f8150fc720fb60e01494b Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:27:57 +0800 Subject: [PATCH 08/21] Update keyboards/dztech/tofu/ii/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index fe569346099c..8e7f6117dc8f 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), From c224c40d8dab6a5441426e0481471bca50c02ffd Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:28:04 +0800 Subject: [PATCH 09/21] Update keyboards/dztech/tofu/ii/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 636655690111..ac78f5dc113b 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, - KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN, + KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), }; From 75fea4601a0d9f9366a5406868f5bf871175f371 Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:28:09 +0800 Subject: [PATCH 10/21] Update keyboards/dztech/tofu/ii/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index ac78f5dc113b..9842d6eb1150 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), From a19a791ae03f051a35788c7fa664d155bdcb5ee8 Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:28:16 +0800 Subject: [PATCH 11/21] Update keyboards/dztech/tofu/ii/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 9842d6eb1150..261945976c97 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( - KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, From dfbc2a215691e75493519c708c09508e12187e1f Mon Sep 17 00:00:00 2001 From: dztech Date: Mon, 21 Nov 2022 08:28:24 +0800 Subject: [PATCH 12/21] Update keyboards/dztech/tofu/ii/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 261945976c97..665e92068fc4 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_GESC, 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, + QK_GESC, 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_BSLASH, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, From e23b576635ed37a0897ffb08ed39ce8cfbef8f82 Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Mon, 21 Nov 2022 09:05:31 +0800 Subject: [PATCH 13/21] update --- keyboards/dztech/tofu/ii/ii.c | 17 -------- keyboards/dztech/tofu/ii/ii.h | 22 ---------- .../dztech/tofu/ii/keymaps/default/keymap.c | 4 +- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 8 ++-- keyboards/dztech/tofu/ii/v1/v1.c | 42 +++++++++---------- keyboards/dztech/tofu/ii/v1/v1.h | 35 ---------------- 6 files changed, 27 insertions(+), 101 deletions(-) delete mode 100644 keyboards/dztech/tofu/ii/ii.c delete mode 100644 keyboards/dztech/tofu/ii/ii.h delete mode 100644 keyboards/dztech/tofu/ii/v1/v1.h diff --git a/keyboards/dztech/tofu/ii/ii.c b/keyboards/dztech/tofu/ii/ii.c deleted file mode 100644 index 861cc5e04775..000000000000 --- a/keyboards/dztech/tofu/ii/ii.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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 . - */ - -#include "ii.h" diff --git a/keyboards/dztech/tofu/ii/ii.h b/keyboards/dztech/tofu/ii/ii.h deleted file mode 100644 index d3e2c46d274b..000000000000 --- a/keyboards/dztech/tofu/ii/ii.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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 . - */ - -#pragma once - -#ifdef KEYBOARD_dztech_tofu_ii_v1 - #include "v1.h" -#endif -#include "quantum.h" diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 665e92068fc4..4ef566799f2b 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -17,13 +17,13 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, 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_BSLASH, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), - [1] = LAYOUT_all( + [1] = LAYOUT( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index 8e7f6117dc8f..68ece8e4ad74 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -17,25 +17,25 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, 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_BSLASH, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), - [1] = LAYOUT_all( + [1] = LAYOUT( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), - [2] = LAYOUT_all( + [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [3] = LAYOUT_all( + [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index f1ebc4af727d..f6c744c82b21 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include "v1.h" + #include "is31fl3737.h" + #include "process_unicodemap.c" #ifdef RGB_MATRIX_ENABLE @@ -29,28 +29,28 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { { 1, K_5, J_5, L_5 }, { 1, K_4, J_4, L_4 }, { 1, K_3, J_3, L_3 }, - { 1, K_2, J_2, L_2 }, - { 1, K_1, J_1, L_1 }, - { 1, H_1, G_1, I_1 }, - { 1, H_2, G_2, I_2 }, + { 1, K_2, J_2, L_2 }, + { 1, K_1, J_1, L_1 }, + { 1, H_1, G_1, I_1 }, + { 1, H_2, G_2, I_2 }, { 1, H_3, G_3, I_3 }, - + { 0, B_12, A_12, C_12 }, - { 0, B_11, A_11, C_11 }, + { 0, B_11, A_11, C_11 }, { 0, B_10, A_10, C_10 }, - { 0, B_9, A_9, C_9 }, - { 0, B_8, A_8, C_8 }, + { 0, B_9, A_9, C_9 }, + { 0, B_8, A_8, C_8 }, { 0, B_7, A_7, C_7 }, { 0, B_6, A_6, C_6 }, { 0, B_5, A_5, C_5 }, { 0, B_4, A_4, C_4 }, { 0, B_3, A_3, C_3 }, { 0, B_2, A_2, C_2 }, - { 0, B_1, A_1, C_1 }, - { 1, H_6, G_6, I_6 }, - { 1, H_5, G_5, I_5 }, - { 1, H_4, G_4, I_4 }, - + { 0, B_1, A_1, C_1 }, + { 1, H_6, G_6, I_6 }, + { 1, H_5, G_5, I_5 }, + { 1, H_4, G_4, I_4 }, + { 0, E_12, D_12, F_12 }, { 0, E_11, D_11, F_11 }, { 0, E_10, D_10, F_10 }, @@ -62,10 +62,10 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { { 0, E_4, D_4, F_4 }, { 0, E_3, D_3, F_3 }, { 0, E_2, D_2, F_2 }, - { 0, E_1, D_1, F_1 }, - { 1, H_7, G_7, I_7 }, - { 1, H_8, G_8, I_8 }, - + { 0, E_1, D_1, F_1 }, + { 1, H_7, G_7, I_7 }, + { 1, H_8, G_8, I_8 }, + { 0, H_12, G_12, I_12 }, { 0, H_11, G_11, I_11 }, { 0, H_10, G_10, I_10 }, @@ -79,14 +79,14 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { { 0, H_2, G_2, I_2 }, { 0, H_1, G_1, I_1 }, { 0, K_9, J_9, L_9 }, - + { 0, K_12, J_12, L_12 }, { 0, K_11, J_11, L_11 }, { 0, K_10, J_10, L_10 }, { 0, K_7, J_7, L_7 }, { 0, K_4, J_4, L_4 }, { 0, K_2, J_2, L_2 }, - { 0, K_1, J_1, L_1 }, + { 0, K_1, J_1, L_1 }, { 0, K_6, J_6, L_6 }, { 0, K_5, J_5, L_5 }, }; diff --git a/keyboards/dztech/tofu/ii/v1/v1.h b/keyboards/dztech/tofu/ii/v1/v1.h deleted file mode 100644 index 63fdad1afe2d..000000000000 --- a/keyboards/dztech/tofu/ii/v1/v1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K46, K48, K4A, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX }, \ - { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, XXX, K4C, K4D, K4E } \ -} From 55035d1b9769172133a18fc55895e6e4feff5e99 Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Mon, 21 Nov 2022 09:14:12 +0800 Subject: [PATCH 14/21] Update info.json --- keyboards/dztech/tofu/ii/v1/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json index 26a314742160..e703827ac707 100644 --- a/keyboards/dztech/tofu/ii/v1/info.json +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -93,7 +93,7 @@ "vid": "0x445A" }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, From a961ed99dc7c1a839f27f6182b6d8d1655e13ef0 Mon Sep 17 00:00:00 2001 From: dztech Date: Tue, 22 Nov 2022 10:27:17 +0800 Subject: [PATCH 15/21] Update keyboards/dztech/tofu/ii/v1/v1.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/v1/v1.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index f6c744c82b21..55f8e3fcc88f 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include "is31fl3737.h" - #include "process_unicodemap.c" #ifdef RGB_MATRIX_ENABLE From 41bd6e5f9a07d4d95f0bd75da670ce405a61d79f Mon Sep 17 00:00:00 2001 From: dztech Date: Tue, 22 Nov 2022 20:18:41 +0800 Subject: [PATCH 16/21] Update keyboards/dztech/tofu/ii/v1/v1.c Co-authored-by: Ryan --- keyboards/dztech/tofu/ii/v1/v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index 55f8e3fcc88f..aa21e769dc94 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "is31fl3737.h" + #include "quantum.h" #ifdef RGB_MATRIX_ENABLE From 82e92ef9cb983df520196f9fa72d2c2411b1024e Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Mon, 28 Nov 2022 09:13:29 +0800 Subject: [PATCH 17/21] Update v1.c --- keyboards/dztech/tofu/ii/v1/v1.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index aa21e769dc94..77f52ae7712e 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -91,11 +91,13 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { }; __attribute__ ((weak)) -void rgb_matrix_indicators_user(void) -{ - if (host_keyboard_led_state().caps_lock) - { +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); } } + #endif From 4d1be2a4335e561e09a51e629beb64a46ef0f753 Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Mon, 28 Nov 2022 14:21:32 +0800 Subject: [PATCH 18/21] Update v1.c --- keyboards/dztech/tofu/ii/v1/v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index 77f52ae7712e..e66cae262dab 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -90,7 +90,6 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { { 0, K_5, J_5, L_5 }, }; -__attribute__ ((weak)) bool rgb_matrix_indicators_kb(void) { if (!rgb_matrix_indicators_user()) { return false; @@ -98,6 +97,7 @@ bool rgb_matrix_indicators_kb(void) { if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); } + return true; } #endif From 487894330e0d1ddd032cb59a89380adc3374f6c2 Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Tue, 29 Nov 2022 20:07:46 +0800 Subject: [PATCH 19/21] update --- keyboards/dztech/tofu/ii/v1/config.h | 4 ++-- keyboards/dztech/tofu/ii/v1/v1.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/dztech/tofu/ii/v1/config.h b/keyboards/dztech/tofu/ii/v1/config.h index a0c1240cdd89..6343bb9e9dff 100644 --- a/keyboards/dztech/tofu/ii/v1/config.h +++ b/keyboards/dztech/tofu/ii/v1/config.h @@ -78,11 +78,11 @@ # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL # define DRIVER_ADDR_1 0b1010000 # define DRIVER_ADDR_2 0b1011111 # define DRIVER_COUNT 2 # define DRIVER_1_LED_TOTAL 46 # define DRIVER_2_LED_TOTAL 20 -# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) #endif diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c index e66cae262dab..bb15f3d4a13b 100644 --- a/keyboards/dztech/tofu/ii/v1/v1.c +++ b/keyboards/dztech/tofu/ii/v1/v1.c @@ -17,7 +17,7 @@ #ifdef RGB_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { { 1, K_12, J_12, L_12 }, { 1, K_11, J_11, L_11 }, { 1, K_10, J_10, L_10 }, From f3b34391b90b7e511b03b2857cb696e1fc862b4b Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Tue, 29 Nov 2022 20:29:49 +0800 Subject: [PATCH 20/21] fix keycode bsls --- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 2 +- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 4ef566799f2b..0acfb4df9e7c 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( QK_GESC, 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_BSLASH, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index 68ece8e4ad74..35b8e6fe937b 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( QK_GESC, 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_BSLASH, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), From 7a6ec166f0280a6d440996277891770ba118f68d Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Wed, 7 Dec 2022 13:14:54 +0800 Subject: [PATCH 21/21] Fix row pins --- keyboards/dztech/tofu/ii/v1/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json index e703827ac707..633badfa1548 100644 --- a/keyboards/dztech/tofu/ii/v1/info.json +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -13,7 +13,7 @@ }, "matrix_pins": { "cols": ["GP25", "GP24", "GP23", "GP1", "GP7", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12"], - "rows": ["GP29", "GP28", "GP27", "GP26", "GP22"] + "rows": ["GP0", "GP28", "GP27", "GP26", "GP22"] }, "processor": "RP2040", "rgb_matrix": {