From 9d741510537c4b5da303680e15f7aea1410adf08 Mon Sep 17 00:00:00 2001 From: cBachoo Date: Wed, 21 Aug 2024 01:30:04 -0400 Subject: [PATCH] add x88 keyboard pcb (#773) * add x88 pcb and move other pcbs in my folder * fix default keymap issue --- keyboards/{ => bachoo}/crin/keyboard.json | 0 .../crin/keymaps/default/keymap.c | 0 .../{ => bachoo}/crin/keymaps/via/keymap.c | 0 .../{ => bachoo}/crin/keymaps/via/rules.mk | 0 keyboards/{ => bachoo}/crin/readme.md | 0 keyboards/{ => bachoo}/nemui/chconf.h | 0 keyboards/{ => bachoo}/nemui/halconf.h | 0 keyboards/{ => bachoo}/nemui/keyboard.json | 0 .../nemui/keymaps/default/keymap.c | 0 .../{ => bachoo}/nemui/keymaps/via/keymap.c | 0 .../{ => bachoo}/nemui/keymaps/via/rules.mk | 0 keyboards/{ => bachoo}/nemui/mcuconf.h | 0 keyboards/{ => bachoo}/nemui/readme.md | 0 keyboards/bachoo/x88/config.h | 10 + keyboards/bachoo/x88/halconf.h | 8 + keyboards/bachoo/x88/keyboard.json | 279 ++++++++++++++++++ keyboards/bachoo/x88/keymaps/default/keymap.c | 30 ++ keyboards/bachoo/x88/keymaps/vial/config.h | 9 + keyboards/bachoo/x88/keymaps/vial/keymap.c | 30 ++ keyboards/bachoo/x88/keymaps/vial/rules.mk | 4 + keyboards/bachoo/x88/keymaps/vial/vial.json | 33 +++ keyboards/bachoo/x88/mcuconf.h | 9 + keyboards/bachoo/x88/readme.md | 27 ++ 23 files changed, 439 insertions(+) rename keyboards/{ => bachoo}/crin/keyboard.json (100%) rename keyboards/{ => bachoo}/crin/keymaps/default/keymap.c (100%) rename keyboards/{ => bachoo}/crin/keymaps/via/keymap.c (100%) rename keyboards/{ => bachoo}/crin/keymaps/via/rules.mk (100%) rename keyboards/{ => bachoo}/crin/readme.md (100%) rename keyboards/{ => bachoo}/nemui/chconf.h (100%) rename keyboards/{ => bachoo}/nemui/halconf.h (100%) rename keyboards/{ => bachoo}/nemui/keyboard.json (100%) rename keyboards/{ => bachoo}/nemui/keymaps/default/keymap.c (100%) rename keyboards/{ => bachoo}/nemui/keymaps/via/keymap.c (100%) rename keyboards/{ => bachoo}/nemui/keymaps/via/rules.mk (100%) rename keyboards/{ => bachoo}/nemui/mcuconf.h (100%) rename keyboards/{ => bachoo}/nemui/readme.md (100%) create mode 100644 keyboards/bachoo/x88/config.h create mode 100644 keyboards/bachoo/x88/halconf.h create mode 100644 keyboards/bachoo/x88/keyboard.json create mode 100644 keyboards/bachoo/x88/keymaps/default/keymap.c create mode 100644 keyboards/bachoo/x88/keymaps/vial/config.h create mode 100644 keyboards/bachoo/x88/keymaps/vial/keymap.c create mode 100644 keyboards/bachoo/x88/keymaps/vial/rules.mk create mode 100644 keyboards/bachoo/x88/keymaps/vial/vial.json create mode 100644 keyboards/bachoo/x88/mcuconf.h create mode 100644 keyboards/bachoo/x88/readme.md diff --git a/keyboards/crin/keyboard.json b/keyboards/bachoo/crin/keyboard.json similarity index 100% rename from keyboards/crin/keyboard.json rename to keyboards/bachoo/crin/keyboard.json diff --git a/keyboards/crin/keymaps/default/keymap.c b/keyboards/bachoo/crin/keymaps/default/keymap.c similarity index 100% rename from keyboards/crin/keymaps/default/keymap.c rename to keyboards/bachoo/crin/keymaps/default/keymap.c diff --git a/keyboards/crin/keymaps/via/keymap.c b/keyboards/bachoo/crin/keymaps/via/keymap.c similarity index 100% rename from keyboards/crin/keymaps/via/keymap.c rename to keyboards/bachoo/crin/keymaps/via/keymap.c diff --git a/keyboards/crin/keymaps/via/rules.mk b/keyboards/bachoo/crin/keymaps/via/rules.mk similarity index 100% rename from keyboards/crin/keymaps/via/rules.mk rename to keyboards/bachoo/crin/keymaps/via/rules.mk diff --git a/keyboards/crin/readme.md b/keyboards/bachoo/crin/readme.md similarity index 100% rename from keyboards/crin/readme.md rename to keyboards/bachoo/crin/readme.md diff --git a/keyboards/nemui/chconf.h b/keyboards/bachoo/nemui/chconf.h similarity index 100% rename from keyboards/nemui/chconf.h rename to keyboards/bachoo/nemui/chconf.h diff --git a/keyboards/nemui/halconf.h b/keyboards/bachoo/nemui/halconf.h similarity index 100% rename from keyboards/nemui/halconf.h rename to keyboards/bachoo/nemui/halconf.h diff --git a/keyboards/nemui/keyboard.json b/keyboards/bachoo/nemui/keyboard.json similarity index 100% rename from keyboards/nemui/keyboard.json rename to keyboards/bachoo/nemui/keyboard.json diff --git a/keyboards/nemui/keymaps/default/keymap.c b/keyboards/bachoo/nemui/keymaps/default/keymap.c similarity index 100% rename from keyboards/nemui/keymaps/default/keymap.c rename to keyboards/bachoo/nemui/keymaps/default/keymap.c diff --git a/keyboards/nemui/keymaps/via/keymap.c b/keyboards/bachoo/nemui/keymaps/via/keymap.c similarity index 100% rename from keyboards/nemui/keymaps/via/keymap.c rename to keyboards/bachoo/nemui/keymaps/via/keymap.c diff --git a/keyboards/nemui/keymaps/via/rules.mk b/keyboards/bachoo/nemui/keymaps/via/rules.mk similarity index 100% rename from keyboards/nemui/keymaps/via/rules.mk rename to keyboards/bachoo/nemui/keymaps/via/rules.mk diff --git a/keyboards/nemui/mcuconf.h b/keyboards/bachoo/nemui/mcuconf.h similarity index 100% rename from keyboards/nemui/mcuconf.h rename to keyboards/bachoo/nemui/mcuconf.h diff --git a/keyboards/nemui/readme.md b/keyboards/bachoo/nemui/readme.md similarity index 100% rename from keyboards/nemui/readme.md rename to keyboards/bachoo/nemui/readme.md diff --git a/keyboards/bachoo/x88/config.h b/keyboards/bachoo/x88/config.h new file mode 100644 index 0000000000..48b2f2ff37 --- /dev/null +++ b/keyboards/bachoo/x88/config.h @@ -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 \ No newline at end of file diff --git a/keyboards/bachoo/x88/halconf.h b/keyboards/bachoo/x88/halconf.h new file mode 100644 index 0000000000..2c01239b3e --- /dev/null +++ b/keyboards/bachoo/x88/halconf.h @@ -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 \ No newline at end of file diff --git a/keyboards/bachoo/x88/keyboard.json b/keyboards/bachoo/x88/keyboard.json new file mode 100644 index 0000000000..2d684dc11e --- /dev/null +++ b/keyboards/bachoo/x88/keyboard.json @@ -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} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/bachoo/x88/keymaps/default/keymap.c b/keyboards/bachoo/x88/keymaps/default/keymap.c new file mode 100644 index 0000000000..7fbddc1bd6 --- /dev/null +++ b/keyboards/bachoo/x88/keymaps/default/keymap.c @@ -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 \ No newline at end of file diff --git a/keyboards/bachoo/x88/keymaps/vial/config.h b/keyboards/bachoo/x88/keymaps/vial/config.h new file mode 100644 index 0000000000..3be2c80e5e --- /dev/null +++ b/keyboards/bachoo/x88/keymaps/vial/config.h @@ -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 } \ No newline at end of file diff --git a/keyboards/bachoo/x88/keymaps/vial/keymap.c b/keyboards/bachoo/x88/keymaps/vial/keymap.c new file mode 100644 index 0000000000..7fbddc1bd6 --- /dev/null +++ b/keyboards/bachoo/x88/keymaps/vial/keymap.c @@ -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 \ No newline at end of file diff --git a/keyboards/bachoo/x88/keymaps/vial/rules.mk b/keyboards/bachoo/x88/keymaps/vial/rules.mk new file mode 100644 index 0000000000..95572e946b --- /dev/null +++ b/keyboards/bachoo/x88/keymaps/vial/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes + +VIALRGB_ENABLE = yes \ No newline at end of file diff --git a/keyboards/bachoo/x88/keymaps/vial/vial.json b/keyboards/bachoo/x88/keymaps/vial/vial.json new file mode 100644 index 0000000000..0479f5733b --- /dev/null +++ b/keyboards/bachoo/x88/keymaps/vial/vial.json @@ -0,0 +1,33 @@ +{ + "name": "X88", + "vendorId": "0xC04C", + "productId": "0x1001", + "menus": ["qmk_rgb_matrix"], + "lighting": "vialrgb", + "matrix": {"rows": 6, "cols": 17}, + "layouts": { + "labels": [ + ["F-row", "F12", "F13"], + ["Backspace", "Full", "Split"], + ["Enter", "ANSI", "ISO"], + ["Left Shift", "Full", "Split"], + ["Right Shift", "Full", "Split"], + ["Bottom Row", "6.25u", "7u", "7u WKL"] + ], + "keymap": [ + [{"c":"#777777"},"0,0\n\n\n0,0",{"x":1,"c":"#aaaaaa"},"0,2\n\n\n0,0","0,3\n\n\n0,0","0,4\n\n\n0,0","0,5\n\n\n0,0",{"x":0.5},"0,6\n\n\n0,0","0,7\n\n\n0,0","0,8\n\n\n0,0","0,9\n\n\n0,0",{"x":0.5},"0,10\n\n\n0,0","0,11\n\n\n0,0","0,12\n\n\n0,0","0,13\n\n\n0,0",{"x":0.25},"0,14","0,15","0,16"], + [{"y":0.25,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13\n\n\n1,0",{"x":0.25},"1,14","1,15","1,16"], + [{"w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"2,13\n\n\n2,0",{"x":0.25,"c":"#aaaaaa"},"2,14","2,15","2,16"], + [{"w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,12\n\n\n2,0"], + [{"c":"#aaaaaa","w":2.25},"4,0\n\n\n3,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":2.75},"4,12\n\n\n4,0",{"x":1.25,"c":"#777777"},"4,15"], + [{"c":"#aaaaaa","w":1.25},"5,0\n\n\n5,0",{"w":1.25},"5,1\n\n\n5,0",{"w":1.25},"5,2\n\n\n5,0",{"c":"#cccccc","w":6.25},"5,6\n\n\n5,0",{"c":"#aaaaaa","w":1.25},"5,10\n\n\n5,0",{"w":1.25},"5,11\n\n\n5,0",{"w":1.25},"5,12\n\n\n5,0",{"w":1.25},"5,13\n\n\n5,0",{"x":0.25,"c":"#777777"},"5,14","5,15","5,16"], + [{"y":0.25},"0,0\n\n\n0,1",{"x":0.25,"c":"#aaaaaa"},"0,1\n\n\n0,1","0,2\n\n\n0,1","0,3\n\n\n0,1","0,4\n\n\n0,1",{"x":0.25},"0,5\n\n\n0,1","0,6\n\n\n0,1","0,7\n\n\n0,1","0,8\n\n\n0,1",{"x":0.25},"0,9\n\n\n0,1","0,10\n\n\n0,1","0,11\n\n\n0,1","0,12\n\n\n0,1",{"x":0.25},"0,13\n\n\n0,1"], + [{"w":1.25},"4,0\n\n\n3,1",{"c":"#cccccc"},"4,1\n\n\n3,1",{"x":10.75,"c":"#aaaaaa"},"1,13\n\n\n1,1","3,13\n\n\n1,1"], + [{"x":13.75,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"2,13\n\n\n2,1"], + [{"x":12.75,"c":"#cccccc"},"3,12\n\n\n2,1"], + [{"x":12.25,"c":"#aaaaaa","w":1.75},"4,12\n\n\n4,1","4,13\n\n\n4,1"], + [{"w":1.5},"5,0\n\n\n5,1","5,1\n\n\n5,1",{"w":1.5},"5,2\n\n\n5,1",{"c":"#cccccc","w":7},"5,6\n\n\n5,1",{"c":"#aaaaaa","w":1.5},"5,11\n\n\n5,1","5,12\n\n\n5,1",{"w":1.5},"5,13\n\n\n5,1"], + [{"w":1.5},"5,0\n\n\n5,2",{"d":true},"5,1\n\n\n5,2",{"w":1.5},"5,2\n\n\n5,2",{"c":"#cccccc","w":7},"5,6\n\n\n5,2",{"c":"#aaaaaa","w":1.5},"5,11\n\n\n5,2",{"d":true},"5,12\n\n\n5,2",{"w":1.5},"5,13\n\n\n5,2"] + ] + } +} \ No newline at end of file diff --git a/keyboards/bachoo/x88/mcuconf.h b/keyboards/bachoo/x88/mcuconf.h new file mode 100644 index 0000000000..2d62025c2d --- /dev/null +++ b/keyboards/bachoo/x88/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 Bachoo (@cBachoo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE \ No newline at end of file diff --git a/keyboards/bachoo/x88/readme.md b/keyboards/bachoo/x88/readme.md new file mode 100644 index 0000000000..e8f4637eed --- /dev/null +++ b/keyboards/bachoo/x88/readme.md @@ -0,0 +1,27 @@ +# x88 + +![x88](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Bachoo](https://github.com/cBachoo) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make x88:default + +Flashing example for this keyboard: + + make x88: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