Fixup doio/kb16 (#22921)

This commit is contained in:
jack 2024-02-01 04:56:05 -07:00 committed by GitHub
parent c390292e1c
commit 98f0c5ee24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 118 additions and 512 deletions

View file

@ -0,0 +1,109 @@
{
"keyboard_name": "KB16-01",
"manufacturer": "DOIO",
"maintainer": "HorrorTroll",
"usb": {
"vid": "0xD010",
"pid": "0x1601",
"force_nkro": true
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"oled": true,
"rgb_matrix": true,
"encoder": true
},
"build": {
"lto": true
},
"rgb_matrix": {
"driver": "ws2812",
"max_brightness": 200,
"default": {
"animation": "cycle_up_down"
},
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
{"matrix": [1, 1], "x": 75, "y": 21, "flags": 4},
{"matrix": [1, 2], "x": 149, "y": 21, "flags": 4},
{"matrix": [1, 3], "x": 224, "y": 21, "flags": 1},
{"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
{"matrix": [2, 1], "x": 75, "y": 43, "flags": 4},
{"matrix": [2, 2], "x": 149, "y": 43, "flags": 4},
{"matrix": [2, 3], "x": 224, "y": 43, "flags": 1},
{"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
{"matrix": [3, 1], "x": 75, "y": 64, "flags": 1},
{"matrix": [3, 2], "x": 149, "y": 64, "flags": 1},
{"matrix": [3, 3], "x": 224, "y": 64, "flags": 1}
],
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"cycle_all": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_pinwheel": true,
"dual_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_multiwide": true,
"solid_reactive_multicross": true,
"solid_reactive_multinexus": true,
"multisplash": true,
"solid_multisplash": true
}
},
"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.75, "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": 6, "y": 0},
{"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": 5.375, "y": 2.5},
{"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}
]
}
}
}

View file

@ -26,7 +26,7 @@
#endif #endif
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
uint16_t startup_timer; uint16_t startup_timer;
oled_rotation_t oled_init_kb(oled_rotation_t rotation) { oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
startup_timer = timer_read(); startup_timer = timer_read();
@ -48,22 +48,3 @@
return true; return true;
} }
#endif #endif
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
{ 0, 1, 2, 3, NO_LED },
{ 4, 5, 6, 7, NO_LED },
{ 8, 9, 10, 11, NO_LED },
{ 12, 13, 14, 15, NO_LED }
}, {
{0 , 0}, {75 , 0}, {149, 0}, {224, 0},
{0 , 21}, {75 , 21}, {149, 21}, {224, 21},
{0 , 43}, {75 , 43}, {149, 43}, {224, 43},
{0 , 64}, {75 , 64}, {149, 64}, {224, 64},
}, {
1, 1, 1, 1,
1, 4, 4, 1,
1, 4, 4, 1,
1, 1, 1, 1,
} };
#endif

View file

@ -1,56 +1,16 @@
{ {
"keyboard_name": "KB16-01",
"manufacturer": "DOIO",
"url": "",
"maintainer": "HorrorTroll",
"usb": { "usb": {
"vid": "0xD010", "device_version": "0.0.1"
"pid": "0x1601",
"device_version": "0.0.1",
"force_nkro": true
}, },
"rgb_matrix": { "features": {
"animations": { "grave_esc": false,
"alphas_mods": true, "space_cadet": false,
"gradient_up_down": true, "magic": false
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"cycle_all": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_pinwheel": true,
"dual_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,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_multiwide": true,
"solid_reactive_multicross": true,
"solid_reactive_multinexus": true,
"multisplash": true,
"solid_multisplash": true
},
"default": {
"animation": "cycle_up_down"
},
"driver": "ws2812",
"max_brightness": 200
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F5", "F4", "F1", "F0", "B7"], "cols": ["F5", "F4", "F1", "F0", "B7"],
"rows": ["D5", "D4", "D3", "D2"] "rows": ["D5", "D4", "D3", "D2"]
}, },
"diode_direction": "COL2ROW",
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "F7", "pin_b": "E6"}, {"pin_a": "F7", "pin_b": "E6"},
@ -62,36 +22,5 @@
"pin": "F6" "pin": "F6"
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu"
"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.75, "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": 6, "y": 0},
{"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": 5.375, "y": 2.5},
{"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}
]
}
}
} }

View file

@ -1,140 +0,0 @@
/* Copyright 2022 DOIO
* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
// OLED animation
#include "./lib/layer_status/layer_status.h"
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum layer_names {
_BASE,
_FN,
_FN1,
_FN2
};
// enum layer_keycodes { };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
1 2 3 4 Ply TO1
5 6 7 8
9 0 Ent
Mut
Fn2
! @ # $
% ^ & *
( )
*/
/* Row: 0 1 2 3 4 */
[_BASE] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_MPLY,
KC_5, KC_6, KC_7, KC_8, TO(_FN),
KC_9, KC_0, KC_UP, KC_ENT, KC_MUTE,
MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
),
/*
*/
/* Row: 0 1 2 3 4 */
[_FN] = LAYOUT(
_______, _______, _______, _______, _______,
_______, _______, _______, _______, TO(_FN1),
_______, _______, _______, _______, _______,
_______, _______, _______, _______
),
/*
*/
/* Row: 0 1 2 3 4 */
[_FN1] = LAYOUT(
_______, _______, _______, _______, _______,
_______, _______, _______, _______, TO(_FN2),
_______, _______, _______, _______, _______,
_______, _______, _______, _______
),
/*
SpiSpd TO0
SaiSad
TogModHui
VaiHudVad
*/
/* Row: 0 1 2 3 4 */
[_FN2] = LAYOUT(
RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
_______, RGB_VAI, RGB_HUD, RGB_VAD
),
};
#ifdef OLED_ENABLE
bool oled_task_user(void) {
render_layer_status();
return true;
}
#endif
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif

