From 78fbe93adb9f9c754f6533d48558dfcab425ad3f Mon Sep 17 00:00:00 2001 From: zzhujf <1240893074@qq.com> Date: Mon, 25 Dec 2023 11:07:46 +0800 Subject: [PATCH 01/24] theone --- keyboards/theone/config.h | 72 +++++++++++++ keyboards/theone/info.json | 126 ++++++++++++++++++++++ keyboards/theone/keymaps/default/keymap.c | 39 +++++++ keyboards/theone/keymaps/via/keymap.c | 39 +++++++ keyboards/theone/keymaps/via/rules.mk | 1 + 5 files changed, 277 insertions(+) create mode 100644 keyboards/theone/config.h create mode 100644 keyboards/theone/info.json create mode 100644 keyboards/theone/keymaps/default/keymap.c create mode 100644 keyboards/theone/keymaps/via/keymap.c create mode 100644 keyboards/theone/keymaps/via/rules.mk diff --git a/keyboards/theone/config.h b/keyboards/theone/config.h new file mode 100644 index 000000000000..6f760afdd347 --- /dev/null +++ b/keyboards/theone/config.h @@ -0,0 +1,72 @@ +// Copyright 2023 Persama (@Persama) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 // This is 4 by default. + +#define EECONFIG_USER_DATA_SIZE 8 // This is the size of the EEPROM for the custom VIA-specific data + +#define RGB_MATRIX_LED_COUNT 89 + +#define RGB_MATRIX_CENTER \ + { \ + 112, 30 \ + } +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 +#define RGB_MATRIX_VAL_STEP 26 +#define RGB_MATRIX_SPD_STEP 52 + +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set +#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended + +// 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 // Enables RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Enables RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Enables RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Enables RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Enables RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON // Enables RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Enables RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enables RGB_MATRIX_RAINBOW_PINWHEELS +#define ENABLE_RGB_MATRIX_RAINDROPS // Enables RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Enables RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_HUE_BREATHING // Enables RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM // Enables RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_HUE_WAVE // Enables RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Enables RGB_MATRIX_PIXEL_FRACTAL +#define ENABLE_RGB_MATRIX_PIXEL_FLOW // Enables RGB_MATRIX_PIXEL_FLOW +#define ENABLE_RGB_MATRIX_PIXEL_RAIN // Enables RGB_MATRIX_PIXEL_RAIN + +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation + +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_KEYRELEASES +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out +#define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out +#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out +#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json new file mode 100644 index 000000000000..706dd779a347 --- /dev/null +++ b/keyboards/theone/info.json @@ -0,0 +1,126 @@ +{ + "keyboard_name": "NuPhy Krypton75", + "manufacturer": "github.com/sowbug", + "usb":{ + "vid": "0x19F5", + "pid": "0x3245", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "key_lock": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"], + "rows": ["C14", "C15", "A0", "A1", "A2", "A3"] + }, + "diode_direction": "COL2ROW", + "rgb_matrix": { + "driver": "WS2812" + }, + "ws2812": { + "pin": "B9" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "Ins", "matrix": [1, 14], "x": 15.2, "y": 0}, + + {"label": "~`", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "!1", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "@2", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "#3", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "$4", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "%5", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "^6", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "&7", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "*8", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "(9", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": ")0", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "_-", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "+=", "matrix": [1, 12], "x": 12, "y": 1}, + {"label": "Backsp", "matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"label": "Del", "matrix": [2, 14], "x": 15.2, "y": 1}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2}, + {"label": "{[", "matrix": [2, 11], "x": 11.5, "y": 2}, + {"label": "}]", "matrix": [2, 12], "x": 12.5, "y": 2}, + {"label": "|\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "PageUp", "matrix": [1, 16], "x": 15.2, "y": 2}, + + {"label": "Caps", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3}, + {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"label": "PageDn", "matrix": [2, 16], "x": 15.2, "y": 3}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4}, + {"label": "<,", "matrix": [4, 9], "x": 9.25, "y": 4}, + {"label": ">.", "matrix": [4, 10], "x": 10.25, "y": 4}, + {"label": "?/", "matrix": [4, 11], "x": 11.25, "y": 4}, + {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "↑", "matrix": [4, 14], "x": 14.2, "y": 4.2}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"label": "Opt", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"label": "Cmd", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"label": "Cmd", "matrix": [5, 9], "x": 10, "y": 5}, + {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5}, + {"label": "Ctrl", "matrix": [5, 12], "x": 12, "y": 5}, + {"label": "←", "matrix": [5, 13], "x": 13.2, "y": 5.2}, + {"label": "↓", "matrix": [5, 14], "x": 14.2, "y": 5.2}, + {"label": "→", "matrix": [5, 15], "x": 15.2, "y": 5.2} + + ] + } + } +} + diff --git a/keyboards/theone/keymaps/default/keymap.c b/keyboards/theone/keymaps/default/keymap.c new file mode 100644 index 000000000000..224b87338af0 --- /dev/null +++ b/keyboards/theone/keymaps/default/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 Persama (@Persama) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +// layer Mac +[0] = LAYOUT( + KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +// layer Mac Fn +[1] = LAYOUT( + _______, 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_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +// layer win +[2] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +// layer win Fn +[3] = LAYOUT( + _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/theone/keymaps/via/keymap.c b/keyboards/theone/keymaps/via/keymap.c new file mode 100644 index 000000000000..224b87338af0 --- /dev/null +++ b/keyboards/theone/keymaps/via/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 Persama (@Persama) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +// layer Mac +[0] = LAYOUT( + KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +// layer Mac Fn +[1] = LAYOUT( + _______, 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_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +// layer win +[2] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +// layer win Fn +[3] = LAYOUT( + _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/theone/keymaps/via/rules.mk b/keyboards/theone/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/theone/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 5c1c1734c4f929863da232719b79e01c93fece9b Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:57:51 +0800 Subject: [PATCH 02/24] Update info.json --- keyboards/theone/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 706dd779a347..d1828ea9c32c 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "NuPhy Krypton75", + "keyboard_name": "Theone", "manufacturer": "github.com/sowbug", "usb":{ "vid": "0x19F5", From 5689fb42afd01c8a8a98d8f4bd786ebeacb96e59 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:54:01 +0800 Subject: [PATCH 03/24] Update info.json Adding RGB Matrix configuration in info.json --- keyboards/theone/info.json | 90 +++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index d1828ea9c32c..7c3aa907efdb 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -22,7 +22,95 @@ }, "diode_direction": "COL2ROW", "rgb_matrix": { - "driver": "WS2812" + "driver": "WS2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 40, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 50, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 75, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 85, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 95, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 120, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 130, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4}, + {"matrix": [1, 14], "x": 152, "y": 0, "flags": 4}, + + {"matrix": [2, 14], "x": 152, "y": 10, "flags": 4}, + {"matrix": [1, 13], "x": 130, "y": 10, "flags": 4}, + {"matrix": [1, 12], "x": 120, "y": 10, "flags": 4}, + {"matrix": [1, 11], "x": 110, "y": 10, "flags": 4}, + {"matrix": [1, 10], "x": 100, "y": 10, "flags": 4}, + {"matrix": [1, 9], "x": 90, "y": 10, "flags": 4}, + {"matrix": [1, 8], "x": 80, "y": 10, "flags": 4}, + {"matrix": [1, 7], "x": 70, "y": 10, "flags": 4}, + {"matrix": [1, 6], "x": 60, "y": 10, "flags": 4}, + {"matrix": [1, 5], "x": 50, "y": 10, "flags": 4}, + {"matrix": [1, 4], "x": 40, "y": 10, "flags": 4}, + {"matrix": [1, 3], "x": 30, "y": 10, "flags": 4}, + {"matrix": [1, 2], "x": 20, "y": 10, "flags": 4}, + {"matrix": [1, 1], "x": 10, "y": 10, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 10, "flags": 4}, + + {"matrix": [2, 0], "x": 0, "y": 20, "flags": 4}, + {"matrix": [2, 1], "x": 15, "y": 20, "flags": 4}, + {"matrix": [2, 2], "x": 25, "y": 20, "flags": 4}, + {"matrix": [2, 3], "x": 35, "y": 20, "flags": 4}, + {"matrix": [2, 4], "x": 45, "y": 20, "flags": 4}, + {"matrix": [2, 5], "x": 55, "y": 20, "flags": 4}, + {"matrix": [2, 6], "x": 65, "y": 20, "flags": 4}, + {"matrix": [2, 7], "x": 75, "y": 20, "flags": 4}, + {"matrix": [2, 8], "x": 85, "y": 20, "flags": 4}, + {"matrix": [2, 9], "x": 95, "y": 20, "flags": 4}, + {"matrix": [2, 10], "x": 105, "y": 20, "flags": 4}, + {"matrix": [2, 11], "x": 115, "y": 20, "flags": 4}, + {"matrix": [2, 12], "x": 125, "y": 20, "flags": 4}, + {"matrix": [2, 13], "x": 135, "y": 20, "flags": 4}, + {"matrix": [2, 16], "x": 152, "y": 20, "flags": 4}, + + {"matrix": [2, 16], "x": 152, "y": 30, "flags": 4}, + {"matrix": [3, 13], "x": 127.5, "y": 30, "flags": 4}, + {"matrix": [3, 11], "x": 117.5, "y": 30, "flags": 4}, + {"matrix": [3, 10], "x": 107.5, "y": 30, "flags": 4}, + {"matrix": [3, 9], "x": 97.5, "y": 30, "flags": 4}, + {"matrix": [3, 8], "x": 87.5, "y": 30, "flags": 4}, + {"matrix": [3, 7], "x": 77.5, "y": 30, "flags": 4}, + {"matrix": [3, 6], "x": 67.5, "y": 30, "flags": 4}, + {"matrix": [3, 5], "x": 57.5, "y": 30, "flags": 4}, + {"matrix": [3, 4], "x": 47.5, "y": 30, "flags": 4}, + {"matrix": [3, 3], "x": 37.5, "y": 30, "flags": 4}, + {"matrix": [3, 2], "x": 27.5, "y": 30, "flags": 4}, + {"matrix": [3, 1], "x": 17.5, "y": 30, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 30, "flags": 4}, + + {"matrix": [4, 0], "x": 0, "y": 40, "flags": 4}, + {"matrix": [4, 2], "x": 22.5, "y": 40, "flags": 4}, + {"matrix": [4, 3], "x": 32.5, "y": 40, "flags": 4}, + {"matrix": [4, 4], "x": 42.5, "y": 40, "flags": 4}, + {"matrix": [4, 5], "x": 52.5, "y": 40, "flags": 4}, + {"matrix": [4, 6], "x": 62.5, "y": 40, "flags": 4}, + {"matrix": [4, 7], "x": 72.5, "y": 40, "flags": 4}, + {"matrix": [4, 8], "x": 82.5, "y": 40, "flags": 4}, + {"matrix": [4, 9], "x": 92.5, "y": 40, "flags": 4}, + {"matrix": [4, 10], "x": 102.5, "y": 40, "flags": 4}, + {"matrix": [4, 11], "x": 112.5, "y": 40, "flags": 4}, + {"matrix": [4, 13], "x": 122.5, "y": 40, "flags": 4}, + {"matrix": [4, 14], "x": 142, "y": 40, "flags": 4}, + + {"matrix": [5, 15], "x": 152, "y": 50, "flags": 4}, + {"matrix": [5, 14], "x": 142, "y": 50, "flags": 4}, + {"matrix": [5, 13], "x": 132, "y": 50, "flags": 4}, + {"matrix": [5, 12], "x": 120, "y": 50, "flags": 4}, + {"matrix": [5, 10], "x": 110, "y": 50, "flags": 4}, + {"matrix": [5, 9], "x": 100, "y": 50, "flags": 4}, + {"matrix": [5, 6], "x": 37.5, "y": 50, "flags": 4}, + {"matrix": [5, 2], "x": 25, "y": 50, "flags": 4}, + {"matrix": [5, 1], "x": 12.5, "y": 50, "flags": 4}, + {"matrix": [5, 0], "x": 0, "y": 50, "flags": 4} + ] }, "ws2812": { "pin": "B9" From ce8bf036b69d076fd4a82ea2119acbc368ca1652 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:56:17 +0800 Subject: [PATCH 04/24] Update info.json --- keyboards/theone/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 7c3aa907efdb..42c51cf50670 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -69,7 +69,7 @@ {"matrix": [2, 11], "x": 115, "y": 20, "flags": 4}, {"matrix": [2, 12], "x": 125, "y": 20, "flags": 4}, {"matrix": [2, 13], "x": 135, "y": 20, "flags": 4}, - {"matrix": [2, 16], "x": 152, "y": 20, "flags": 4}, + {"matrix": [1, 16], "x": 152, "y": 20, "flags": 4}, {"matrix": [2, 16], "x": 152, "y": 30, "flags": 4}, {"matrix": [3, 13], "x": 127.5, "y": 30, "flags": 4}, From d43845b065cf4a8268ecc1daf8d4f363a20d0f9b Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:14:03 +0800 Subject: [PATCH 05/24] Update info.json --- keyboards/theone/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 42c51cf50670..83b15f62be59 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -98,11 +98,11 @@ {"matrix": [4, 10], "x": 102.5, "y": 40, "flags": 4}, {"matrix": [4, 11], "x": 112.5, "y": 40, "flags": 4}, {"matrix": [4, 13], "x": 122.5, "y": 40, "flags": 4}, - {"matrix": [4, 14], "x": 142, "y": 40, "flags": 4}, + {"matrix": [4, 14], "x": 142, "y": 42, "flags": 4}, - {"matrix": [5, 15], "x": 152, "y": 50, "flags": 4}, - {"matrix": [5, 14], "x": 142, "y": 50, "flags": 4}, - {"matrix": [5, 13], "x": 132, "y": 50, "flags": 4}, + {"matrix": [5, 15], "x": 152, "y": 52, "flags": 4}, + {"matrix": [5, 14], "x": 142, "y": 52, "flags": 4}, + {"matrix": [5, 13], "x": 132, "y": 52, "flags": 4}, {"matrix": [5, 12], "x": 120, "y": 50, "flags": 4}, {"matrix": [5, 10], "x": 110, "y": 50, "flags": 4}, {"matrix": [5, 9], "x": 100, "y": 50, "flags": 4}, From a7d59b8ad20bc43b4de3bce75a190d7c7e2d6ef6 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:30:20 +0800 Subject: [PATCH 06/24] Update keymap.c --- keyboards/theone/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/theone/keymaps/default/keymap.c b/keyboards/theone/keymaps/default/keymap.c index 224b87338af0..7e7b0cde0e28 100644 --- a/keyboards/theone/keymaps/default/keymap.c +++ b/keyboards/theone/keymaps/default/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // layer Mac [0] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, 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, From 21b14e629f14b74575b227790f9588b06de45bd0 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:33:56 +0800 Subject: [PATCH 07/24] Update config.h --- keyboards/theone/config.h | 58 --------------------------------------- 1 file changed, 58 deletions(-) diff --git a/keyboards/theone/config.h b/keyboards/theone/config.h index 6f760afdd347..e7707fc2ebd0 100644 --- a/keyboards/theone/config.h +++ b/keyboards/theone/config.h @@ -8,65 +8,7 @@ #define RGB_MATRIX_LED_COUNT 89 -#define RGB_MATRIX_CENTER \ - { \ - 112, 30 \ - } -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 -#define RGB_MATRIX_VAL_STEP 26 -#define RGB_MATRIX_SPD_STEP 52 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -// 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 // Enables RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Enables RGB_MATRIX_CYCLE_OUT_IN -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Enables RGB_MATRIX_CYCLE_OUT_IN_DUAL -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Enables RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Enables RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON // Enables RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Enables RGB_MATRIX_RAINBOW_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enables RGB_MATRIX_RAINBOW_PINWHEELS -#define ENABLE_RGB_MATRIX_RAINDROPS // Enables RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Enables RGB_MATRIX_JELLYBEAN_RAINDROPS -#define ENABLE_RGB_MATRIX_HUE_BREATHING // Enables RGB_MATRIX_HUE_BREATHING -#define ENABLE_RGB_MATRIX_HUE_PENDULUM // Enables RGB_MATRIX_HUE_PENDULUM -#define ENABLE_RGB_MATRIX_HUE_WAVE // Enables RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Enables RGB_MATRIX_PIXEL_FRACTAL -#define ENABLE_RGB_MATRIX_PIXEL_FLOW // Enables RGB_MATRIX_PIXEL_FLOW -#define ENABLE_RGB_MATRIX_PIXEL_RAIN // Enables RGB_MATRIX_PIXEL_RAIN - -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation - -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_KEYRELEASES -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out -#define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out -#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out -#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out From 8d55b3d78e897b9efcb12d7cd25ba757ff398159 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:35:04 +0800 Subject: [PATCH 08/24] Update info.json --- keyboards/theone/info.json | 49 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 83b15f62be59..5ddd93905852 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -23,6 +23,55 @@ "diode_direction": "COL2ROW", "rgb_matrix": { "driver": "WS2812", + "center_point": [112, 30], + "max_brightness": 130, + "val_steps": 26, + "speed_steps": 52, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_fractal": true, + "pixel_flow": true, + "pixel_rain": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, "layout": [ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4}, From faae00985dfef239c76d45768998203e13e88355 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:02:06 +0800 Subject: [PATCH 09/24] Create rules.mk --- keyboards/theone/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/theone/rules.mk diff --git a/keyboards/theone/rules.mk b/keyboards/theone/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/theone/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 29388affae38a37a40f9454608b116bc4c1e2a54 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:20:59 +0800 Subject: [PATCH 10/24] Update info.json --- keyboards/theone/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 5ddd93905852..1bc115dc225c 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -22,7 +22,7 @@ }, "diode_direction": "COL2ROW", "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "center_point": [112, 30], "max_brightness": 130, "val_steps": 26, From ae0187e1d637b6a29eec41b319be513e665ce9ab Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:49:56 +0800 Subject: [PATCH 11/24] Update info.json Running qmk format-json on this file --- keyboards/theone/info.json | 148 +++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 80 deletions(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 1bc115dc225c..a944e44bb22c 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -1,78 +1,72 @@ { - "keyboard_name": "Theone", "manufacturer": "github.com/sowbug", - "usb":{ - "vid": "0x19F5", - "pid": "0x3245", - "device_version": "0.0.1" - }, + "keyboard_name": "Theone", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, "command": false, - "nkro": true, + "console": false, + "extrakey": true, "key_lock": true, + "mousekey": true, + "nkro": true, "rgb_matrix": true }, "matrix_pins": { "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"], "rows": ["C14", "C15", "A0", "A1", "A2", "A3"] }, - "diode_direction": "COL2ROW", + "processor": "STM32F072", "rgb_matrix": { - "driver": "ws2812", - "center_point": [112, 30], - "max_brightness": 130, - "val_steps": 26, - "speed_steps": 52, - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_fractal": true, - "pixel_flow": true, - "pixel_rain": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true }, - "layout": [ + "center_point": [112, 30], + "driver": "ws2812", + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4}, {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, @@ -87,7 +81,6 @@ {"matrix": [0, 11], "x": 130, "y": 0, "flags": 4}, {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4}, {"matrix": [1, 14], "x": 152, "y": 0, "flags": 4}, - {"matrix": [2, 14], "x": 152, "y": 10, "flags": 4}, {"matrix": [1, 13], "x": 130, "y": 10, "flags": 4}, {"matrix": [1, 12], "x": 120, "y": 10, "flags": 4}, @@ -103,7 +96,6 @@ {"matrix": [1, 2], "x": 20, "y": 10, "flags": 4}, {"matrix": [1, 1], "x": 10, "y": 10, "flags": 4}, {"matrix": [1, 0], "x": 0, "y": 10, "flags": 4}, - {"matrix": [2, 0], "x": 0, "y": 20, "flags": 4}, {"matrix": [2, 1], "x": 15, "y": 20, "flags": 4}, {"matrix": [2, 2], "x": 25, "y": 20, "flags": 4}, @@ -119,7 +111,6 @@ {"matrix": [2, 12], "x": 125, "y": 20, "flags": 4}, {"matrix": [2, 13], "x": 135, "y": 20, "flags": 4}, {"matrix": [1, 16], "x": 152, "y": 20, "flags": 4}, - {"matrix": [2, 16], "x": 152, "y": 30, "flags": 4}, {"matrix": [3, 13], "x": 127.5, "y": 30, "flags": 4}, {"matrix": [3, 11], "x": 117.5, "y": 30, "flags": 4}, @@ -134,7 +125,6 @@ {"matrix": [3, 2], "x": 27.5, "y": 30, "flags": 4}, {"matrix": [3, 1], "x": 17.5, "y": 30, "flags": 4}, {"matrix": [3, 0], "x": 0, "y": 30, "flags": 4}, - {"matrix": [4, 0], "x": 0, "y": 40, "flags": 4}, {"matrix": [4, 2], "x": 22.5, "y": 40, "flags": 4}, {"matrix": [4, 3], "x": 32.5, "y": 40, "flags": 4}, @@ -148,7 +138,6 @@ {"matrix": [4, 11], "x": 112.5, "y": 40, "flags": 4}, {"matrix": [4, 13], "x": 122.5, "y": 40, "flags": 4}, {"matrix": [4, 14], "x": 142, "y": 42, "flags": 4}, - {"matrix": [5, 15], "x": 152, "y": 52, "flags": 4}, {"matrix": [5, 14], "x": 142, "y": 52, "flags": 4}, {"matrix": [5, 13], "x": 132, "y": 52, "flags": 4}, @@ -159,13 +148,19 @@ {"matrix": [5, 2], "x": 25, "y": 50, "flags": 4}, {"matrix": [5, 1], "x": 12.5, "y": 50, "flags": 4}, {"matrix": [5, 0], "x": 0, "y": 50, "flags": 4} - ] + ], + "max_brightness": 130, + "speed_steps": 52, + "val_steps": 26 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x3245", + "vid": "0x19F5" }, "ws2812": { "pin": "B9" }, - "processor": "STM32F072", - "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ @@ -183,7 +178,6 @@ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, {"label": "Ins", "matrix": [1, 14], "x": 15.2, "y": 0}, - {"label": "~`", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "!1", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "@2", "matrix": [1, 2], "x": 2, "y": 1}, @@ -199,7 +193,6 @@ {"label": "+=", "matrix": [1, 12], "x": 12, "y": 1}, {"label": "Backsp", "matrix": [1, 13], "x": 13, "y": 1, "w": 2}, {"label": "Del", "matrix": [2, 14], "x": 15.2, "y": 1}, - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, @@ -215,7 +208,6 @@ {"label": "}]", "matrix": [2, 12], "x": 12.5, "y": 2}, {"label": "|\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, {"label": "PageUp", "matrix": [1, 16], "x": 15.2, "y": 2}, - {"label": "Caps", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, @@ -230,7 +222,6 @@ {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3}, {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, {"label": "PageDn", "matrix": [2, 16], "x": 15.2, "y": 3}, - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4}, {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4}, @@ -243,8 +234,7 @@ {"label": ">.", "matrix": [4, 10], "x": 10.25, "y": 4}, {"label": "?/", "matrix": [4, 11], "x": 11.25, "y": 4}, {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, - {"label": "↑", "matrix": [4, 14], "x": 14.2, "y": 4.2}, - + {"label": "\u2191", "matrix": [4, 14], "x": 14.2, "y": 4.2}, {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, {"label": "Opt", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, {"label": "Cmd", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, @@ -252,12 +242,10 @@ {"label": "Cmd", "matrix": [5, 9], "x": 10, "y": 5}, {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5}, {"label": "Ctrl", "matrix": [5, 12], "x": 12, "y": 5}, - {"label": "←", "matrix": [5, 13], "x": 13.2, "y": 5.2}, - {"label": "↓", "matrix": [5, 14], "x": 14.2, "y": 5.2}, - {"label": "→", "matrix": [5, 15], "x": 15.2, "y": 5.2} - + {"label": "\u2190", "matrix": [5, 13], "x": 13.2, "y": 5.2}, + {"label": "\u2193", "matrix": [5, 14], "x": 14.2, "y": 5.2}, + {"label": "\u2192", "matrix": [5, 15], "x": 15.2, "y": 5.2} ] } } } - From a90b55eeeee30b314c473baf3d97bade19367459 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:41:58 +0800 Subject: [PATCH 12/24] Update keyboards/theone/info.json Co-authored-by: Drashna Jaelre --- keyboards/theone/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index a944e44bb22c..df782404c314 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -3,6 +3,9 @@ "keyboard_name": "Theone", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 8 + }, "features": { "bootmagic": true, "command": false, From 8ee1e13320c683de77ed117011bc3c306c00c69b Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:42:45 +0800 Subject: [PATCH 13/24] Update keyboards/theone/info.json Co-authored-by: Drashna Jaelre --- keyboards/theone/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index df782404c314..25e5ec57d1bd 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -153,6 +153,7 @@ {"matrix": [5, 0], "x": 0, "y": 50, "flags": 4} ], "max_brightness": 130, + "sleep": true, "speed_steps": 52, "val_steps": 26 }, From 6c6749dd52d43be84fa8dda4fc5072fdcddc21ce Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:44:36 +0800 Subject: [PATCH 14/24] Update keyboards/theone/config.h Co-authored-by: Drashna Jaelre --- keyboards/theone/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/theone/config.h b/keyboards/theone/config.h index e7707fc2ebd0..4efbcec957d7 100644 --- a/keyboards/theone/config.h +++ b/keyboards/theone/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 8 // This is 4 by default. #define EECONFIG_USER_DATA_SIZE 8 // This is the size of the EEPROM for the custom VIA-specific data From 3cebe78c4b55130539c9df6765fa8ff9613645db Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:45:02 +0800 Subject: [PATCH 15/24] Update keyboards/theone/config.h Co-authored-by: Drashna Jaelre --- keyboards/theone/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/theone/config.h b/keyboards/theone/config.h index 4efbcec957d7..fe88fb0265be 100644 --- a/keyboards/theone/config.h +++ b/keyboards/theone/config.h @@ -8,6 +8,4 @@ #define RGB_MATRIX_LED_COUNT 89 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended From 85efe6f409d64ba6a6d980446f81288604deb0a2 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:57:10 +0800 Subject: [PATCH 16/24] Update info.json --- keyboards/theone/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index 25e5ec57d1bd..f383582ef28d 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -159,8 +159,8 @@ }, "usb": { "device_version": "0.0.1", - "pid": "0x3245", - "vid": "0x19F5" + "pid": "0x3249", + "vid": "0x49F5" }, "ws2812": { "pin": "B9" From cf90942a365b22764f134ab13af9f76a14c632bf Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 11:36:01 +0800 Subject: [PATCH 17/24] Update keymap.c Replace all of the tabs with spaces. --- keyboards/theone/keymaps/default/keymap.c | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/theone/keymaps/default/keymap.c b/keyboards/theone/keymaps/default/keymap.c index 7e7b0cde0e28..cdbf34c3d4f6 100644 --- a/keyboards/theone/keymaps/default/keymap.c +++ b/keyboards/theone/keymaps/default/keymap.c @@ -6,34 +6,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // layer Mac [0] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, - 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // layer Mac Fn [1] = LAYOUT( - _______, 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_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + _______, 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_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), // layer win [2] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // layer win Fn [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; From 885dfcd96b877390a4f9f35fe0e3113f2c2505d9 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Mon, 15 Jan 2024 11:37:58 +0800 Subject: [PATCH 18/24] Update keymap.c Replace all of the tabs with spaces. --- keyboards/theone/keymaps/via/keymap.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/theone/keymaps/via/keymap.c b/keyboards/theone/keymaps/via/keymap.c index 224b87338af0..cdbf34c3d4f6 100644 --- a/keyboards/theone/keymaps/via/keymap.c +++ b/keyboards/theone/keymaps/via/keymap.c @@ -6,34 +6,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // layer Mac [0] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, - 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // layer Mac Fn [1] = LAYOUT( - _______, 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_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + _______, 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_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), // layer win [2] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // layer win Fn [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; From e8eec1a6d02adb792ac39e0ff53bd6ea550996f1 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:15:00 +0800 Subject: [PATCH 19/24] Update keyboards/theone/info.json Co-authored-by: Joel Challis --- keyboards/theone/info.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json index f383582ef28d..0f1d8e021ccf 100644 --- a/keyboards/theone/info.json +++ b/keyboards/theone/info.json @@ -153,9 +153,7 @@ {"matrix": [5, 0], "x": 0, "y": 50, "flags": 4} ], "max_brightness": 130, - "sleep": true, - "speed_steps": 52, - "val_steps": 26 + "sleep": true }, "usb": { "device_version": "0.0.1", From b55b37cdcb2ad8fb6360e09a1f2eb42fd14b1395 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:47:11 +0800 Subject: [PATCH 20/24] Update config.h --- keyboards/theone/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/theone/config.h b/keyboards/theone/config.h index fe88fb0265be..71a38bc42cc3 100644 --- a/keyboards/theone/config.h +++ b/keyboards/theone/config.h @@ -3,9 +3,7 @@ #pragma once -#define EECONFIG_USER_DATA_SIZE 8 // This is the size of the EEPROM for the custom VIA-specific data -#define RGB_MATRIX_LED_COUNT 89 From 2f9a2df6dee897c128e2b9131f32c79c7398edbf Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:30:29 +0800 Subject: [PATCH 21/24] Update keymap.c --- keyboards/theone/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/theone/keymaps/default/keymap.c b/keyboards/theone/keymaps/default/keymap.c index cdbf34c3d4f6..cd8f8a51311c 100644 --- a/keyboards/theone/keymaps/default/keymap.c +++ b/keyboards/theone/keymaps/default/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // layer Mac [0] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, 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, From 91c85771e7d98264ad6b58f210c7efa308b835f5 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:31:32 +0800 Subject: [PATCH 22/24] Update keymap.c --- keyboards/theone/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/theone/keymaps/via/keymap.c b/keyboards/theone/keymaps/via/keymap.c index cdbf34c3d4f6..cd8f8a51311c 100644 --- a/keyboards/theone/keymaps/via/keymap.c +++ b/keyboards/theone/keymaps/via/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // layer Mac [0] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_PGDN, 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, From 97afb54dc71f3c7ef9754760781dda61fb486204 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:39:40 +0800 Subject: [PATCH 23/24] Create readme.md --- keyboards/theone/readme.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 keyboards/theone/readme.md diff --git a/keyboards/theone/readme.md b/keyboards/theone/readme.md new file mode 100644 index 000000000000..1993bc245053 --- /dev/null +++ b/keyboards/theone/readme.md @@ -0,0 +1,23 @@ +# theone + + *theone is a standard 81 key keyboard.* + + * Keyboard Maintainer: [txdyqiang] + * Hardware Supported: theone PCB + * Hardware Availability: Private + + Make example for this keyboard (after setting up your build environment): + + make theone:default + + Flashing example for this keyboard: + + make theone: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 one way: + + * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard From 4460db8d458688f54c35bd8a02f50e12396bc22d Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Sun, 21 Jan 2024 15:14:43 +0800 Subject: [PATCH 24/24] Delete keyboards/theone/config.h --- keyboards/theone/config.h | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 keyboards/theone/config.h diff --git a/keyboards/theone/config.h b/keyboards/theone/config.h deleted file mode 100644 index 71a38bc42cc3..000000000000 --- a/keyboards/theone/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 Persama (@Persama) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - - - - - -