From 98f0c5ee249fdbc80755b7a086dc066cda16018e Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Thu, 1 Feb 2024 04:56:05 -0700 Subject: [PATCH] Fixup doio/kb16 (#22921) --- keyboards/doio/kb16/{rev1 => }/config.h | 0 keyboards/doio/kb16/info.json | 109 ++++++++++++++ keyboards/doio/kb16/kb16.c | 21 +-- .../keymaps/via => keymaps/default}/keymap.c | 0 .../kb16/{rev1 => }/keymaps/default/rules.mk | 0 .../doio/kb16/{rev2 => }/keymaps/via/keymap.c | 0 .../doio/kb16/{rev1 => }/keymaps/via/rules.mk | 0 keyboards/doio/kb16/rev1/info.json | 83 +---------- .../doio/kb16/rev1/keymaps/default/keymap.c | 140 ------------------ keyboards/doio/kb16/rev1/rules.mk | 26 ---- keyboards/doio/kb16/rev2/config.h | 3 - keyboards/doio/kb16/rev2/info.json | 80 +--------- .../doio/kb16/rev2/keymaps/default/keymap.c | 140 ------------------ .../doio/kb16/rev2/keymaps/default/rules.mk | 2 - keyboards/doio/kb16/rev2/keymaps/via/rules.mk | 4 - keyboards/doio/kb16/rev2/rules.mk | 22 --- 16 files changed, 118 insertions(+), 512 deletions(-) rename keyboards/doio/kb16/{rev1 => }/config.h (100%) create mode 100644 keyboards/doio/kb16/info.json rename keyboards/doio/kb16/{rev1/keymaps/via => keymaps/default}/keymap.c (100%) rename keyboards/doio/kb16/{rev1 => }/keymaps/default/rules.mk (100%) rename keyboards/doio/kb16/{rev2 => }/keymaps/via/keymap.c (100%) rename keyboards/doio/kb16/{rev1 => }/keymaps/via/rules.mk (100%) delete mode 100644 keyboards/doio/kb16/rev1/keymaps/default/keymap.c delete mode 100644 keyboards/doio/kb16/rev2/keymaps/default/keymap.c delete mode 100644 keyboards/doio/kb16/rev2/keymaps/default/rules.mk delete mode 100644 keyboards/doio/kb16/rev2/keymaps/via/rules.mk diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/config.h similarity index 100% rename from keyboards/doio/kb16/rev1/config.h rename to keyboards/doio/kb16/config.h diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json new file mode 100644 index 0000000000..cadfabdf86 --- /dev/null +++ b/keyboards/doio/kb16/info.json @@ -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} + ] + } + } +} diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c index 05f5792ea7..bfb491c4c2 100644 --- a/keyboards/doio/kb16/kb16.c +++ b/keyboards/doio/kb16/kb16.c @@ -26,7 +26,7 @@ #endif #ifdef OLED_ENABLE - uint16_t startup_timer; + uint16_t startup_timer; oled_rotation_t oled_init_kb(oled_rotation_t rotation) { startup_timer = timer_read(); @@ -48,22 +48,3 @@ return true; } #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 diff --git a/keyboards/doio/kb16/rev1/keymaps/via/keymap.c b/keyboards/doio/kb16/keymaps/default/keymap.c similarity index 100% rename from keyboards/doio/kb16/rev1/keymaps/via/keymap.c rename to keyboards/doio/kb16/keymaps/default/keymap.c diff --git a/keyboards/doio/kb16/rev1/keymaps/default/rules.mk b/keyboards/doio/kb16/keymaps/default/rules.mk similarity index 100% rename from keyboards/doio/kb16/rev1/keymaps/default/rules.mk rename to keyboards/doio/kb16/keymaps/default/rules.mk diff --git a/keyboards/doio/kb16/rev2/keymaps/via/keymap.c b/keyboards/doio/kb16/keymaps/via/keymap.c similarity index 100% rename from keyboards/doio/kb16/rev2/keymaps/via/keymap.c rename to keyboards/doio/kb16/keymaps/via/keymap.c diff --git a/keyboards/doio/kb16/rev1/keymaps/via/rules.mk b/keyboards/doio/kb16/keymaps/via/rules.mk similarity index 100% rename from keyboards/doio/kb16/rev1/keymaps/via/rules.mk rename to keyboards/doio/kb16/keymaps/via/rules.mk diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index 74a5b5388b..fc9b30a20a 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -1,56 +1,16 @@ { - "keyboard_name": "KB16-01", - "manufacturer": "DOIO", - "url": "", - "maintainer": "HorrorTroll", "usb": { - "vid": "0xD010", - "pid": "0x1601", - "device_version": "0.0.1", - "force_nkro": true + "device_version": "0.0.1" }, - "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 + "features": { + "grave_esc": false, + "space_cadet": false, + "magic": false }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B7"], "rows": ["D5", "D4", "D3", "D2"] }, - "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "E6"}, @@ -62,36 +22,5 @@ "pin": "F6" }, "processor": "atmega32u4", - "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} - ] - } - } + "bootloader": "atmel-dfu" } diff --git a/keyboards/doio/kb16/rev1/keymaps/default/keymap.c b/keyboards/doio/kb16/rev1/keymaps/default/keymap.c deleted file mode 100644 index 1217a3c788..0000000000 --- a/keyboards/doio/kb16/rev1/keymaps/default/keymap.c +++ /dev/null @@ -1,140 +0,0 @@ -/* Copyright 2022 DOIO - * Copyright 2022 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 . - */ - -#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), - _______, _______, _______, _______, _______, - _______, _______, _______, _______ - ), - -/* - ┌───┬───┬───┬───┐ ┌───┐ ┌───┐ - │Spi│Spd│ │ │ │ │ │TO0│ - ├───┼───┼───┼───┤ └───┘ └───┘ - │Sai│Sad│ │ │ - ├───┼───┼───┼───┤ - │Tog│Mod│Hui│ │ ┌───┐ - ├───┼───┼───┼───┤ │ │ - │ │Vai│Hud│Vad│ └───┘ - └───┴───┴───┴───┘ -*/ - /* 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 diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk index b234c1ca6a..8fc28d6480 100644 --- a/keyboards/doio/kb16/rev1/rules.mk +++ b/keyboards/doio/kb16/rev1/rules.mk @@ -1,28 +1,2 @@ SRC += ./lib/layer_status/layer_status.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 diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h index 93cd1ab3a8..ebe78d363b 100644 --- a/keyboards/doio/kb16/rev2/config.h +++ b/keyboards/doio/kb16/rev2/config.h @@ -22,7 +22,4 @@ #define I2C1_SCL_PIN B10 #define I2C1_SDA_PIN B11 #define I2C_DRIVER I2CD2 - - /* Use the custom font */ - #define OLED_FONT_H "./lib/glcdfont.c" #endif diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index 294575263d..b3f14e180d 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -1,56 +1,11 @@ { - "keyboard_name": "KB16-01", - "manufacturer": "DOIO", - "url": "", - "maintainer": "HorrorTroll", "usb": { - "vid": "0xD010", - "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 + "device_version": "0.0.2" }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B0", "A7"], "rows": ["B3", "B4", "B9", "B8"] }, - "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"}, @@ -62,36 +17,5 @@ "pin": "A10" }, "processor": "STM32F103", - "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} - ] - } - } + "bootloader": "stm32duino" } diff --git a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c b/keyboards/doio/kb16/rev2/keymaps/default/keymap.c deleted file mode 100644 index 1217a3c788..0000000000 --- a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c +++ /dev/null @@ -1,140 +0,0 @@ -/* Copyright 2022 DOIO - * Copyright 2022 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 . - */ - -#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), - _______, _______, _______, _______, _______, - _______, _______, _______, _______ - ), - -/* - ┌───┬───┬───┬───┐ ┌───┐ ┌───┐ - │Spi│Spd│ │ │ │ │ │TO0│ - ├───┼───┼───┼───┤ └───┘ └───┘ - │Sai│Sad│ │ │ - ├───┼───┼───┼───┤ - │Tog│Mod│Hui│ │ ┌───┐ - ├───┼───┼───┼───┤ │ │ - │ │Vai│Hud│Vad│ └───┘ - └───┴───┴───┴───┘ -*/ - /* 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 diff --git a/keyboards/doio/kb16/rev2/keymaps/default/rules.mk b/keyboards/doio/kb16/rev2/keymaps/default/rules.mk deleted file mode 100644 index 00003ba11b..0000000000 --- a/keyboards/doio/kb16/rev2/keymaps/default/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Encoder enabled -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/doio/kb16/rev2/keymaps/via/rules.mk b/keyboards/doio/kb16/rev2/keymaps/via/rules.mk deleted file mode 100644 index d76c12896f..0000000000 --- a/keyboards/doio/kb16/rev2/keymaps/via/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -VIA_ENABLE = yes - -# Encoder enabled -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk index 2145c9fbe1..e9bb89acc7 100644 --- a/keyboards/doio/kb16/rev2/rules.mk +++ b/keyboards/doio/kb16/rev2/rules.mk @@ -3,25 +3,3 @@ SRC += ./lib/logo.c # Configure for 128K flash 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