diff --git a/keyboards/sepsepkbd/yubino_hara/keyboard.json b/keyboards/sepsepkbd/yubino_hara/keyboard.json index c61260bfd04..4055025510d 100644 --- a/keyboards/sepsepkbd/yubino_hara/keyboard.json +++ b/keyboards/sepsepkbd/yubino_hara/keyboard.json @@ -37,7 +37,7 @@ "usb": { "device_version": "1.0.0", "pid": "0x0000", - "vid": "0x7936" + "vid": "0x7A93" }, "ws2812": { "driver": "vendor", @@ -50,60 +50,61 @@ "sleep": true }, "layouts": { - "LAYOUT_split_6x3_4": { + "LAYOUT_split_6x3_3_1": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 0], "label":"0,0", "x":0, "y":0}, + {"matrix": [0, 1], "label":"0,1", "x":1, "y":0}, + {"matrix": [0, 2], "label":"0,2", "x":2, "y":0}, + {"matrix": [0, 3], "label":"0,3", "x":3, "y":0}, + {"matrix": [0, 4], "label":"0,4", "x":4, "y":0}, + {"matrix": [0, 5], "label":"0,5", "x":5, "y":0}, - {"matrix": [4, 5], "x": 7, "y": 0}, - {"matrix": [4, 4], "x": 8, "y": 0}, - {"matrix": [4, 3], "x": 9, "y": 0}, - {"matrix": [4, 2], "x": 10, "y": 0}, - {"matrix": [4, 1], "x": 11, "y": 0}, - {"matrix": [4, 0], "x": 12, "y": 0}, + {"matrix": [4, 5], "label":"0,8", "x":9.25, "y":0}, + {"matrix": [4, 4], "label":"0,9", "x":10.25, "y":0}, + {"matrix": [4, 3], "label":"0,10", "x":11.25, "y":0}, + {"matrix": [4, 2], "label":"0,11", "x":12.25, "y":0}, + {"matrix": [4, 1], "label":"0,12", "x":13.25, "y":0}, + {"matrix": [4, 0], "label":"0,13", "x":14.25, "y":0}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1.25, "y": 1}, - {"matrix": [1, 2], "x": 2.25, "y": 1}, - {"matrix": [1, 3], "x": 3.25, "y": 1}, - {"matrix": [1, 4], "x": 4.25, "y": 1}, - {"matrix": [1, 5], "x": 5.25, "y": 1}, - - {"matrix": [5, 5], "x": 6.75, "y": 1}, - {"matrix": [5, 4], "x": 7.75, "y": 1}, - {"matrix": [5, 3], "x": 8.75, "y": 1}, - {"matrix": [5, 2], "x": 9.75, "y": 1}, - {"matrix": [5, 1], "x": 10.75, "y": 1}, - {"matrix": [5, 0], "x": 12, "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.5, "h": 1.5}, - - {"matrix": [6, 6], "x": 7, "y": 2}, - {"matrix": [6, 5], "x": 8, "y": 2}, - {"matrix": [6, 4], "x": 9, "y": 2}, - {"matrix": [6, 3], "x": 10, "y": 2}, - {"matrix": [6, 2], "x": 11, "y": 2}, - {"matrix": [6, 1], "x": 12, "y": 2}, - {"matrix": [6, 0], "x": 13, "y": 1.5, "h": 1.5}, + {"matrix": [1, 0], "label":"1,0", "x":0, "y":1}, + {"matrix": [1, 1], "label":"1,1", "x":1.25, "y":1}, + {"matrix": [1, 2], "label":"1,2", "x":2.25, "y":1}, + {"matrix": [1, 3], "label":"1,3", "x":3.25, "y":1}, + {"matrix": [1, 4], "label":"1,4", "x":4.25, "y":1}, + {"matrix": [1, 5], "label":"1,5", "x":5.25, "y":1}, - {"matrix": [3, 4], "x": 3, "y": 4}, - {"matrix": [3, 5], "x": 4, "y": 4}, - {"matrix": [3, 6], "x": 5, "y": 4}, + {"matrix": [5, 5], "label":"1,8", "x":9, "y":1}, + {"matrix": [5, 4], "label":"1,9", "x":10, "y":1}, + {"matrix": [5, 3], "label":"1,10", "x":11, "y":1}, + {"matrix": [5, 2], "label":"1,11", "x":12, "y":1}, + {"matrix": [5, 1], "label":"1,12", "x":13, "y":1}, + {"matrix": [5, 0], "label":"1,13", "x":14.25, "y":1}, - {"matrix": [7, 6], "x": 9, "y": 4}, - {"matrix": [7, 5], "x": 8, "y": 4}, - {"matrix": [7, 4], "x": 7, "y": 4} + {"matrix": [2, 0], "label":"2,0", "x":0, "y":2}, + {"matrix": [2, 1], "label":"2,1", "x":1, "y":2}, + {"matrix": [2, 2], "label":"2,2", "x":2, "y":2}, + {"matrix": [2, 3], "label":"2,3", "x":3, "y":2}, + {"matrix": [2, 4], "label":"2,4", "x":4, "y":2}, + {"matrix": [2, 5], "label":"2,5", "x":5, "y":2}, + {"matrix": [2, 6], "label":"2,6", "x":6.25, "y":1, "h":2}, + + {"matrix": [6, 6], "label":"2,7", "x":8, "y":1, "h":2}, + {"matrix": [6, 5], "label":"2,8", "x":9.25, "y":2}, + {"matrix": [6, 4], "label":"2,9", "x":10.25, "y":2}, + {"matrix": [6, 3], "label":"2,10", "x":11.25, "y":2}, + {"matrix": [6, 2], "label":"2,11", "x":12.25, "y":2}, + {"matrix": [6, 1], "label":"2,12", "x":13.25, "y":2}, + {"matrix": [6, 0], "label":"2,13", "x":14.25, "y":2}, + + + {"matrix": [3, 4], "label":"3,4", "x":4.25, "y":3.25}, + {"matrix": [3, 5], "label":"3,5", "x":5.25, "y":3}, + {"matrix": [3, 6], "label":"3,6", "x":6.25, "y":3.25}, + + {"matrix": [7, 6], "label":"3,7", "x":8, "y":3.25}, + {"matrix": [7, 5], "label":"3,8", "x":9, "y":3}, + {"matrix": [7, 4], "label":"3,9", "x":10, "y":3.25} ] } } diff --git a/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c b/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c index 7fe9d4f23f1..3ee0e983b0d 100644 --- a/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c +++ b/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c @@ -4,32 +4,32 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_split_6x3_4( + [0] = LAYOUT_split_6x3_3_1( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_MINS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BTN1, KC_BTN2, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT ), - [1] = LAYOUT_split_6x3_4( + [1] = LAYOUT_split_6x3_3_1( KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_ASTR, KC_AMPR, KC_LPRN, KC_RPRN, KC_CIRC, KC_BSPC, KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LGUI(KC_SPC), KC_QUOT, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, - KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG2, RGB_TOG, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG2, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, _______, _______, _______, _______, MO(3), _______ ), - [2] = LAYOUT_split_6x3_4( + [2] = LAYOUT_split_6x3_3_1( KC_TAB, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCTL, XXXXXXX, KC_4, KC_5, KC_6, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, - KC_LSFT, KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_BTN1, _______, KC_LNG1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_LALT, KC_1, KC_2, KC_3, KC_0, _______, _______, KC_LNG1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, MO(3), _______, _______, _______, _______ ), - [3] = LAYOUT_split_6x3_4( + [3] = LAYOUT_split_6x3_3_1( 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_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______ ), }; void keyboard_post_init_user(void) { - rgblight_sethsv(0, 0, 100); + rgblight_sethsv(0, 0, 50); } diff --git a/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c b/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c new file mode 100644 index 00000000000..0e5fd072850 --- /dev/null +++ b/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_6x3_3_1( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_MINS, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BTN1, KC_BTN2, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT + ), + [1] = LAYOUT_split_6x3_3_1( + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_ASTR, KC_AMPR, KC_LPRN, KC_RPRN, KC_CIRC, KC_BSPC, + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LGUI(KC_SPC), KC_QUOT, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG2, RGB_TOG, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + _______, _______, _______, _______, MO(3), _______ + ), + [2] = LAYOUT_split_6x3_3_1( + KC_TAB, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, XXXXXXX, KC_4, KC_5, KC_6, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, + KC_LSFT, KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_BTN1, _______, KC_LNG1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, MO(3), _______, _______, _______, _______ + ), + [3] = LAYOUT_split_6x3_3_1( + 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_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______, _______, _______ + ), +}; + +void keyboard_post_init_user(void) { + rgblight_sethsv(0, 0, 100); +} diff --git a/keyboards/sepsepkbd/yubino_hara/readme.md b/keyboards/sepsepkbd/yubino_hara/readme.md index fa33c8e65ef..1b90731f70d 100644 --- a/keyboards/sepsepkbd/yubino_hara/readme.md +++ b/keyboards/sepsepkbd/yubino_hara/readme.md @@ -1,20 +1,26 @@ # yubino_hara -![yubino_hara](imgur.com image replace me!) +![yubino_hara](https://raw.githubusercontent.com/nagmeal/sep-sep-kbd/main/yubino-hara/yubinohara.jpg) + +- Split +- Reverse tilt (tilted from front to back) +- Symmetrical staggered + -*A short description of the keyboard/project* * Keyboard Maintainer: [t-ando](https://github.com/nagmeal) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: *YUBINO-HARA PCB, RP2040-zero* +* Hardware Availability: *[PCB & Case Data](https://github.com/nagmeal/sep-sep-kbd/tree/main/yubino-hara)* + + Make example for this keyboard (after setting up your build environment): - make yubino_hara:default + qmk compile -kb sepsepkbd/yubino_hara -km default Flashing example for this keyboard: - make yubino_hara:default:flash + Connect to PC with USB cable and copy the generated fa2 file. 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). @@ -22,6 +28,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to 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 +* **Bootmagic reset**: Connect to PC while holding down the "BOOT" button on the RP2040-zero. +* **Physical reset button**: Press the "RESET" button on RP2040-zero. diff --git a/keyboards/sepsepkbd/yubino_hara/rules.mk b/keyboards/sepsepkbd/yubino_hara/rules.mk index 161ec22b16e..ee31c72d6f2 100644 --- a/keyboards/sepsepkbd/yubino_hara/rules.mk +++ b/keyboards/sepsepkbd/yubino_hara/rules.mk @@ -1 +1,2 @@ SERIAL_DRIVER = vendor +VIA_ENABLE = yes