Skip to content

Commit

Permalink
Merge branch 'vial-kb:vial' into vial
Browse files Browse the repository at this point in the history
  • Loading branch information
arko9699 authored Sep 2, 2024
2 parents 98ae58d + 3f0184c commit dc1d29a
Show file tree
Hide file tree
Showing 56 changed files with 1,423 additions and 137 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions keyboards/bachoo/x88/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright 2024 Bachoo (@cBachoo)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define WS2812_SPI_DRIVER SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_EXTERNAL_PULLUP
8 changes: 8 additions & 0 deletions keyboards/bachoo/x88/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2024 Bachoo (@cBachoo)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define HAL_USE_SPI TRUE

#include_next <halconf.h>
279 changes: 279 additions & 0 deletions keyboards/bachoo/x88/keyboard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
{
"manufacturer": "concreteflowers",
"keyboard_name": "X88",
"maintainer": "Bachoo",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["A9", "A8", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "B9", "B6"],
"rows": ["A15", "B3", "B4", "A10", "B8", "B7"]
},
"processor": "STM32F072",
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0x1001",
"vid": "0xC04C"
},
"ws2812": {
"pin": "B15",
"driver": "spi"
},
"rgb_matrix": {
"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_rain": true,
"pixel_flow": true,
"pixel_fractal": 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
},
"driver": "ws2812",
"layout": [
{"flags": 8, "matrix": [0,15], "x":208, "y":0},
{"flags": 8, "matrix": [3, 0], "x":5, "y":40},

{"flags": 2, "matrix": [0, 0], "x":0, "y": 0},
{"flags": 2, "matrix": [0, 2], "x":26, "y": 0},
{"flags": 2, "matrix": [0, 3], "x":38, "y": 0},
{"flags": 2, "matrix": [0, 4], "x":51, "y": 0},
{"flags": 2, "matrix": [0, 5], "x":64, "y": 0},
{"flags": 2, "matrix": [0, 6], "x":83, "y": 0},
{"flags": 2, "matrix": [0, 7], "x":96, "y": 0},
{"flags": 2, "matrix": [0, 8], "x":109, "y": 0},
{"flags": 2, "matrix": [0, 9], "x":122, "y": 0},
{"flags": 2, "matrix": [0,10], "x":141, "y": 0},
{"flags": 2, "matrix": [0,11], "x":154, "y": 0},
{"flags": 2, "matrix": [0,12], "x":166, "y": 0},
{"flags": 2, "matrix": [0,13], "x":179, "y": 0},
{"flags": 2, "matrix": [0,14], "x":195, "y": 0},
{"flags": 2, "matrix": [0,16], "x":221, "y": 0},

{"flags": 2, "matrix": [1, 0], "x":0, "y": 15},
{"flags": 2, "matrix": [1, 1], "x":13, "y": 15},
{"flags": 2, "matrix": [1, 2], "x":26, "y": 15},
{"flags": 2, "matrix": [1, 3], "x":38, "y": 15},
{"flags": 2, "matrix": [1, 4], "x":51, "y": 15},
{"flags": 2, "matrix": [1, 5], "x":64, "y": 15},
{"flags": 2, "matrix": [1, 6], "x":77, "y": 15},
{"flags": 2, "matrix": [1, 7], "x":90, "y": 15},
{"flags": 2, "matrix": [1, 8], "x":102, "y": 15},
{"flags": 2, "matrix": [1, 9], "x":115, "y": 15},
{"flags": 2, "matrix": [1,10], "x":128, "y": 15},
{"flags": 2, "matrix": [1,11], "x":141, "y": 15},
{"flags": 2, "matrix": [1,12], "x":154, "y": 15},
{"flags": 2, "matrix": [1,13], "x":166, "y": 15},
{"flags": 2, "matrix": [3,13], "x":179, "y": 15},
{"flags": 2, "matrix": [1,14], "x":195, "y": 15},
{"flags": 2, "matrix": [1,15], "x":208, "y": 15},
{"flags": 2, "matrix": [1,16], "x":221, "y": 15},

{"flags": 2, "matrix": [2, 0], "x":3, "y": 27},
{"flags": 2, "matrix": [2, 1], "x":19, "y": 27},
{"flags": 2, "matrix": [2, 2], "x":32, "y": 27},
{"flags": 2, "matrix": [2, 3], "x":45, "y": 27},
{"flags": 2, "matrix": [2, 4], "x":58, "y": 27},
{"flags": 2, "matrix": [2, 5], "x":70, "y": 27},
{"flags": 2, "matrix": [2, 6], "x":83, "y": 27},
{"flags": 2, "matrix": [2, 7], "x":96, "y": 27},
{"flags": 2, "matrix": [2, 8], "x":109, "y": 27},
{"flags": 2, "matrix": [2, 9], "x":122, "y": 27},
{"flags": 2, "matrix": [2,10], "x":134, "y": 27},
{"flags": 2, "matrix": [2,11], "x":147, "y": 27},
{"flags": 2, "matrix": [2,12], "x":160, "y": 27},
{"flags": 2, "matrix": [2,13], "x":176, "y": 27},
{"flags": 2, "matrix": [2,14], "x":195, "y": 27},
{"flags": 2, "matrix": [2,15], "x":208, "y": 27},
{"flags": 2, "matrix": [2,16], "x":221, "y": 27},

{"flags": 2, "matrix": [3, 1], "x":23, "y": 40},
{"flags": 2, "matrix": [3, 2], "x":36, "y": 40},
{"flags": 2, "matrix": [3, 3], "x":49, "y": 40},
{"flags": 2, "matrix": [3, 4], "x":62, "y": 40},
{"flags": 2, "matrix": [3, 5], "x":75, "y": 40},
{"flags": 2, "matrix": [3, 6], "x":88, "y": 40},
{"flags": 2, "matrix": [3, 7], "x":101, "y": 40},
{"flags": 2, "matrix": [3, 8], "x":114, "y": 40},
{"flags": 2, "matrix": [3, 9], "x":127, "y": 40},
{"flags": 2, "matrix": [3,10], "x":140, "y": 40},
{"flags": 2, "matrix": [3,11], "x":153, "y": 40},
{"flags": 2, "matrix": [3,12], "x":166, "y": 40},

{"flags": 2, "matrix": [4, 0], "x":2, "y": 52},
{"flags": 2, "matrix": [4, 1], "x":16, "y": 52},
{"flags": 2, "matrix": [4, 2], "x":29, "y": 52},
{"flags": 2, "matrix": [4, 3], "x":42, "y": 52},
{"flags": 2, "matrix": [4, 4], "x":54, "y": 52},
{"flags": 2, "matrix": [4, 5], "x":67, "y": 52},
{"flags": 2, "matrix": [4, 6], "x":80, "y": 52},
{"flags": 2, "matrix": [4, 7], "x":93, "y": 52},
{"flags": 2, "matrix": [4, 8], "x":106, "y": 52},
{"flags": 2, "matrix": [4, 9], "x":118, "y": 52},
{"flags": 2, "matrix": [4,10], "x":131, "y": 52},
{"flags": 2, "matrix": [4,11], "x":144, "y": 52},
{"flags": 2, "matrix": [4,12], "x":162, "y": 52},
{"flags": 2, "matrix": [4,13], "x":179, "y": 52},
{"flags": 2, "matrix": [4,15], "x":208, "y": 52},

{"flags": 2, "matrix": [5, 0], "x":2, "y": 64},
{"flags": 2, "matrix": [5, 1], "x":18, "y": 64},
{"flags": 2, "matrix": [5, 2], "x":34, "y": 64},
{"flags": 2, "matrix": [5, 6], "x":82, "y": 64},
{"flags": 2, "matrix": [5,10], "x":130, "y": 64},
{"flags": 2, "matrix": [5,11], "x":146, "y": 64},
{"flags": 2, "matrix": [5,12], "x":162, "y": 64},
{"flags": 2, "matrix": [5,13], "x":178, "y": 64},
{"flags": 2, "matrix": [5,14], "x":195, "y": 64},
{"flags": 2, "matrix": [5,15], "x":208, "y": 64},
{"flags": 2, "matrix": [5,16], "x":221, "y": 64}
]
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.25, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [0, 5], "x": 5.5, "y": 0},
{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 7], "x": 7.5, "y": 0},
{"matrix": [0, 8], "x": 8.5, "y": 0},
{"matrix": [0, 9], "x": 9.75, "y": 0},
{"matrix": [0,10], "x": 10.75, "y": 0},
{"matrix": [0,11], "x": 11.75, "y": 0},
{"matrix": [0,12], "x": 12.75, "y": 0},
{"matrix": [0,13], "x": 14, "y": 0},
{"matrix": [0,14], "x": 15.25, "y": 0},
{"matrix": [0,15], "x": 16.25, "y": 0},
{"matrix": [0,16], "x": 17.25, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25},
{"matrix": [1, 2], "x": 2, "y": 1.25},
{"matrix": [1, 3], "x": 3, "y": 1.25},
{"matrix": [1, 4], "x": 4, "y": 1.25},
{"matrix": [1, 5], "x": 5, "y": 1.25},
{"matrix": [1, 6], "x": 6, "y": 1.25},
{"matrix": [1, 7], "x": 7, "y": 1.25},
{"matrix": [1, 8], "x": 8, "y": 1.25},
{"matrix": [1, 9], "x": 9, "y": 1.25},
{"matrix": [1,10], "x": 10, "y": 1.25},
{"matrix": [1,11], "x": 11, "y": 1.25},
{"matrix": [1,12], "x": 12, "y": 1.25},
{"matrix": [1,13], "x": 13, "y": 1.25},
{"matrix": [3,13], "x": 14, "y": 1.25},
{"matrix": [1,14], "x": 15.25, "y": 1.25},
{"matrix": [1,15], "x": 16.25, "y": 1.25},
{"matrix": [1,16], "x": 17.25, "y": 1.25},

