From 70f573df52c0bb3ea1297b5eaa8d81d71d4ed87d Mon Sep 17 00:00:00 2001 From: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:50:46 +0900 Subject: [PATCH 01/15] =?UTF-8?q?Ergo68=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/yushakobo/ergo68/config.h | 52 +++++ keyboards/yushakobo/ergo68/info.json | 188 ++++++++++++++++++ .../yushakobo/ergo68/keymaps/default/keymap.c | 70 +++++++ .../yushakobo/ergo68/keymaps/via/keymap.c | 84 ++++++++ .../yushakobo/ergo68/keymaps/via/rules.mk | 1 + keyboards/yushakobo/ergo68/readme.md | 23 +++ keyboards/yushakobo/ergo68/rules.mk | 1 + 7 files changed, 419 insertions(+) create mode 100644 keyboards/yushakobo/ergo68/config.h create mode 100644 keyboards/yushakobo/ergo68/info.json create mode 100644 keyboards/yushakobo/ergo68/keymaps/default/keymap.c create mode 100644 keyboards/yushakobo/ergo68/keymaps/via/keymap.c create mode 100644 keyboards/yushakobo/ergo68/keymaps/via/rules.mk create mode 100644 keyboards/yushakobo/ergo68/readme.md create mode 100644 keyboards/yushakobo/ergo68/rules.mk diff --git a/keyboards/yushakobo/ergo68/config.h b/keyboards/yushakobo/ergo68/config.h new file mode 100644 index 000000000000..4dbde10fe18f --- /dev/null +++ b/keyboards/yushakobo/ergo68/config.h @@ -0,0 +1,52 @@ +/* Copyright 2023 yushakobo + * + * 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 SPLIT_HAND_PIN B6 +#define RGB_DI_PIN D3 + +#define SPLIT_TRANSPORT_MIRROR +#define SPLIT_LAYER_STATE_ENABLE +#define SPLIT_LED_STATE_ENABLE + +#define DRIVER_LED_TOTAL 74 + +#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +#define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // 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_LEFT_RIGHT // Sets the default mode, if none has been set +#define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set +#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set +#define RGB_MATRIX_STARTUP_VAL 50 // Sets the default brightness value, if none has been set +#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set +// #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature) +#define RGB_MATRIX_SPLIT { 37, 37 } // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right. + // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR +#define RGB_MATRIX_KEYPRESSES +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINDROPS +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json new file mode 100644 index 000000000000..21003644a502 --- /dev/null +++ b/keyboards/yushakobo/ergo68/info.json @@ -0,0 +1,188 @@ +{ + "manufacturer": "yushakobo", + "keyboard_name": "ergo68", + "maintainer": "yushakobo", + "bootloader": "caterina", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "debounce": 5, + "processor": "atmega32u4", + "url": "", + "usb": { + "vid": "0x3265", + "pid": "0x0011", + "device_version": "1.0.0" + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 8, "x": 0, "y": 0 }, + { "flags": 8, "x": 11, "y": 0 }, + { "flags": 8, "x": 21, "y": 0 }, + { "flags": 1, "matrix": [0,0], "x": 0, "y": 10 }, + { "flags": 4, "matrix": [0,1], "x": 14, "y": 10 }, + { "flags": 4, "matrix": [0,2], "x": 28, "y": 7 }, + { "flags": 4, "matrix": [0,3], "x": 42, "y": 6 }, + { "flags": 4, "matrix": [0,4], "x": 56, "y": 7 }, + { "flags": 4, "matrix": [0,5], "x": 70, "y": 9 }, + { "flags": 4, "matrix": [1,6], "x": 84, "y": 15 }, + { "flags": 4, "matrix": [1,5], "x": 70, "y": 20 }, + { "flags": 4, "matrix": [1,4], "x": 56, "y": 19 }, + { "flags": 4, "matrix": [1,3], "x": 42, "y": 17 }, + { "flags": 4, "matrix": [1,2], "x": 28, "y": 19 }, + { "flags": 4, "matrix": [1,1], "x": 14, "y": 22 }, + { "flags": 1, "matrix": [1,0], "x": 0, "y": 22 }, + { "flags": 1, "matrix": [2,0], "x": 0, "y": 34 }, + { "flags": 4, "matrix": [2,1], "x": 14, "y": 34 }, + { "flags": 4, "matrix": [2,2], "x": 28, "y": 31 }, + { "flags": 4, "matrix": [2,3], "x": 42, "y": 29 }, + { "flags": 4, "matrix": [2,4], "x": 56, "y": 31 }, + { "flags": 4, "matrix": [2,5], "x": 70, "y": 32 }, + { "flags": 4, "matrix": [2,6], "x": 84, "y": 26 }, + { "flags": 4, "matrix": [3,6], "x": 84, "y": 38 }, + { "flags": 4, "matrix": [3,5], "x": 70, "y": 44 }, + { "flags": 4, "matrix": [3,4], "x": 56, "y": 42 }, + { "flags": 4, "matrix": [3,3], "x": 42, "y": 41 }, + { "flags": 4, "matrix": [3,2], "x": 28, "y": 42 }, + { "flags": 4, "matrix": [3,1], "x": 14, "y": 45 }, + { "flags": 1, "matrix": [3,0], "x": 0, "y": 45 }, + { "flags": 1, "matrix": [4,0], "x": 0, "y": 57 }, + { "flags": 1, "matrix": [4,1], "x": 14, "y": 57 }, + { "flags": 1, "matrix": [4,2], "x": 28, "y": 54 }, + { "flags": 1, "matrix": [4,3], "x": 49, "y": 54 }, + { "flags": 1, "matrix": [4,4], "x": 63, "y": 55 }, + { "flags": 1, "matrix": [4,5], "x": 81, "y": 58 }, + { "flags": 1, "matrix": [4,6], "x": 95, "y": 64 }, + { "flags": 8, "x": 224, "y": 0 }, + { "flags": 8, "x": 214, "y": 0 }, + { "flags": 8, "x": 203, "y": 0 }, + { "flags": 1, "matrix": [5,0], "x": 224, "y": 10 }, + { "flags": 4, "matrix": [5,1], "x": 210, "y": 10 }, + { "flags": 4, "matrix": [5,2], "x": 196, "y": 7 }, + { "flags": 4, "matrix": [5,3], "x": 182, "y": 6 }, + { "flags": 4, "matrix": [5,4], "x": 168, "y": 7 }, + { "flags": 4, "matrix": [5,5], "x": 154, "y": 9 }, + { "flags": 4, "matrix": [6,6], "x": 140, "y": 15 }, + { "flags": 4, "matrix": [6,5], "x": 154, "y": 20 }, + { "flags": 4, "matrix": [6,4], "x": 168, "y": 19 }, + { "flags": 4, "matrix": [6,3], "x": 182, "y": 17 }, + { "flags": 4, "matrix": [6,2], "x": 196, "y": 19 }, + { "flags": 4, "matrix": [6,1], "x": 210, "y": 22 }, + { "flags": 1, "matrix": [6,0], "x": 224, "y": 22 }, + { "flags": 1, "matrix": [7,0], "x": 224, "y": 34 }, + { "flags": 4, "matrix": [7,1], "x": 210, "y": 34 }, + { "flags": 4, "matrix": [7,2], "x": 196, "y": 31 }, + { "flags": 4, "matrix": [7,3], "x": 182, "y": 29 }, + { "flags": 4, "matrix": [7,4], "x": 168, "y": 31 }, + { "flags": 4, "matrix": [7,5], "x": 154, "y": 32 }, + { "flags": 4, "matrix": [7,6], "x": 140, "y": 26 }, + { "flags": 4, "matrix": [8,6], "x": 140, "y": 38 }, + { "flags": 4, "matrix": [8,5], "x": 154, "y": 44 }, + { "flags": 4, "matrix": [8,4], "x": 168, "y": 42 }, + { "flags": 4, "matrix": [8,3], "x": 182, "y": 41 }, + { "flags": 4, "matrix": [8,2], "x": 196, "y": 42 }, + { "flags": 4, "matrix": [8,1], "x": 210, "y": 45 }, + { "flags": 1, "matrix": [8,0], "x": 224, "y": 45 }, + { "flags": 1, "matrix": [9,0], "x": 224, "y": 57 }, + { "flags": 1, "matrix": [9,1], "x": 210, "y": 57 }, + { "flags": 1, "matrix": [9,2], "x": 196, "y": 54 }, + { "flags": 1, "matrix": [9,3], "x": 175, "y": 54 }, + { "flags": 1, "matrix": [9,4], "x": 161, "y": 55 }, + { "flags": 1, "matrix": [9,5], "x": 144, "y": 58 }, + { "flags": 1, "matrix": [9,6], "x": 130, "y": 64 } + ] + }, + "split": { + "enabled": true, + "transport": { + "protocol": "serial" + }, + "soft_serial_pin": "D0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0}, + {"matrix":[0,1], "x":1, "y":0}, + {"matrix":[0,2], "x":2, "y":0}, + {"matrix":[0,3], "x":3, "y":0}, + {"matrix":[0,4], "x":4, "y":0}, + {"matrix":[0,5], "x":5, "y":0}, + {"matrix":[5,5], "x":10, "y":0}, + {"matrix":[5,4], "x":11, "y":0}, + {"matrix":[5,3], "x":12, "y":0}, + {"matrix":[5,2], "x":13, "y":0}, + {"matrix":[5,1], "x":14, "y":0}, + {"matrix":[5,0], "x":15, "y":0}, + {"matrix":[1,0], "x":0, "y":1}, + {"matrix":[1,1], "x":1, "y":1}, + {"matrix":[1,2], "x":2, "y":1}, + {"matrix":[1,3], "x":3, "y":1}, + {"matrix":[1,4], "x":4, "y":1}, + {"matrix":[1,5], "x":5, "y":1}, + {"matrix":[1,6], "x":6, "y":1}, + {"matrix":[6,6], "x":9, "y":1}, + {"matrix":[6,5], "x":10, "y":1}, + {"matrix":[6,4], "x":11, "y":1}, + {"matrix":[6,3], "x":12, "y":1}, + {"matrix":[6,2], "x":13, "y":1}, + {"matrix":[6,1], "x":14, "y":1}, + {"matrix":[6,0], "x":15, "y":1}, + {"matrix":[2,0], "x":0, "y":2}, + {"matrix":[2,1], "x":1, "y":2}, + {"matrix":[2,2], "x":2, "y":2}, + {"matrix":[2,3], "x":3, "y":2}, + {"matrix":[2,4], "x":4, "y":2}, + {"matrix":[2,5], "x":5, "y":2}, + {"matrix":[2,6], "x":6, "y":1}, + {"matrix":[7,6], "x":9, "y":2}, + {"matrix":[7,5], "x":10, "y":2}, + {"matrix":[7,4], "x":11, "y":2}, + {"matrix":[7,3], "x":12, "y":2}, + {"matrix":[7,2], "x":13, "y":2}, + {"matrix":[7,1], "x":14, "y":2}, + {"matrix":[7,0], "x":15, "y":2}, + {"matrix":[3,0], "x":0, "y":3}, + {"matrix":[3,1], "x":1, "y":3}, + {"matrix":[3,2], "x":2, "y":3}, + {"matrix":[3,3], "x":3, "y":3}, + {"matrix":[3,4], "x":4, "y":3}, + {"matrix":[3,5], "x":5, "y":3}, + {"matrix":[3,6], "x":6, "y":3}, + {"matrix":[8,6], "x":9, "y":3}, + {"matrix":[8,5], "x":10, "y":3}, + {"matrix":[8,4], "x":11, "y":3}, + {"matrix":[8,3], "x":12, "y":3}, + {"matrix":[8,2], "x":13, "y":3}, + {"matrix":[8,1], "x":14, "y":3}, + {"matrix":[8,0], "x":15, "y":3}, + {"matrix":[4,0], "x":0, "y":4}, + {"matrix":[4,1], "x":1, "y":4}, + {"matrix":[4,2], "x":2, "y":4}, + {"matrix":[4,3], "x":3, "y":4}, + {"matrix":[4,4], "x":4, "y":4}, + {"matrix":[4,5], "x":5, "y":4}, + {"matrix":[4,6], "x":6, "y":4}, + {"matrix":[9,6], "x":9, "y":4}, + {"matrix":[9,5], "x":10, "y":4}, + {"matrix":[9,4], "x":11, "y":4}, + {"matrix":[9,3], "x":12, "y":4}, + {"matrix":[9,2], "x":13, "y":4}, + {"matrix":[9,1], "x":14, "y":4}, + {"matrix":[9,0], "x":15, "y":4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/yushakobo/ergo68/keymaps/default/keymap.c b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c new file mode 100644 index 000000000000..f9e46ebefa80 --- /dev/null +++ b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c @@ -0,0 +1,70 @@ +/* Copyright 2023 yushakobo + * + * 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( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PSCR, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_MINS, KC_EQL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL,KC_LGUI,KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_LCTL + ), + [1] = 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, KC_TRNS, KC_TRNS + ) +}; + +void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + // caps lock cyan + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 128); + } else { + RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0); + } + + // num lock cyan + if (host_keyboard_led_state().num_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 128); + } else { + RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0); + } + + // scroll lock cyan + if (host_keyboard_led_state().scroll_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 128); + } else { + RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 0); + } + + // layer state + switch (get_highest_layer(layer_state)) { + case 1: + RGB_MATRIX_INDICATOR_SET_COLOR(37, 0, 0, 128); + break; + case 2: + RGB_MATRIX_INDICATOR_SET_COLOR(38, 0, 0, 128); + break; + case 3: + RGB_MATRIX_INDICATOR_SET_COLOR(39, 0, 0, 128); + break; + } +} diff --git a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c new file mode 100644 index 000000000000..b2a225a3d5a1 --- /dev/null +++ b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c @@ -0,0 +1,84 @@ +/* Copyright 2023 yushakobo + * + * 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( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PSCR, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_MINS, KC_EQL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL,KC_LGUI,KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_LCTL + ), + [1] = 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, KC_TRNS, KC_TRNS + ), + [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, KC_TRNS, KC_TRNS + ), + [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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + // caps lock cyan + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 128); + } else { + RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0); + } + + // num lock cyan + if (host_keyboard_led_state().num_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 128); + } else { + RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0); + } + + // scroll lock cyan + if (host_keyboard_led_state().scroll_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 128); + } else { + RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 0); + } + + // layer state + switch (get_highest_layer(layer_state)) { + case 1: + RGB_MATRIX_INDICATOR_SET_COLOR(37, 0, 0, 128); + break; + case 2: + RGB_MATRIX_INDICATOR_SET_COLOR(38, 0, 0, 128); + break; + case 3: + RGB_MATRIX_INDICATOR_SET_COLOR(39, 0, 0, 128); + break; + } +} diff --git a/keyboards/yushakobo/ergo68/keymaps/via/rules.mk b/keyboards/yushakobo/ergo68/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/yushakobo/ergo68/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/yushakobo/ergo68/readme.md b/keyboards/yushakobo/ergo68/readme.md new file mode 100644 index 000000000000..37ac2509da78 --- /dev/null +++ b/keyboards/yushakobo/ergo68/readme.md @@ -0,0 +1,23 @@ +# ergo68 + +![ergo68](https://i.imgur.com/u1HeHb9h.jpg) + +This is 68 keys Column-staggered Split keyboard. + +* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo) +* Hardware Supported: ergo68 PCB, Pro Micro +* Hardware Availability: [yushakobo shop](https://shop.yushakobo.jp/products/5384) + +Make example for this keyboard (after setting up your build environment): + + make yushakobo/ergo68:default + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available + +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). \ No newline at end of file diff --git a/keyboards/yushakobo/ergo68/rules.mk b/keyboards/yushakobo/ergo68/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/yushakobo/ergo68/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From d30a6d8a662333b295c0c5d97721f449abe5b262 Mon Sep 17 00:00:00 2001 From: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com> Date: Thu, 24 Aug 2023 10:13:55 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=E5=86=99=E7=9C=9F=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/yushakobo/ergo68/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/yushakobo/ergo68/readme.md b/keyboards/yushakobo/ergo68/readme.md index 37ac2509da78..3ee6bef34c31 100644 --- a/keyboards/yushakobo/ergo68/readme.md +++ b/keyboards/yushakobo/ergo68/readme.md @@ -1,12 +1,12 @@ # ergo68 -![ergo68](https://i.imgur.com/u1HeHb9h.jpg) +![ergo68](https://i.imgur.com/ucr11Mg.jpg) This is 68 keys Column-staggered Split keyboard. * Keyboard Maintainer: [yushakobo](https://github.com/yushakobo) * Hardware Supported: ergo68 PCB, Pro Micro -* Hardware Availability: [yushakobo shop](https://shop.yushakobo.jp/products/5384) +* Hardware Availability: [yushakobo shop](https://shop.yushakobo.jp) Make example for this keyboard (after setting up your build environment): From 24ad5171e3141cf8edb275eeec3b968755de0dae Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 12:39:37 +0900 Subject: [PATCH 03/15] fix build error --- keyboards/yushakobo/ergo68/config.h | 2 +- keyboards/yushakobo/ergo68/info.json | 4 ++-- keyboards/yushakobo/ergo68/keymaps/default/keymap.c | 5 +++-- keyboards/yushakobo/ergo68/keymaps/via/keymap.c | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/keyboards/yushakobo/ergo68/config.h b/keyboards/yushakobo/ergo68/config.h index 4dbde10fe18f..c5e1ee29b5eb 100644 --- a/keyboards/yushakobo/ergo68/config.h +++ b/keyboards/yushakobo/ergo68/config.h @@ -17,7 +17,7 @@ #pragma once #define SPLIT_HAND_PIN B6 -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define SPLIT_TRANSPORT_MIRROR #define SPLIT_LAYER_STATE_ENABLE diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index 21003644a502..2752fb89a281 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -26,7 +26,7 @@ "device_version": "1.0.0" }, "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "layout": [ { "flags": 8, "x": 0, "y": 0 }, { "flags": 8, "x": 11, "y": 0 }, @@ -185,4 +185,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/yushakobo/ergo68/keymaps/default/keymap.c b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c index f9e46ebefa80..f85a2553d3b2 100644 --- a/keyboards/yushakobo/ergo68/keymaps/default/keymap.c +++ b/keyboards/yushakobo/ergo68/keymaps/default/keymap.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 QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // caps lock cyan if (host_keyboard_led_state().caps_lock) { RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 128); @@ -67,4 +67,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { RGB_MATRIX_INDICATOR_SET_COLOR(39, 0, 0, 128); break; } + return false; } diff --git a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c index b2a225a3d5a1..8231dc769262 100644 --- a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c +++ b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // caps lock cyan if (host_keyboard_led_state().caps_lock) { RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 128); @@ -81,4 +81,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { RGB_MATRIX_INDICATOR_SET_COLOR(39, 0, 0, 128); break; } + return false; } From aa419a82e39aa4f917ebd609064d4d5eeca05887 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 16:12:31 +0900 Subject: [PATCH 04/15] Update keyboards/yushakobo/ergo68/readme.md Co-authored-by: Joel Challis --- keyboards/yushakobo/ergo68/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/keyboards/yushakobo/ergo68/readme.md b/keyboards/yushakobo/ergo68/readme.md index 3ee6bef34c31..302b510dba11 100644 --- a/keyboards/yushakobo/ergo68/readme.md +++ b/keyboards/yushakobo/ergo68/readme.md @@ -12,12 +12,16 @@ Make example for this keyboard (after setting up your build environment): make yushakobo/ergo68:default +Flashing example for this keyboard: + + make yushakobo/ergo68:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + ## Bootloader Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available - -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). \ No newline at end of file +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file From f0da397fc15c490ad5de0ba6171b33a3ccd75ff7 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 16:12:59 +0900 Subject: [PATCH 05/15] Update keyboards/yushakobo/ergo68/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/yushakobo/ergo68/keymaps/via/keymap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c index 8231dc769262..f85a2553d3b2 100644 --- a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c +++ b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c @@ -30,20 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [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, KC_TRNS, KC_TRNS - ), - [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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, 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 e8795a6b5bb803da8a8a65fdb1a47f82e7f3720b Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 19:20:24 +0900 Subject: [PATCH 06/15] config.h migrated to info.json --- keyboards/yushakobo/ergo68/config.h | 52 -------- keyboards/yushakobo/ergo68/info.json | 187 ++++++++++++++++----------- 2 files changed, 111 insertions(+), 128 deletions(-) delete mode 100644 keyboards/yushakobo/ergo68/config.h diff --git a/keyboards/yushakobo/ergo68/config.h b/keyboards/yushakobo/ergo68/config.h deleted file mode 100644 index c5e1ee29b5eb..000000000000 --- a/keyboards/yushakobo/ergo68/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2023 yushakobo - * - * 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 SPLIT_HAND_PIN B6 -#define WS2812_DI_PIN D3 - -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE - -#define DRIVER_LED_TOTAL 74 - -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // 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_LEFT_RIGHT // Sets the default mode, if none has been set -#define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set -#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set -#define RGB_MATRIX_STARTUP_VAL 50 // Sets the default brightness value, if none has been set -#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set -// #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature) -#define RGB_MATRIX_SPLIT { 37, 37 } // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right. - // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR -#define RGB_MATRIX_KEYPRESSES -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_BEACON -#define ENABLE_RGB_MATRIX_RAINDROPS -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index 2752fb89a281..05e18415b1a4 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -25,89 +25,124 @@ "pid": "0x0011", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "rgb_matrix": { "driver": "ws2812", "layout": [ - { "flags": 8, "x": 0, "y": 0 }, - { "flags": 8, "x": 11, "y": 0 }, - { "flags": 8, "x": 21, "y": 0 }, - { "flags": 1, "matrix": [0,0], "x": 0, "y": 10 }, - { "flags": 4, "matrix": [0,1], "x": 14, "y": 10 }, - { "flags": 4, "matrix": [0,2], "x": 28, "y": 7 }, - { "flags": 4, "matrix": [0,3], "x": 42, "y": 6 }, - { "flags": 4, "matrix": [0,4], "x": 56, "y": 7 }, - { "flags": 4, "matrix": [0,5], "x": 70, "y": 9 }, - { "flags": 4, "matrix": [1,6], "x": 84, "y": 15 }, - { "flags": 4, "matrix": [1,5], "x": 70, "y": 20 }, - { "flags": 4, "matrix": [1,4], "x": 56, "y": 19 }, - { "flags": 4, "matrix": [1,3], "x": 42, "y": 17 }, - { "flags": 4, "matrix": [1,2], "x": 28, "y": 19 }, - { "flags": 4, "matrix": [1,1], "x": 14, "y": 22 }, - { "flags": 1, "matrix": [1,0], "x": 0, "y": 22 }, - { "flags": 1, "matrix": [2,0], "x": 0, "y": 34 }, - { "flags": 4, "matrix": [2,1], "x": 14, "y": 34 }, - { "flags": 4, "matrix": [2,2], "x": 28, "y": 31 }, - { "flags": 4, "matrix": [2,3], "x": 42, "y": 29 }, - { "flags": 4, "matrix": [2,4], "x": 56, "y": 31 }, - { "flags": 4, "matrix": [2,5], "x": 70, "y": 32 }, - { "flags": 4, "matrix": [2,6], "x": 84, "y": 26 }, - { "flags": 4, "matrix": [3,6], "x": 84, "y": 38 }, - { "flags": 4, "matrix": [3,5], "x": 70, "y": 44 }, - { "flags": 4, "matrix": [3,4], "x": 56, "y": 42 }, - { "flags": 4, "matrix": [3,3], "x": 42, "y": 41 }, - { "flags": 4, "matrix": [3,2], "x": 28, "y": 42 }, - { "flags": 4, "matrix": [3,1], "x": 14, "y": 45 }, - { "flags": 1, "matrix": [3,0], "x": 0, "y": 45 }, - { "flags": 1, "matrix": [4,0], "x": 0, "y": 57 }, - { "flags": 1, "matrix": [4,1], "x": 14, "y": 57 }, - { "flags": 1, "matrix": [4,2], "x": 28, "y": 54 }, - { "flags": 1, "matrix": [4,3], "x": 49, "y": 54 }, - { "flags": 1, "matrix": [4,4], "x": 63, "y": 55 }, - { "flags": 1, "matrix": [4,5], "x": 81, "y": 58 }, - { "flags": 1, "matrix": [4,6], "x": 95, "y": 64 }, - { "flags": 8, "x": 224, "y": 0 }, - { "flags": 8, "x": 214, "y": 0 }, - { "flags": 8, "x": 203, "y": 0 }, - { "flags": 1, "matrix": [5,0], "x": 224, "y": 10 }, - { "flags": 4, "matrix": [5,1], "x": 210, "y": 10 }, - { "flags": 4, "matrix": [5,2], "x": 196, "y": 7 }, - { "flags": 4, "matrix": [5,3], "x": 182, "y": 6 }, - { "flags": 4, "matrix": [5,4], "x": 168, "y": 7 }, - { "flags": 4, "matrix": [5,5], "x": 154, "y": 9 }, - { "flags": 4, "matrix": [6,6], "x": 140, "y": 15 }, - { "flags": 4, "matrix": [6,5], "x": 154, "y": 20 }, - { "flags": 4, "matrix": [6,4], "x": 168, "y": 19 }, - { "flags": 4, "matrix": [6,3], "x": 182, "y": 17 }, - { "flags": 4, "matrix": [6,2], "x": 196, "y": 19 }, - { "flags": 4, "matrix": [6,1], "x": 210, "y": 22 }, - { "flags": 1, "matrix": [6,0], "x": 224, "y": 22 }, - { "flags": 1, "matrix": [7,0], "x": 224, "y": 34 }, - { "flags": 4, "matrix": [7,1], "x": 210, "y": 34 }, - { "flags": 4, "matrix": [7,2], "x": 196, "y": 31 }, - { "flags": 4, "matrix": [7,3], "x": 182, "y": 29 }, - { "flags": 4, "matrix": [7,4], "x": 168, "y": 31 }, - { "flags": 4, "matrix": [7,5], "x": 154, "y": 32 }, - { "flags": 4, "matrix": [7,6], "x": 140, "y": 26 }, - { "flags": 4, "matrix": [8,6], "x": 140, "y": 38 }, - { "flags": 4, "matrix": [8,5], "x": 154, "y": 44 }, - { "flags": 4, "matrix": [8,4], "x": 168, "y": 42 }, - { "flags": 4, "matrix": [8,3], "x": 182, "y": 41 }, - { "flags": 4, "matrix": [8,2], "x": 196, "y": 42 }, - { "flags": 4, "matrix": [8,1], "x": 210, "y": 45 }, - { "flags": 1, "matrix": [8,0], "x": 224, "y": 45 }, - { "flags": 1, "matrix": [9,0], "x": 224, "y": 57 }, - { "flags": 1, "matrix": [9,1], "x": 210, "y": 57 }, - { "flags": 1, "matrix": [9,2], "x": 196, "y": 54 }, - { "flags": 1, "matrix": [9,3], "x": 175, "y": 54 }, - { "flags": 1, "matrix": [9,4], "x": 161, "y": 55 }, - { "flags": 1, "matrix": [9,5], "x": 144, "y": 58 }, - { "flags": 1, "matrix": [9,6], "x": 130, "y": 64 } - ] + {"x": 0, "y": 0, "flags": 8}, + {"x": 11, "y": 0, "flags": 8}, + {"x": 21, "y": 0, "flags": 8}, + {"matrix": [0, 0], "x": 0, "y": 10, "flags": 1}, + {"matrix": [0, 1], "x": 14, "y": 10, "flags": 4}, + {"matrix": [0, 2], "x": 28, "y": 7, "flags": 4}, + {"matrix": [0, 3], "x": 42, "y": 6, "flags": 4}, + {"matrix": [0, 4], "x": 56, "y": 7, "flags": 4}, + {"matrix": [0, 5], "x": 70, "y": 9, "flags": 4}, + {"matrix": [1, 6], "x": 84, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 70, "y": 20, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 19, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 17, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 19, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 22, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 22, "flags": 1}, + {"matrix": [2, 0], "x": 0, "y": 34, "flags": 1}, + {"matrix": [2, 1], "x": 14, "y": 34, "flags": 4}, + {"matrix": [2, 2], "x": 28, "y": 31, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 29, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 31, "flags": 4}, + {"matrix": [2, 5], "x": 70, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 26, "flags": 4}, + {"matrix": [3, 6], "x": 84, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 70, "y": 44, "flags": 4}, + {"matrix": [3, 4], "x": 56, "y": 42, "flags": 4}, + {"matrix": [3, 3], "x": 42, "y": 41, "flags": 4}, + {"matrix": [3, 2], "x": 28, "y": 42, "flags": 4}, + {"matrix": [3, 1], "x": 14, "y": 45, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 45, "flags": 1}, + {"matrix": [4, 0], "x": 0, "y": 57, "flags": 1}, + {"matrix": [4, 1], "x": 14, "y": 57, "flags": 1}, + {"matrix": [4, 2], "x": 28, "y": 54, "flags": 1}, + {"matrix": [4, 3], "x": 49, "y": 54, "flags": 1}, + {"matrix": [4, 4], "x": 63, "y": 55, "flags": 1}, + {"matrix": [4, 5], "x": 81, "y": 58, "flags": 1}, + {"matrix": [4, 6], "x": 95, "y": 64, "flags": 1}, + {"x": 224, "y": 0, "flags": 8}, + {"x": 214, "y": 0, "flags": 8}, + {"x": 203, "y": 0, "flags": 8}, + {"matrix": [5, 0], "x": 224, "y": 10, "flags": 1}, + {"matrix": [5, 1], "x": 210, "y": 10, "flags": 4}, + {"matrix": [5, 2], "x": 196, "y": 7, "flags": 4}, + {"matrix": [5, 3], "x": 182, "y": 6, "flags": 4}, + {"matrix": [5, 4], "x": 168, "y": 7, "flags": 4}, + {"matrix": [5, 5], "x": 154, "y": 9, "flags": 4}, + {"matrix": [6, 6], "x": 140, "y": 15, "flags": 4}, + {"matrix": [6, 5], "x": 154, "y": 20, "flags": 4}, + {"matrix": [6, 4], "x": 168, "y": 19, "flags": 4}, + {"matrix": [6, 3], "x": 182, "y": 17, "flags": 4}, + {"matrix": [6, 2], "x": 196, "y": 19, "flags": 4}, + {"matrix": [6, 1], "x": 210, "y": 22, "flags": 4}, + {"matrix": [6, 0], "x": 224, "y": 22, "flags": 1}, + {"matrix": [7, 0], "x": 224, "y": 34, "flags": 1}, + {"matrix": [7, 1], "x": 210, "y": 34, "flags": 4}, + {"matrix": [7, 2], "x": 196, "y": 31, "flags": 4}, + {"matrix": [7, 3], "x": 182, "y": 29, "flags": 4}, + {"matrix": [7, 4], "x": 168, "y": 31, "flags": 4}, + {"matrix": [7, 5], "x": 154, "y": 32, "flags": 4}, + {"matrix": [7, 6], "x": 140, "y": 26, "flags": 4}, + {"matrix": [8, 6], "x": 140, "y": 38, "flags": 4}, + {"matrix": [8, 5], "x": 154, "y": 44, "flags": 4}, + {"matrix": [8, 4], "x": 168, "y": 42, "flags": 4}, + {"matrix": [8, 3], "x": 182, "y": 41, "flags": 4}, + {"matrix": [8, 2], "x": 196, "y": 42, "flags": 4}, + {"matrix": [8, 1], "x": 210, "y": 45, "flags": 4}, + {"matrix": [8, 0], "x": 224, "y": 45, "flags": 1}, + {"matrix": [9, 0], "x": 224, "y": 57, "flags": 1}, + {"matrix": [9, 1], "x": 210, "y": 57, "flags": 1}, + {"matrix": [9, 2], "x": 196, "y": 54, "flags": 1}, + {"matrix": [9, 3], "x": 175, "y": 54, "flags": 1}, + {"matrix": [9, 4], "x": 161, "y": 55, "flags": 1}, + {"matrix": [9, 5], "x": 144, "y": 58, "flags": 1}, + {"matrix": [9, 6], "x": 130, "y": 64, "flags": 1} + ], + "led_flush_limit": 16, + "max_brightness": 100, + "sleep": true, + "split_count": [37, 37], + "animations":{ + "alphas_mods": true, + "breathing": true, + "cycle_all": true, + "rainbow_moving_chevron": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "raindrops": true, + "solid_reactive": true, + "splash": true, + "solid_splash": true, + }, + "default":{ + "hue": 0, + "sat": 255, + "val": 50, + "speed": 127 + }, + "led_process_limit":16 }, "split": { "enabled": true, + "handedness": { + "pin": "B6" + }, "transport": { - "protocol": "serial" + "protocol": "serial", + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true + } }, "soft_serial_pin": "D0" }, From 1c7a56b7275cfbf2f525afd200a8656efed466be Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 19:26:12 +0900 Subject: [PATCH 07/15] Update keyboards/yushakobo/ergo68/info.json Co-authored-by: Duncan Sutherland --- keyboards/yushakobo/ergo68/info.json | 129 ++++++++++++++------------- 1 file changed, 69 insertions(+), 60 deletions(-) diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index 05e18415b1a4..bfa52ed7a604 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -149,74 +149,83 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,1], "x":1, "y":0}, - {"matrix":[0,2], "x":2, "y":0}, + {"matrix":[0,0], "x":0, "y":0.6}, + {"matrix":[0,1], "x":1, "y":0.6}, + {"matrix":[0,2], "x":2, "y":0.2}, {"matrix":[0,3], "x":3, "y":0}, - {"matrix":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[5,5], "x":10, "y":0}, - {"matrix":[5,4], "x":11, "y":0}, + {"matrix":[0,4], "x":4, "y":0.2}, + {"matrix":[0,5], "x":5, "y":0.4}, + + {"matrix":[5,5], "x":10, "y":0.4}, + {"matrix":[5,4], "x":11, "y":0.2}, {"matrix":[5,3], "x":12, "y":0}, - {"matrix":[5,2], "x":13, "y":0}, - {"matrix":[5,1], "x":14, "y":0}, - {"matrix":[5,0], "x":15, "y":0}, - {"matrix":[1,0], "x":0, "y":1}, - {"matrix":[1,1], "x":1, "y":1}, - {"matrix":[1,2], "x":2, "y":1}, + {"matrix":[5,2], "x":13, "y":0.2}, + {"matrix":[5,1], "x":14, "y":0.6}, + {"matrix":[5,0], "x":15, "y":0.6}, + + {"matrix":[1,0], "x":0, "y":1.6}, + {"matrix":[1,1], "x":1, "y":1.6}, + {"matrix":[1,2], "x":2, "y":1.2}, {"matrix":[1,3], "x":3, "y":1}, - {"matrix":[1,4], "x":4, "y":1}, - {"matrix":[1,5], "x":5, "y":1}, - {"matrix":[1,6], "x":6, "y":1}, - {"matrix":[6,6], "x":9, "y":1}, - {"matrix":[6,5], "x":10, "y":1}, - {"matrix":[6,4], "x":11, "y":1}, + {"matrix":[1,4], "x":4, "y":1.2}, + {"matrix":[1,5], "x":5, "y":1.4}, + {"matrix":[1,6], "x":6, "y":0.8}, + + {"matrix":[6,6], "x":9, "y":0.8}, + {"matrix":[6,5], "x":10, "y":1.4}, + {"matrix":[6,4], "x":11, "y":1.2}, {"matrix":[6,3], "x":12, "y":1}, - {"matrix":[6,2], "x":13, "y":1}, - {"matrix":[6,1], "x":14, "y":1}, - {"matrix":[6,0], "x":15, "y":1}, - {"matrix":[2,0], "x":0, "y":2}, - {"matrix":[2,1], "x":1, "y":2}, - {"matrix":[2,2], "x":2, "y":2}, + {"matrix":[6,2], "x":13, "y":1.2}, + {"matrix":[6,1], "x":14, "y":1.6}, + {"matrix":[6,0], "x":15, "y":1.6}, + + {"matrix":[2,0], "x":0, "y":2.6}, + {"matrix":[2,1], "x":1, "y":2.6}, + {"matrix":[2,2], "x":2, "y":2.2}, {"matrix":[2,3], "x":3, "y":2}, - {"matrix":[2,4], "x":4, "y":2}, - {"matrix":[2,5], "x":5, "y":2}, - {"matrix":[2,6], "x":6, "y":1}, - {"matrix":[7,6], "x":9, "y":2}, - {"matrix":[7,5], "x":10, "y":2}, - {"matrix":[7,4], "x":11, "y":2}, + {"matrix":[2,4], "x":4, "y":2.2}, + {"matrix":[2,5], "x":5, "y":2.4}, + {"matrix":[2,6], "x":6, "y":1.8}, + + {"matrix":[7,6], "x":9, "y":1.8}, + {"matrix":[7,5], "x":10, "y":2.4}, + {"matrix":[7,4], "x":11, "y":2.2}, {"matrix":[7,3], "x":12, "y":2}, - {"matrix":[7,2], "x":13, "y":2}, - {"matrix":[7,1], "x":14, "y":2}, - {"matrix":[7,0], "x":15, "y":2}, - {"matrix":[3,0], "x":0, "y":3}, - {"matrix":[3,1], "x":1, "y":3}, - {"matrix":[3,2], "x":2, "y":3}, + {"matrix":[7,2], "x":13, "y":2.2}, + {"matrix":[7,1], "x":14, "y":2.6}, + {"matrix":[7,0], "x":15, "y":2.6}, + + {"matrix":[3,0], "x":0, "y":3.6}, + {"matrix":[3,1], "x":1, "y":3.6}, + {"matrix":[3,2], "x":2, "y":3.2}, {"matrix":[3,3], "x":3, "y":3}, - {"matrix":[3,4], "x":4, "y":3}, - {"matrix":[3,5], "x":5, "y":3}, - {"matrix":[3,6], "x":6, "y":3}, - {"matrix":[8,6], "x":9, "y":3}, - {"matrix":[8,5], "x":10, "y":3}, - {"matrix":[8,4], "x":11, "y":3}, + {"matrix":[3,4], "x":4, "y":3.2}, + {"matrix":[3,5], "x":5, "y":3.4}, + {"matrix":[3,6], "x":6, "y":2.8}, + + {"matrix":[8,6], "x":9, "y":2.8}, + {"matrix":[8,5], "x":10, "y":3.4}, + {"matrix":[8,4], "x":11, "y":3.2}, {"matrix":[8,3], "x":12, "y":3}, - {"matrix":[8,2], "x":13, "y":3}, - {"matrix":[8,1], "x":14, "y":3}, - {"matrix":[8,0], "x":15, "y":3}, - {"matrix":[4,0], "x":0, "y":4}, - {"matrix":[4,1], "x":1, "y":4}, - {"matrix":[4,2], "x":2, "y":4}, - {"matrix":[4,3], "x":3, "y":4}, - {"matrix":[4,4], "x":4, "y":4}, - {"matrix":[4,5], "x":5, "y":4}, - {"matrix":[4,6], "x":6, "y":4}, - {"matrix":[9,6], "x":9, "y":4}, - {"matrix":[9,5], "x":10, "y":4}, - {"matrix":[9,4], "x":11, "y":4}, - {"matrix":[9,3], "x":12, "y":4}, - {"matrix":[9,2], "x":13, "y":4}, - {"matrix":[9,1], "x":14, "y":4}, - {"matrix":[9,0], "x":15, "y":4} + {"matrix":[8,2], "x":13, "y":3.2}, + {"matrix":[8,1], "x":14, "y":3.6}, + {"matrix":[8,0], "x":15, "y":3.6}, + + {"matrix":[4,0], "x":0, "y":4.6}, + {"matrix":[4,1], "x":1, "y":4.6}, + {"matrix":[4,2], "x":2, "y":4.2}, + {"matrix":[4,3], "x":3.5, "y":4.2}, + {"matrix":[4,4], "x":4.5, "y":4.4}, + {"matrix":[4,5], "x":5.5, "y":4.4, "h": 2}, + {"matrix":[4,6], "x":6.5, "y":4.6, "h": 2}, + + {"matrix":[9,6], "x":8.5, "y":4.6, "h": 2}, + {"matrix":[9,5], "x":9.5, "y":4.4, "h": 2}, + {"matrix":[9,4], "x":10.5, "y":4.4}, + {"matrix":[9,3], "x":11.5, "y":4.2}, + {"matrix":[9,2], "x":13, "y":4.2}, + {"matrix":[9,1], "x":14, "y":4.6}, + {"matrix":[9,0], "x":15, "y":4.6} ] } } From 5e5d3aa1c5c27819b4bdf491cff98d8cacb6a0d3 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 19:26:21 +0900 Subject: [PATCH 08/15] Update keyboards/yushakobo/ergo68/readme.md Co-authored-by: Duncan Sutherland --- keyboards/yushakobo/ergo68/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/ergo68/readme.md b/keyboards/yushakobo/ergo68/readme.md index 302b510dba11..863c747f77b4 100644 --- a/keyboards/yushakobo/ergo68/readme.md +++ b/keyboards/yushakobo/ergo68/readme.md @@ -1,6 +1,6 @@ # ergo68 -![ergo68](https://i.imgur.com/ucr11Mg.jpg) +![ergo68](https://i.imgur.com/ucr11Mgh.jpg) This is 68 keys Column-staggered Split keyboard. From a5f6c36d86569afbe4040ed9e76ecaa670a4484d Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 19:26:33 +0900 Subject: [PATCH 09/15] Update keyboards/yushakobo/ergo68/info.json Co-authored-by: Duncan Sutherland --- keyboards/yushakobo/ergo68/info.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index bfa52ed7a604..4a455b3f691a 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -2,23 +2,18 @@ "manufacturer": "yushakobo", "keyboard_name": "ergo68", "maintainer": "yushakobo", - "bootloader": "caterina", - "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "rgb_matrix": true, - "nkro": false }, + "development_board": "promicro", + "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4"] }, - "debounce": 5, - "processor": "atmega32u4", "url": "", "usb": { "vid": "0x3265", From 2b0c50473355047e82df6d278007c6580caf5fe2 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sat, 16 Dec 2023 19:26:42 +0900 Subject: [PATCH 10/15] Update keyboards/yushakobo/ergo68/keymaps/via/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/yushakobo/ergo68/keymaps/via/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/ergo68/keymaps/via/rules.mk b/keyboards/yushakobo/ergo68/keymaps/via/rules.mk index 036bd6d1c3ec..1e5b99807cb7 100644 --- a/keyboards/yushakobo/ergo68/keymaps/via/rules.mk +++ b/keyboards/yushakobo/ergo68/keymaps/via/rules.mk @@ -1 +1 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes From 38e55fa5073882dc47705444c71b94c3b38937ac Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sun, 17 Dec 2023 11:16:52 +0900 Subject: [PATCH 11/15] Update keyboards/yushakobo/ergo68/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/yushakobo/ergo68/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/ergo68/keymaps/default/keymap.c b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c index f85a2553d3b2..57f410950275 100644 --- a/keyboards/yushakobo/ergo68/keymaps/default/keymap.c +++ b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL,KC_LGUI,KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_LCTL ), [1] = 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, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 c37d256ebeede6e7f1b3ef261cca0a949175ac14 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sun, 17 Dec 2023 11:17:00 +0900 Subject: [PATCH 12/15] Update keyboards/yushakobo/ergo68/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/yushakobo/ergo68/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c index f85a2553d3b2..57f410950275 100644 --- a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c +++ b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL,KC_LGUI,KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_LCTL ), [1] = 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, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 a18998e6776187644ddf8b6019fcc7c354764d18 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sun, 17 Dec 2023 11:23:39 +0900 Subject: [PATCH 13/15] Update keyboards/yushakobo/ergo68/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/yushakobo/ergo68/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index 4a455b3f691a..6d3018689753 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -101,7 +101,6 @@ {"matrix": [9, 5], "x": 144, "y": 58, "flags": 1}, {"matrix": [9, 6], "x": 130, "y": 64, "flags": 1} ], - "led_flush_limit": 16, "max_brightness": 100, "sleep": true, "split_count": [37, 37], From 8dc8fc58603456c0c6babca5afa9fe6c836ee559 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sun, 17 Dec 2023 11:23:48 +0900 Subject: [PATCH 14/15] Update keyboards/yushakobo/ergo68/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/yushakobo/ergo68/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index 6d3018689753..fde24d49c9d5 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -131,7 +131,6 @@ "pin": "B6" }, "transport": { - "protocol": "serial", "sync": { "indicators": true, "layer_state": true, From 3ee0a81b76525a6112e188ee1af4052f811a57e7 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Sun, 17 Dec 2023 16:03:19 +0900 Subject: [PATCH 15/15] Update keyboards/yushakobo/ergo68/info.json Co-authored-by: Joel Challis --- keyboards/yushakobo/ergo68/info.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json index fde24d49c9d5..c4a143cb73c0 100644 --- a/keyboards/yushakobo/ergo68/info.json +++ b/keyboards/yushakobo/ergo68/info.json @@ -118,10 +118,7 @@ "solid_splash": true, }, "default":{ - "hue": 0, - "sat": 255, - "val": 50, - "speed": 127 + "val": 50 }, "led_process_limit":16 },