View file

@ -1,28 +1,2 @@
SRC += ./lib/layer_status/layer_status.c SRC += ./lib/layer_status/layer_status.c
SRC += ./lib/logo.c SRC += ./lib/logo.c
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
# Additional thing to reduce compiled size
LTO_ENABLE = yes
SPACE_CADET_ENABLE = no
# OLED enabled
OLED_ENABLE = yes
# RGB Matrix enabled
RGB_MATRIX_ENABLE = yes
# Encoder enabled
ENCODER_ENABLE = yes

View file

@ -22,7 +22,4 @@
#define I2C1_SCL_PIN B10 #define I2C1_SCL_PIN B10
#define I2C1_SDA_PIN B11 #define I2C1_SDA_PIN B11
#define I2C_DRIVER I2CD2 #define I2C_DRIVER I2CD2
/* Use the custom font */
#define OLED_FONT_H "./lib/glcdfont.c"
#endif #endif

View file

@ -1,56 +1,11 @@
{ {
"keyboard_name": "KB16-01",
"manufacturer": "DOIO",
"url": "",
"maintainer": "HorrorTroll",
"usb": { "usb": {
"vid": "0xD010", "device_version": "0.0.2"
"pid": "0x1601",
"device_version": "0.0.2",
"force_nkro": true
},
"rgb_matrix": {
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"cycle_all": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_pinwheel": true,
"dual_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,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_multiwide": true,
"solid_reactive_multicross": true,
"solid_reactive_multinexus": true,
"multisplash": true,
"solid_multisplash": true
},
"default": {
"animation": "cycle_up_down"
},
"driver": "ws2812",
"max_brightness": 200
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B14", "B13", "B12", "B0", "A7"], "cols": ["B14", "B13", "B12", "B0", "A7"],
"rows": ["B3", "B4", "B9", "B8"] "rows": ["B3", "B4", "B9", "B8"]
}, },
"diode_direction": "COL2ROW",
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "B5", "pin_b": "B6"}, {"pin_a": "B5", "pin_b": "B6"},
@ -62,36 +17,5 @@
"pin": "A10" "pin": "A10"
}, },
"processor": "STM32F103", "processor": "STM32F103",
"bootloader": "stm32duino", "bootloader": "stm32duino"
"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.75, "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": 6, "y": 0},
{"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": 5.375, "y": 2.5},
{"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}
]
}
}
} }

View file

@ -1,140 +0,0 @@
/* Copyright 2022 DOIO
* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
// OLED animation
#include "./lib/layer_status/layer_status.h"
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum layer_names {
_BASE,
_FN,
_FN1,
_FN2
};
// enum layer_keycodes { };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
1 2 3 4 Ply TO1
5 6 7 8
9 0 Ent
Mut
Fn2
! @ # $
% ^ & *
( )
*/
/* Row: 0 1 2 3 4 */
[_BASE] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_MPLY,
KC_5, KC_6, KC_7, KC_8, TO(_FN),
KC_9, KC_0, KC_UP, KC_ENT, KC_MUTE,
MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
),
/*
*/
/* Row: 0 1 2 3 4 */
[_FN] = LAYOUT(
_______, _______, _______, _______, _______,
_______, _______, _______, _______, TO(_FN1),
_______, _______, _______, _______, _______,
_______, _______, _______, _______
),
/*
*/
/* Row: 0 1 2 3 4 */
[_FN1] = LAYOUT(
_______, _______, _______, _______, _______,
_______, _______, _______, _______, TO(_FN2),
_______, _______, _______, _______, _______,
_______, _______, _______, _______
),
/*
SpiSpd TO0
SaiSad
TogModHui
VaiHudVad
*/
/* Row: 0 1 2 3 4 */
[_FN2] = LAYOUT(
RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
_______, RGB_VAI, RGB_HUD, RGB_VAD
),
};
#ifdef OLED_ENABLE
bool oled_task_user(void) {
render_layer_status();
return true;
}
#endif
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif

View file

@ -1,2 +0,0 @@
# Encoder enabled
ENCODER_MAP_ENABLE = yes

View file

@ -1,4 +0,0 @@
VIA_ENABLE = yes
# Encoder enabled
ENCODER_MAP_ENABLE = yes

View file

@ -3,25 +3,3 @@ SRC += ./lib/logo.c
# Configure for 128K flash # Configure for 128K flash
MCU_LDSCRIPT = STM32F103xB MCU_LDSCRIPT = STM32F103xB
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
# OLED enabled
OLED_ENABLE = yes
# RGB Matrix enabled
RGB_MATRIX_ENABLE = yes
# Encoder enabled
ENCODER_ENABLE = yes