{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 2.25},
{"matrix": [2, 2], "x": 2.5, "y": 2.25},
{"matrix": [2, 3], "x": 3.5, "y": 2.25},
{"matrix": [2, 4], "x": 4.5, "y": 2.25},
{"matrix": [2, 5], "x": 5.5, "y": 2.25},
{"matrix": [2, 6], "x": 6.5, "y": 2.25},
{"matrix": [2, 7], "x": 7.5, "y": 2.25},
{"matrix": [2, 8], "x": 8.5, "y": 2.25},
{"matrix": [2, 9], "x": 9.5, "y": 2.25},
{"matrix": [2,10], "x": 10.5, "y": 2.25},
{"matrix": [2,11], "x": 11.5, "y": 2.25},
{"matrix": [2,12], "x": 12.5, "y": 2.25},
{"matrix": [2,13], "x": 13.5, "y": 2.25, "w": 1.5},
{"matrix": [2,14], "x": 15.25, "y": 2.25},
{"matrix": [2,15], "x": 16.25, "y": 2.25},
{"matrix": [2,16], "x": 17.25, "y": 2.25},

{"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
{"matrix": [3, 1], "x": 1.75, "y": 3.25},
{"matrix": [3, 2], "x": 2.75, "y": 3.25},
{"matrix": [3, 3], "x": 3.75, "y": 3.25},
{"matrix": [3, 4], "x": 4.75, "y": 3.25},
{"matrix": [3, 5], "x": 5.75, "y": 3.25},
{"matrix": [3, 6], "x": 6.75, "y": 3.25},
{"matrix": [3, 7], "x": 7.75, "y": 3.25},
{"matrix": [3, 8], "x": 8.75, "y": 3.25},
{"matrix": [3, 9], "x": 9.75, "y": 3.25},
{"matrix": [3,10], "x": 10.75, "y": 3.25},
{"matrix": [3,11], "x": 11.75, "y": 3.25},
{"matrix": [3,12], "x": 12.75, "y": 3.25, "w": 2.25},

{"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4.25},
{"matrix": [4, 2], "x": 2.25, "y": 4.25},
{"matrix": [4, 3], "x": 3.25, "y": 4.25},
{"matrix": [4, 4], "x": 4.25, "y": 4.25},
{"matrix": [4, 5], "x": 5.25, "y": 4.25},
{"matrix": [4, 6], "x": 6.25, "y": 4.25},
{"matrix": [4, 7], "x": 7.25, "y": 4.25},
{"matrix": [4, 8], "x": 8.25, "y": 4.25},
{"matrix": [4, 9], "x": 9.25, "y": 4.25},
{"matrix": [4,10], "x": 10.25, "y": 4.25},
{"matrix": [4,11], "x": 11.25, "y": 4.25},
{"matrix": [4,12], "x": 12.25, "y": 4.25, "w": 1.75},
{"matrix": [4,13], "x": 14, "y": 4.25},
{"matrix": [4,15], "x": 16.25, "y": 4.25},

{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
{"matrix": [5,10], "x": 10, "y": 5.25, "w": 1.25},
{"matrix": [5,11], "x": 11.25, "y": 5.25, "w": 1.25},
{"matrix": [5,12], "x": 12.5, "y": 5.25, "w": 1.25},
{"matrix": [5,13], "x": 13.75, "y": 5.25, "w": 1.25},
{"matrix": [5,14], "x": 15.25, "y": 5.25},
{"matrix": [5,15], "x": 16.25, "y": 5.25},
{"matrix": [5,16], "x": 17.25, "y": 5.25}
]
}
}
}
30 changes: 30 additions & 0 deletions keyboards/bachoo/x88/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// 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(
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_F13, KC_PSCR, KC_SCRL, KC_PAUS,
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_BSPC, KC_INS, KC_HOME, 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_DEL, KC_END, 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_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
};

#ifdef RGB_MATRIX_ENABLE
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
led_t led_state = host_keyboard_led_state();
if (!led_state.scroll_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
}

if (!led_state.caps_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
}

return true;
}
#endif
9 changes: 9 additions & 0 deletions keyboards/bachoo/x88/keymaps/vial/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */

#pragma once

#define VIAL_KEYBOARD_UID {0x66, 0xF7, 0x19, 0x9C, 0xDC, 0x61, 0xEF, 0x69}

// Unlock combo is Esc + Enter
#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
#define VIAL_UNLOCK_COMBO_COLS { 0, 12 }
30 changes: 30 additions & 0 deletions keyboards/bachoo/x88/keymaps/vial/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// 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(
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_F13, KC_PSCR, KC_SCRL, KC_PAUS,
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_BSPC, KC_INS, KC_HOME, 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_DEL, KC_END, 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_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
};

#ifdef RGB_MATRIX_ENABLE
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
led_t led_state = host_keyboard_led_state();
if (!led_state.scroll_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
}

if (!led_state.caps_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
}

return true;
}
#endif
4 changes: 4 additions & 0 deletions keyboards/bachoo/x88/keymaps/vial/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VIA_ENABLE = yes
VIAL_ENABLE = yes

VIALRGB_ENABLE = yes
Loading

0 comments on commit dc1d29a

Please sign in to comment.