diff --git a/keyboards/keycapsss/kimiko/keymaps/vial/glcdfont.c b/keyboards/keycapsss/kimiko/glcdfont.c similarity index 92% rename from keyboards/keycapsss/kimiko/keymaps/vial/glcdfont.c rename to keyboards/keycapsss/kimiko/glcdfont.c index 19d45a75c7..4c7e6862b6 100644 --- a/keyboards/keycapsss/kimiko/keymaps/vial/glcdfont.c +++ b/keyboards/keycapsss/kimiko/glcdfont.c @@ -1,3 +1,20 @@ +/* Copyright 2019 MechMerlin + * Copyright 2020 @ben_roe (keycapsss.com) + * + * 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 "progmem.h" // Corne 8x6 font diff --git a/keyboards/keycapsss/kimiko/info.json b/keyboards/keycapsss/kimiko/info.json new file mode 100644 index 0000000000..a962104c56 --- /dev/null +++ b/keyboards/keycapsss/kimiko/info.json @@ -0,0 +1,9 @@ +{ + "features": { + "mousekey": true, + "extrakey": true + }, + "split": { + "enabled": true + } +} diff --git a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk deleted file mode 100644 index ef4f0c0b43..0000000000 --- a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -OLED_ENABLE = yes -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - -# LTO: Link Time Optimizations. -# Reduce compiled size, but will automatically disable the legacy TMK Macros and Functions features. -# This does not affect QMK Macros and Layers -LTO_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h index 2fd384b986..f52a0fecae 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h +++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h @@ -23,7 +23,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/rgb_matrix/glcdfont.c" +#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c" // #define OLED_FONT_WIDTH 5 // #define OLED_FONT_HEIGHT 7 diff --git a/keyboards/keycapsss/kimiko/keymaps/vial/rules.mk b/keyboards/keycapsss/kimiko/keymaps/vial/rules.mk deleted file mode 100644 index 75d63474a0..0000000000 --- a/keyboards/keycapsss/kimiko/keymaps/vial/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays - -VIA_ENABLE = yes # Enable via support -VIAL_ENABLE = yes # Enable vial support - -LTO_ENABLE = yes - -QMK_SETTINGS = no -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c index 041387ad53..ce5703d86b 100644 --- a/keyboards/keycapsss/kimiko/kimiko.c +++ b/keyboards/keycapsss/kimiko/kimiko.c @@ -1,4 +1,4 @@ -/* Copyright 2020 @ben_roe (keycapsss.com) +/* Copyright 2023 @BenRoe (keycapsss.com) * * 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 @@ -13,8 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + #include "quantum.h" + +#ifdef KEYBOARD_keycapsss_kimiko_rev1 #ifdef RGB_MATRIX_ENABLE //Thanks to Ben (keycapsss) for helpipng me to create g_led_config @@ -75,4 +77,220 @@ led_config_t g_led_config = { { 4, 4, 1, 1, 1, 1 } }; -#endif // RGB_MATRIX_ENABLE \ No newline at end of file +#endif // RGB_MATRIX_ENABLE +#endif // KEYBOARD_keycapsss_kimiko_rev1 + +#ifdef KEYBOARD_keycapsss_kimiko_rev2 +enum layers { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST +}; + +#ifdef OLED_ENABLE + +oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return OLED_ROTATION_270; +} + +// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne, +// and has been copied directly from `crkbd/soundmonster/keymap.c` + +void render_mod_status_gui_alt(uint8_t modifiers) { + static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0}; + static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0}; + static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0}; + static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0}; + + static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0}; + static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0}; + static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0}; + static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0}; + + // fillers between the modifier icons bleed into the icon frames + static const char PROGMEM off_off_1[] = {0xc5, 0}; + static const char PROGMEM off_off_2[] = {0xc6, 0}; + static const char PROGMEM on_off_1[] = {0xc7, 0}; + static const char PROGMEM on_off_2[] = {0xc8, 0}; + static const char PROGMEM off_on_1[] = {0xc9, 0}; + static const char PROGMEM off_on_2[] = {0xca, 0}; + static const char PROGMEM on_on_1[] = {0xcb, 0}; + static const char PROGMEM on_on_2[] = {0xcc, 0}; + + if(modifiers & MOD_MASK_GUI) { + oled_write_P(gui_on_1, false); + } else { + oled_write_P(gui_off_1, false); + } + + if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { + oled_write_P(on_on_1, false); + } else if(modifiers & MOD_MASK_GUI) { + oled_write_P(on_off_1, false); + } else if(modifiers & MOD_MASK_ALT) { + oled_write_P(off_on_1, false); + } else { + oled_write_P(off_off_1, false); + } + + if(modifiers & MOD_MASK_ALT) { + oled_write_P(alt_on_1, false); + } else { + oled_write_P(alt_off_1, false); + } + + if(modifiers & MOD_MASK_GUI) { + oled_write_P(gui_on_2, false); + } else { + oled_write_P(gui_off_2, false); + } + + if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { + oled_write_P(on_on_2, false); + } else if(modifiers & MOD_MASK_GUI) { + oled_write_P(on_off_2, false); + } else if(modifiers & MOD_MASK_ALT) { + oled_write_P(off_on_2, false); + } else { + oled_write_P(off_off_2, false); + } + + if(modifiers & MOD_MASK_ALT) { + oled_write_P(alt_on_2, false); + } else { + oled_write_P(alt_off_2, false); + } +} + +void render_mod_status_ctrl_shift(uint8_t modifiers) { + static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0}; + static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0}; + static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0}; + static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0}; + + static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0}; + static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0}; + static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0}; + static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0}; + + // fillers between the modifier icons bleed into the icon frames + static const char PROGMEM off_off_1[] = {0xc5, 0}; + static const char PROGMEM off_off_2[] = {0xc6, 0}; + static const char PROGMEM on_off_1[] = {0xc7, 0}; + static const char PROGMEM on_off_2[] = {0xc8, 0}; + static const char PROGMEM off_on_1[] = {0xc9, 0}; + static const char PROGMEM off_on_2[] = {0xca, 0}; + static const char PROGMEM on_on_1[] = {0xcb, 0}; + static const char PROGMEM on_on_2[] = {0xcc, 0}; + + if(modifiers & MOD_MASK_CTRL) { + oled_write_P(ctrl_on_1, false); + } else { + oled_write_P(ctrl_off_1, false); + } + + if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { + oled_write_P(on_on_1, false); + } else if(modifiers & MOD_MASK_CTRL) { + oled_write_P(on_off_1, false); + } else if(modifiers & MOD_MASK_SHIFT) { + oled_write_P(off_on_1, false); + } else { + oled_write_P(off_off_1, false); + } + + if(modifiers & MOD_MASK_SHIFT) { + oled_write_P(shift_on_1, false); + } else { + oled_write_P(shift_off_1, false); + } + + if(modifiers & MOD_MASK_CTRL) { + oled_write_P(ctrl_on_2, false); + } else { + oled_write_P(ctrl_off_2, false); + } + + if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { + oled_write_P(on_on_2, false); + } else if(modifiers & MOD_MASK_CTRL) { + oled_write_P(on_off_2, false); + } else if(modifiers & MOD_MASK_SHIFT) { + oled_write_P(off_on_2, false); + } else { + oled_write_P(off_off_2, false); + } + + if(modifiers & MOD_MASK_SHIFT) { + oled_write_P(shift_on_2, false); + } else { + oled_write_P(shift_off_2, false); + } +} + + +void render_logo(void) { + static const char PROGMEM kimiko_logo[] = { + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0}; + oled_advance_page(false); + oled_advance_page(false); + oled_write_P(kimiko_logo, false); + // oled_write_P(PSTR("Kimiko"), false); +} + +void render_layer_state(void) { + static const char PROGMEM default_layer[] = { + 0x20, 0x94, 0x95, 0x96, 0x20, + 0x20, 0xb4, 0xb5, 0xb6, 0x20, + 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0}; + static const char PROGMEM raise_layer[] = { + 0x20, 0x97, 0x98, 0x99, 0x20, + 0x20, 0xb7, 0xb8, 0xb9, 0x20, + 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0}; + static const char PROGMEM lower_layer[] = { + 0x20, 0x9a, 0x9b, 0x9c, 0x20, + 0x20, 0xba, 0xbb, 0xbc, 0x20, + 0x20, 0xda, 0xdb, 0xdc, 0x20, 0}; + static const char PROGMEM adjust_layer[] = { + 0x20, 0x9d, 0x9e, 0x9f, 0x20, + 0x20, 0xbd, 0xbe, 0xbf, 0x20, + 0x20, 0xdd, 0xde, 0xdf, 0x20, 0}; + + if(layer_state_is(_ADJUST)) { + oled_write_P(adjust_layer, false); + } else if(layer_state_is(_LOWER)) { + oled_write_P(lower_layer, false); + } else if(layer_state_is(_RAISE)) { + oled_write_P(raise_layer, false); + } else { + oled_write_P(default_layer, false); + } +} + +void render_status_main(void) { + render_logo(); + oled_advance_page(false); + render_layer_state(); + oled_advance_page(false); + render_mod_status_gui_alt(get_mods()|get_oneshot_mods()); + render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods()); +} + +bool oled_task_kb(void) { + if (!oled_task_user()) { + return false; + } + + if (is_keyboard_master()) { + render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) + } else { + render_logo(); + } + + return true; +} +#endif // OLED_ENABLE +#endif // keyboard keycapsss_kimiko_rev2 + diff --git a/keyboards/keycapsss/kimiko/post_config.h b/keyboards/keycapsss/kimiko/post_config.h new file mode 100644 index 0000000000..31be5898cf --- /dev/null +++ b/keyboards/keycapsss/kimiko/post_config.h @@ -0,0 +1,25 @@ +/* Copyright 2019 MechMerlin + * Copyright 2023 @Ex3c4Def + * Copyright 2023 @BenRoe (keycapsss.com) + * + * 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 . + */ + +#pragma once + +// OLED definitions +#ifndef OLED_FONT_H +# define OLED_FONT_H "keyboards/keycapsss/kimiko/glcdfont.c" +#endif + diff --git a/keyboards/keycapsss/kimiko/readme.md b/keyboards/keycapsss/kimiko/readme.md index 0e2604079d..049d460d5c 100644 --- a/keyboards/keycapsss/kimiko/readme.md +++ b/keyboards/keycapsss/kimiko/readme.md @@ -1,23 +1,59 @@ # Kimiko - +## Rev2 + +A split keyboard with 4x6 vertically staggered keys and a Kyria style thumb thumb cluster. + +![Kimiko Rev2](https://i.imgur.com/TBP8Bcrh.jpg) + +- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) +- Hardware Supported: Pro Micro 5V/16Mhz and compatible +- Hardware Availability: [Keycapsss.com](https://keycapsss.com) + +### Features (Rev2) + +- 62 Per key RGB led's (SK6812 Mini-E) + - RGB Matrix is enabled as default in rules.mk + - The effects can be configured in config.h +- Support for 1 rotary encoder per side (two possible positions) +- Support for 1 OLED display per side + - 128x32 (SSD1306) or Nice!View are supported + - With 1 OLED on each side, they have to be the same + - Default configuration for 128x32 OLED + + +Make firmware .hex for this keyboard (after setting up your build environment): + +```bash +qmk compile -kb keycapsss/kimiko/rev2 -km rev2 +``` + +Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller. + +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). + +## Rev1 A split keyboard with 4x6 vertically staggered keys and thumb keys. +![Kimiko Rev1](https://i.imgur.com/md6V6Eoh.jpg) + +- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) +- Hardware Supported: Pro Micro 5V/16Mhz and compatible +- Hardware Availability: [Keycapsss.com](https://keycapsss.com) + +### Features (Rev1) + - Per key RGB led's (SK6812 Mini-E) - 6 underglow RGB led's per side (SK6812 Mini) - Support for 1 rotary encoder per side (two possible positions) -* Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) -* Hardware Supported: Pro Micro 5V/16Mhz and compatible -* Hardware Availability: [keycapsss.com](https://keycapsss.com) - Make firmware .hex for this keyboard (after setting up your build environment): - make keycapsss/kimiko:default +```bash +qmk compile -kb keycapsss/kimiko/rev1 -km default +``` -Example of flashing this keyboard (or use [QMK Toolbox](https://github.com/qmk/qmk_toolbox)): - - make keycapsss/kimiko:default:flash +Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller. 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). diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index e0106f4423..612697c4ba 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -1,25 +1,45 @@ { - "keyboard_name": "Kimiko", + "keyboard_name": "Kimiko Rev1", "manufacturer": "Keycapsss", "url": "https://keycapsss.com", - "maintainer": "@ben_roe Keycapsss", + "maintainer": "BenRoe", "usb": { "vid": "0x7983", "pid": "0x4B69", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "features": { + "mousekey": true, + "oled": true, + "extrakey": true, + "encoder": true, + "nkro": true + }, + "build": { + "lto": true + }, "encoder": { - "rotary": [ - {"pin_a": "F4", "pin_b": "F5"} - ] + "rotary": [{ "pin_a": "F4", "pin_b": "F5" }] }, "split": { - "soft_serial_pin": "D2" + "enabled": true, + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + } + }, + "encoder": { + "right": { + "rotary": [{ "pin_a": "F5", "pin_b": "F4" }] + } + } }, "rgblight": { "led_count": 60, @@ -28,80 +48,79 @@ "ws2812": { "pin": "D3" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.8}, - {"matrix": [0, 1], "x": 1, "y": 0.8}, - {"matrix": [0, 2], "x": 2, "y": 0.15}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0.15}, - {"matrix": [0, 5], "x": 5, "y": 0.3}, + { "matrix": [0, 0], "x": 0, "y": 0.8 }, + { "matrix": [0, 1], "x": 1, "y": 0.8 }, + { "matrix": [0, 2], "x": 2, "y": 0.15 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0.15 }, + { "matrix": [0, 5], "x": 5, "y": 0.3 }, - {"matrix": [5, 5], "x": 9, "y": 0.3}, - {"matrix": [5, 4], "x": 10, "y": 0.15}, - {"matrix": [5, 3], "x": 11, "y": 0}, - {"matrix": [5, 2], "x": 12, "y": 0.15}, - {"matrix": [5, 1], "x": 13, "y": 0.8}, - {"matrix": [5, 0], "x": 14, "y": 0.8}, + { "matrix": [5, 5], "x": 9, "y": 0.3 }, + { "matrix": [5, 4], "x": 10, "y": 0.15 }, + { "matrix": [5, 3], "x": 11, "y": 0 }, + { "matrix": [5, 2], "x": 12, "y": 0.15 }, + { "matrix": [5, 1], "x": 13, "y": 0.8 }, + { "matrix": [5, 0], "x": 14, "y": 0.8 }, - {"matrix": [1, 0], "x": 0, "y": 1.8}, - {"matrix": [1, 1], "x": 1, "y": 1.8}, - {"matrix": [1, 2], "x": 2, "y": 1.15}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1.15}, - {"matrix": [1, 5], "x": 5, "y": 1.3}, + { "matrix": [1, 0], "x": 0, "y": 1.8 }, + { "matrix": [1, 1], "x": 1, "y": 1.8 }, + { "matrix": [1, 2], "x": 2, "y": 1.15 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1.15 }, + { "matrix": [1, 5], "x": 5, "y": 1.3 }, - {"matrix": [6, 5], "x": 9, "y": 1.3}, - {"matrix": [6, 4], "x": 10, "y": 1.15}, - {"matrix": [6, 3], "x": 11, "y": 1}, - {"matrix": [6, 2], "x": 12, "y": 1.15}, - {"matrix": [6, 1], "x": 13, "y": 1.8}, - {"matrix": [6, 0], "x": 14, "y": 1.8}, + { "matrix": [6, 5], "x": 9, "y": 1.3 }, + { "matrix": [6, 4], "x": 10, "y": 1.15 }, + { "matrix": [6, 3], "x": 11, "y": 1 }, + { "matrix": [6, 2], "x": 12, "y": 1.15 }, + { "matrix": [6, 1], "x": 13, "y": 1.8 }, + { "matrix": [6, 0], "x": 14, "y": 1.8 }, - {"matrix": [2, 0], "x": 0, "y": 2.8}, - {"matrix": [2, 1], "x": 1, "y": 2.8}, - {"matrix": [2, 2], "x": 2, "y": 2.15}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2.15}, - {"matrix": [2, 5], "x": 5, "y": 2.3}, + { "matrix": [2, 0], "x": 0, "y": 2.8 }, + { "matrix": [2, 1], "x": 1, "y": 2.8 }, + { "matrix": [2, 2], "x": 2, "y": 2.15 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2.15 }, + { "matrix": [2, 5], "x": 5, "y": 2.3 }, - {"matrix": [7, 5], "x": 9, "y": 2.3}, - {"matrix": [7, 4], "x": 10, "y": 2.15}, - {"matrix": [7, 3], "x": 11, "y": 2}, - {"matrix": [7, 2], "x": 12, "y": 2.15}, - {"matrix": [7, 1], "x": 13, "y": 2.8}, - {"matrix": [7, 0], "x": 14, "y": 2.8}, + { "matrix": [7, 5], "x": 9, "y": 2.3 }, + { "matrix": [7, 4], "x": 10, "y": 2.15 }, + { "matrix": [7, 3], "x": 11, "y": 2 }, + { "matrix": [7, 2], "x": 12, "y": 2.15 }, + { "matrix": [7, 1], "x": 13, "y": 2.8 }, + { "matrix": [7, 0], "x": 14, "y": 2.8 }, - {"matrix": [3, 0], "x": 0, "y": 3.8}, - {"matrix": [3, 1], "x": 1, "y": 3.8}, - {"matrix": [3, 2], "x": 2, "y": 3.15}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3.15}, - {"matrix": [3, 5], "x": 5, "y": 3.3}, - {"matrix": [4, 5], "x": 6.25, "y": 3.3}, + { "matrix": [3, 0], "x": 0, "y": 3.8 }, + { "matrix": [3, 1], "x": 1, "y": 3.8 }, + { "matrix": [3, 2], "x": 2, "y": 3.15 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 4], "x": 4, "y": 3.15 }, + { "matrix": [3, 5], "x": 5, "y": 3.3 }, + { "matrix": [4, 5], "x": 6.25, "y": 3.3 }, - {"matrix": [9, 5], "x": 7.75, "y": 3.3}, - {"matrix": [8, 5], "x": 9, "y": 3.3}, - {"matrix": [8, 4], "x": 10, "y": 3.15}, - {"matrix": [8, 3], "x": 11, "y": 3}, - {"matrix": [8, 2], "x": 12, "y": 3.15}, - {"matrix": [8, 1], "x": 13, "y": 3.8}, - {"matrix": [8, 0], "x": 14, "y": 3.8}, + { "matrix": [9, 5], "x": 7.75, "y": 3.3 }, + { "matrix": [8, 5], "x": 9, "y": 3.3 }, + { "matrix": [8, 4], "x": 10, "y": 3.15 }, + { "matrix": [8, 3], "x": 11, "y": 3 }, + { "matrix": [8, 2], "x": 12, "y": 3.15 }, + { "matrix": [8, 1], "x": 13, "y": 3.8 }, + { "matrix": [8, 0], "x": 14, "y": 3.8 }, - {"matrix": [4, 0], "x": 2, "y": 4.15}, - {"matrix": [4, 1], "x": 3, "y": 4}, - {"matrix": [4, 2], "x": 4, "y": 4.15}, - {"matrix": [4, 3], "x": 5.25, "y": 4.3}, - {"matrix": [4, 4], "x": 6.25, "y": 4.25, "h": 1.5}, + { "matrix": [4, 0], "x": 2, "y": 4.15 }, + { "matrix": [4, 1], "x": 3, "y": 4 }, + { "matrix": [4, 2], "x": 4, "y": 4.15 }, + { "matrix": [4, 3], "x": 5.25, "y": 4.3 }, + { "matrix": [4, 4], "x": 6.25, "y": 4.25, "h": 1.5 }, - {"matrix": [9, 4], "x": 7.75, "y": 4.25, "h": 1.5}, - {"matrix": [9, 3], "x": 8.75, "y": 4.3}, - {"matrix": [9, 2], "x": 10, "y": 4.15}, - {"matrix": [9, 1], "x": 11, "y": 4}, - {"matrix": [9, 0], "x": 12, "y": 4.15} + { "matrix": [9, 4], "x": 7.75, "y": 4.25, "h": 1.5 }, + { "matrix": [9, 3], "x": 8.75, "y": 4.3 }, + { "matrix": [9, 2], "x": 10, "y": 4.15 }, + { "matrix": [9, 1], "x": 11, "y": 4 }, + { "matrix": [9, 0], "x": 12, "y": 4.15 } ] } } diff --git a/keyboards/keycapsss/kimiko/keymaps/default/config.h b/keyboards/keycapsss/kimiko/rev1/keymaps/default/config.h similarity index 95% rename from keyboards/keycapsss/kimiko/keymaps/default/config.h rename to keyboards/keycapsss/kimiko/rev1/keymaps/default/config.h index 52faaf2b65..a6556d5876 100644 --- a/keyboards/keycapsss/kimiko/keymaps/default/config.h +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/default/config.h @@ -22,7 +22,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c" +#define OLED_FONT_H "keyboards/keycapsss/kimiko/rev1/keymaps/default/glcdfont.c" // #define OLED_FONT_WIDTH 5 // #define OLED_FONT_HEIGHT 7 diff --git a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c b/keyboards/keycapsss/kimiko/rev1/keymaps/default/glcdfont.c similarity index 92% rename from keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c rename to keyboards/keycapsss/kimiko/rev1/keymaps/default/glcdfont.c index 19d45a75c7..4c7e6862b6 100644 --- a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/default/glcdfont.c @@ -1,3 +1,20 @@ +/* Copyright 2019 MechMerlin + * Copyright 2020 @ben_roe (keycapsss.com) + * + * 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 "progmem.h" // Corne 8x6 font diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/rev1/keymaps/default/keymap.c similarity index 100% rename from keyboards/keycapsss/kimiko/keymaps/default/keymap.c rename to keyboards/keycapsss/kimiko/rev1/keymaps/default/keymap.c diff --git a/keyboards/keycapsss/kimiko/rev1/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/rev1/keymaps/default/rules.mk new file mode 100644 index 0000000000..364c7cb61d --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/default/rules.mk @@ -0,0 +1,4 @@ +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow + +ENCODER_MAP_ENABLE = yes + diff --git a/keyboards/keycapsss/kimiko/keymaps/vial/config.h b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/config.h similarity index 89% rename from keyboards/keycapsss/kimiko/keymaps/vial/config.h rename to keyboards/keycapsss/kimiko/rev1/keymaps/vial/config.h index 5382ff0b5b..7273da3e4e 100644 --- a/keyboards/keycapsss/kimiko/keymaps/vial/config.h +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/config.h @@ -1,5 +1,6 @@ /* Copyright 2019 MechMerlin - * Copyright 2020 @ben_roe (keycapsss.com) + * Copyright 2023 @Ex3c4Def + * Copyright 2023 @ben_roe (keycapsss.com) * * 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 @@ -22,9 +23,8 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c" -// #define OLED_FONT_WIDTH 5 -// #define OLED_FONT_HEIGHT 7 +#define OLED_FONT_H "keyboards/keycapsss/kimiko/rev1/keymaps/vial/glcdfont.c" + #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_HUE_STEP 8 @@ -51,4 +51,4 @@ #define VIAL_KEYBOARD_UID {0x80, 0x9F, 0xA5, 0x3D, 0x0D, 0xCD, 0x43, 0xA4} #define VIAL_UNLOCK_COMBO_ROWS { 0, 9 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 4 } \ No newline at end of file +#define VIAL_UNLOCK_COMBO_COLS { 0, 4 } diff --git a/keyboards/keycapsss/kimiko/rev1/keymaps/vial/glcdfont.c b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/glcdfont.c new file mode 100644 index 0000000000..4c7e6862b6 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/glcdfont.c @@ -0,0 +1,250 @@ +/* Copyright 2019 MechMerlin + * Copyright 2020 @ben_roe (keycapsss.com) + * + * 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 "progmem.h" + +// Corne 8x6 font +// Online editor: https://helixfonteditor.netlify.com +// or https://joric.github.io/qle/ +// See also: https://github.com/soundmonster/glcdfont_converter + +const unsigned char font[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, + 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, + 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, + 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, + 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, + 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, + 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, + 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, + 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, + 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, + 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, + 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, + 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, + 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, + 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, + 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, + 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, + 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, + 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, + 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, + 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, + 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, + 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, + 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, + 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, + 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, + 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, + 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, + 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, + 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, + 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, + 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, + 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, + 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, + 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, + 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, + 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, + 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, + 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, + 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, + 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, + 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, + 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, + 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, + 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, + 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, + 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, + 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, + 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, + 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, + 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, + 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, + 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, + 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, + 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, + 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, + 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, + 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, + 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, + 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, + 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, + 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, + 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, + 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, + 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, + 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, + 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, + 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, + 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, + 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, + 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, + 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, + 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, + 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, + 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, + 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, + 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, + 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, + 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, + 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, + 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, + 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, + 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, + 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, + 0x00, 0x13, 0x07, 0x08, 0x00, 0x00, + 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, + 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, + 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, + 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, + 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, + 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, + 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, + 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, + 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, + 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, + 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, + 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, + 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, + 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, + 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, + 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, + 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, + 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, + 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, + 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, + 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, + 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, + 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, + 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, + 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, + 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, + 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, + 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, + 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, + 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, + 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2, + 0x42, 0x42, 0x42, 0xE2, 0x52, 0x22, + 0x22, 0x22, 0x42, 0x82, 0x02, 0x02, + 0x22, 0x22, 0x02, 0x04, 0xF8, 0x00, + 0x00, 0xF8, 0x04, 0x02, 0x02, 0x82, + 0x42, 0x22, 0x42, 0x82, 0x02, 0x02, + 0x02, 0x82, 0x42, 0x22, 0x12, 0x22, + 0x42, 0x82, 0x02, 0x04, 0xF8, 0x00, + 0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E, + 0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE, + 0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE, + 0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00, + 0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E, + 0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, + 0x10, 0x10, 0x08, 0x08, 0x10, 0x10, + 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, + 0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0, + 0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0, + 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80, + 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, + 0x10, 0x10, 0x08, 0x08, 0x10, 0x10, + 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, + 0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0, + 0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0, + 0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80, + 0x1F, 0x1F, 0x0E, 0x1B, 0x11, 0xC0, + 0x1F, 0x1F, 0x00, 0x1F, 0x1F, 0x06, + 0x0C, 0xC6, 0x1F, 0x1F, 0x80, 0x5F, + 0x1F, 0x00, 0x1F, 0x1F, 0x8E, 0x9B, + 0x91, 0x80, 0x9F, 0x9F, 0x91, 0x1F, + 0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47, + 0x42, 0x42, 0x42, 0x47, 0x4A, 0x44, + 0x40, 0x40, 0x40, 0x40, 0x41, 0x42, + 0x44, 0x44, 0x40, 0x20, 0x1F, 0x00, + 0x00, 0x1F, 0x20, 0x40, 0x41, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x41, 0x40, + 0x41, 0x41, 0x4F, 0x48, 0x48, 0x48, + 0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00, + 0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78, + 0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B, + 0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D, + 0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00, + 0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F, + 0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E, + 0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C, + 0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88, + 0x88, 0x88, 0x55, 0x55, 0x23, 0x23, + 0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47, + 0x23, 0x23, 0x55, 0x55, 0x88, 0x88, + 0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2, + 0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4, + 0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88, + 0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6, + 0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6, + 0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88, + 0x00, 0x84, 0x87, 0x7D, 0x55, 0x57, + 0x55, 0x7D, 0x87, 0x84, 0x00, 0x91, + 0x95, 0x55, 0x55, 0x3F, 0x55, 0x55, + 0x95, 0x91, 0x00, 0x08, 0x08, 0x08, + 0x88, 0xFC, 0x0A, 0x09, 0x08, 0x08, + 0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04, + 0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20, + 0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04, + 0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20, + 0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC, + 0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F, + 0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC, + 0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F, + 0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE, + 0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00, + 0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77, + 0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, + 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, + 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, + 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, + 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, + 0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07, + 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x01, 0x03, 0x02, + 0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06, + 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, +}; diff --git a/keyboards/keycapsss/kimiko/keymaps/vial/keymap.c b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/keymap.c similarity index 93% rename from keyboards/keycapsss/kimiko/keymaps/vial/keymap.c rename to keyboards/keycapsss/kimiko/rev1/keymaps/vial/keymap.c index 9a0ba55ce2..9746fff4fc 100644 --- a/keyboards/keycapsss/kimiko/keymaps/vial/keymap.c +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/keymap.c @@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_QWERTY] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), - KC_LCTL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI, KC_RALT + KC_LCTL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI, KC_RALT ), /* LOWER * ,-------------------------------------------. ,-----------------------------------------. @@ -116,13 +116,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - layer_state_t layer_state_set_user(layer_state_t state) { state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); return state; } -#ifdef OLED_DRIVER_ENABLE +#ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { if (is_keyboard_master()) { return OLED_ROTATION_270; @@ -321,23 +320,23 @@ void render_status_secondary(void) { render_space(); } -void oled_task_user(void) { +bool oled_task_user(void) { if (is_keyboard_master()) { render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) } else { render_status_secondary(); } + return false; } #endif #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, - [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, - [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) }, - // Encoder 1 Encoder 2 +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, + [_LOWER] = { ENCODER_CCW_CW(RGB_HUI, KC_TAB), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, }; -#endif +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk new file mode 100644 index 0000000000..2a3a41e91e --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk @@ -0,0 +1,14 @@ +OLED_ENABLE = yes +ENCODER_MAP_ENABLE = yes + +VIA_ENABLE = yes +VIAL_ENABLE = yes + +RGBLIGHT_ENABLE = yes # Enable keyboard 'old' RGB lightning + +MOUSEKEY_ENABLE = yes +# Disabled, because firmware size is to big for Pro Micros +QMK_SETTINGS = no +TAP_DANCE_ENABLE = no +COMBO_ENABLE = no +KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/keycapsss/kimiko/keymaps/vial/vial.json b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/vial.json similarity index 100% rename from keyboards/keycapsss/kimiko/keymaps/vial/vial.json rename to keyboards/keycapsss/kimiko/rev1/keymaps/vial/vial.json diff --git a/keyboards/keycapsss/kimiko/rev2/config.h b/keyboards/keycapsss/kimiko/rev2/config.h new file mode 100644 index 0000000000..7e703859e0 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/config.h @@ -0,0 +1,33 @@ +/* Copyright 2023 @ben_roe (keycapsss.com) + * + * 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 . + */ + +#pragma once + +/* SK6812 RGB LED are used for lightning*/ + +// Limit the power draw +#define RGBLIGHT_LIMIT_VAL 80 + +// Not yet available in `info.json` +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80 +#define RGB_MATRIX_LED_COUNT 62 +#define SPLIT_TRANSPORT_MIRROR + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/keycapsss/kimiko/rev2/info.json b/keyboards/keycapsss/kimiko/rev2/info.json new file mode 100644 index 0000000000..4c15d30a95 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/info.json @@ -0,0 +1,195 @@ +{ + "keyboard_name": "Kimiko Rev2", + "manufacturer": "Keycapsss", + "url": "https://keycapsss.com", + "maintainer": "BenRoe", + "usb": { + "vid": "0x7983", + "pid": "0x4B69", + "device_version": "2.0.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "features": { + "oled": true, + "encoder": true, + "nkro": true + }, + "build": { + "lto": true + }, + "rgblight": { + "split": true, + "led_count": 62, + "split_count": [31, 31] + }, + "encoder": { + "rotary": [{ "pin_a": "F5", "pin_b": "F4" }] + }, + "split": { + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + } + }, + "encoder": { + "right": { + "rotary": [{ "pin_a": "F5", "pin_b": "F4" }] + } + } + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "L00", "matrix": [0, 0], "x": 0, "y": 0.96 }, + { "label": "L01", "matrix": [0, 1], "x": 1, "y": 0.96 }, + { "label": "L02", "matrix": [0, 2], "x": 2, "y": 0.31 }, + { "label": "L03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "L04", "matrix": [0, 4], "x": 4, "y": 0.31 }, + { "label": "L05", "matrix": [0, 5], "x": 5, "y": 0.46 }, + + { "label": "R00", "matrix": [6, 5], "x": 12, "y": 0.45 }, + { "label": "R01", "matrix": [6, 4], "x": 13, "y": 0.31 }, + { "label": "R02", "matrix": [6, 3], "x": 14, "y": 0 }, + { "label": "R03", "matrix": [6, 2], "x": 15, "y": 0.31 }, + { "label": "R04", "matrix": [6, 1], "x": 16, "y": 0.96 }, + { "label": "R05", "matrix": [6, 0], "x": 17, "y": 0.96 }, + + { "label": "L10", "matrix": [1, 0], "x": 0, "y": 1.96 }, + { "label": "L11", "matrix": [1, 1], "x": 1, "y": 1.96 }, + { "label": "L12", "matrix": [1, 2], "x": 2, "y": 1.31 }, + { "label": "L13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "L14", "matrix": [1, 4], "x": 4, "y": 1.31 }, + { "label": "L15", "matrix": [1, 5], "x": 5, "y": 1.46 }, + + { "label": "R10", "matrix": [7, 5], "x": 12, "y": 1.46 }, + { "label": "R11", "matrix": [7, 4], "x": 13, "y": 1.31 }, + { "label": "R12", "matrix": [7, 3], "x": 14, "y": 1 }, + { "label": "R13", "matrix": [7, 2], "x": 15, "y": 1.31 }, + { "label": "R14", "matrix": [7, 1], "x": 16, "y": 1.96 }, + { "label": "R15", "matrix": [7, 0], "x": 17, "y": 1.96 }, + + { "label": "L20", "matrix": [2, 0], "x": 0, "y": 2.96 }, + { "label": "L21", "matrix": [2, 1], "x": 1, "y": 2.96 }, + { "label": "L22", "matrix": [2, 2], "x": 2, "y": 2.31 }, + { "label": "L23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "L24", "matrix": [2, 4], "x": 4, "y": 2.31 }, + { "label": "L25", "matrix": [2, 5], "x": 5, "y": 2.46 }, + + { "label": "R20", "matrix": [8, 5], "x": 12, "y": 2.46 }, + { "label": "R21", "matrix": [8, 4], "x": 13, "y": 2.31 }, + { "label": "R22", "matrix": [8, 3], "x": 14, "y": 2 }, + { "label": "R23", "matrix": [8, 2], "x": 15, "y": 2.31 }, + { "label": "R24", "matrix": [8, 1], "x": 16, "y": 2.96 }, + { "label": "R25", "matrix": [8, 0], "x": 17, "y": 2.96 }, + + { "label": "L30", "matrix": [3, 0], "x": 0, "y": 3.96 }, + { "label": "L31", "matrix": [3, 1], "x": 1, "y": 4 }, + { "label": "L32", "matrix": [3, 2], "x": 2, "y": 3.31 }, + { "label": "L33", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "L34", "matrix": [3, 4], "x": 4, "y": 3.31 }, + { "label": "L35", "matrix": [3, 5], "x": 5, "y": 3.46 }, + { "label": "L50", "matrix": [5, 5], "x": 5.75, "y": 4.51 }, + { "label": "L40", "matrix": [4, 5], "x": 6.75, "y": 5 }, + + { "label": "R40", "matrix": [10, 5], "x": 10.25, "y": 5 }, + { "label": "R50", "matrix": [11, 5], "x": 11.25, "y": 4.5 }, + { "label": "R30", "matrix": [9, 5], "x": 12, "y": 3.46 }, + { "label": "R31", "matrix": [9, 4], "x": 13, "y": 3.31 }, + { "label": "R32", "matrix": [9, 3], "x": 14, "y": 3 }, + { "label": "R33", "matrix": [9, 2], "x": 15, "y": 3.31 }, + { "label": "R34", "matrix": [9, 1], "x": 16, "y": 3.96 }, + { "label": "R35", "matrix": [9, 0], "x": 17, "y": 3.96 }, + + { "label": "L41", "matrix": [4, 0], "x": 2.5, "y": 4.5 }, + { "label": "L42", "matrix": [4, 1], "x": 3.5, "y": 4.5 }, + { "label": "L43", "matrix": [4, 2], "x": 4.5, "y": 4.95 }, + { "label": "L44", "matrix": [4, 3], "x": 5.5, "y": 5.5 }, + { "label": "L45", "matrix": [4, 4], "x": 6.5, "y": 6 }, + + { "label": "R41", "matrix": [10, 4], "x": 10.5, "y": 6 }, + { "label": "R42", "matrix": [10, 3], "x": 11.5, "y": 5.5 }, + { "label": "R43", "matrix": [10, 2], "x": 12.5, "y": 4.75 }, + { "label": "R44", "matrix": [10, 1], "x": 13.5, "y": 4.5 }, + { "label": "R45", "matrix": [10, 0], "x": 14.5, "y": 4.5 } + ] + } + }, + "rgb_matrix": { + "driver": "ws2812", + "split_count": [31, 31], + "layout": [ + { "flags": 4, "matrix": [0, 5], "x": 66, "y": 5 }, + { "flags": 4, "matrix": [0, 4], "x": 53, "y": 4 }, + { "flags": 4, "matrix": [0, 3], "x": 40, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 26, "y": 4 }, + { "flags": 4, "matrix": [0, 1], "x": 13, "y": 11 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 11 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 23 }, + { "flags": 4, "matrix": [1, 1], "x": 13, "y": 23 }, + { "flags": 4, "matrix": [1, 2], "x": 26, "y": 15 }, + { "flags": 4, "matrix": [1, 3], "x": 40, "y": 12 }, + { "flags": 4, "matrix": [1, 4], "x": 53, "y": 15 }, + { "flags": 4, "matrix": [1, 5], "x": 66, "y": 17 }, + { "flags": 4, "matrix": [2, 5], "x": 66, "y": 29 }, + { "flags": 4, "matrix": [2, 4], "x": 53, "y": 27 }, + { "flags": 4, "matrix": [2, 3], "x": 40, "y": 24 }, + { "flags": 4, "matrix": [2, 2], "x": 26, "y": 27 }, + { "flags": 4, "matrix": [2, 1], "x": 13, "y": 35 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 35 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 47 }, + { "flags": 4, "matrix": [3, 1], "x": 13, "y": 47 }, + { "flags": 4, "matrix": [3, 2], "x": 26, "y": 39 }, + { "flags": 4, "matrix": [3, 3], "x": 40, "y": 36 }, + { "flags": 4, "matrix": [3, 4], "x": 53, "y": 39 }, + { "flags": 4, "matrix": [3, 5], "x": 66, "y": 41 }, + { "flags": 4, "matrix": [5, 5], "x": 80, "y": 48 }, + { "flags": 4, "matrix": [4, 5], "x": 94, "y": 52 }, + { "flags": 4, "matrix": [4, 4], "x": 87, "y": 64 }, + { "flags": 1, "matrix": [4, 3], "x": 73, "y": 60 }, + { "flags": 1, "matrix": [4, 2], "x": 53, "y": 51 }, + { "flags": 1, "matrix": [4, 1], "x": 40, "y": 47 }, + { "flags": 1, "matrix": [4, 0], "x": 26, "y": 51 }, + { "flags": 4, "matrix": [6, 5], "x": 158, "y": 5 }, + { "flags": 4, "matrix": [6, 4], "x": 171, "y": 4 }, + { "flags": 4, "matrix": [6, 3], "x": 184, "y": 0 }, + { "flags": 4, "matrix": [6, 2], "x": 198, "y": 4 }, + { "flags": 4, "matrix": [6, 1], "x": 211, "y": 11 }, + { "flags": 4, "matrix": [6, 0], "x": 224, "y": 11 }, + { "flags": 4, "matrix": [7, 0], "x": 224, "y": 23 }, + { "flags": 4, "matrix": [7, 1], "x": 211, "y": 23 }, + { "flags": 4, "matrix": [7, 2], "x": 198, "y": 15 }, + { "flags": 4, "matrix": [7, 3], "x": 184, "y": 12 }, + { "flags": 4, "matrix": [7, 4], "x": 171, "y": 15 }, + { "flags": 4, "matrix": [7, 5], "x": 158, "y": 17 }, + { "flags": 4, "matrix": [8, 5], "x": 158, "y": 29 }, + { "flags": 4, "matrix": [8, 4], "x": 171, "y": 27 }, + { "flags": 4, "matrix": [8, 3], "x": 184, "y": 24 }, + { "flags": 4, "matrix": [8, 2], "x": 198, "y": 27 }, + { "flags": 4, "matrix": [8, 1], "x": 211, "y": 35 }, + { "flags": 4, "matrix": [8, 0], "x": 224, "y": 35 }, + { "flags": 1, "matrix": [9, 0], "x": 224, "y": 47 }, + { "flags": 4, "matrix": [9, 1], "x": 211, "y": 47 }, + { "flags": 4, "matrix": [9, 2], "x": 198, "y": 39 }, + { "flags": 4, "matrix": [9, 3], "x": 184, "y": 36 }, + { "flags": 4, "matrix": [9, 4], "x": 171, "y": 39 }, + { "flags": 4, "matrix": [9, 5], "x": 158, "y": 41 }, + { "flags": 4, "matrix": [11, 5], "x": 144, "y": 48 }, + { "flags": 4, "matrix": [10, 5], "x": 130, "y": 52 }, + { "flags": 4, "matrix": [10, 4], "x": 137, "y": 64 }, + { "flags": 1, "matrix": [10, 3], "x": 151, "y": 60 }, + { "flags": 4, "matrix": [10, 2], "x": 171, "y": 51 }, + { "flags": 1, "matrix": [10, 1], "x": 184, "y": 47 }, + { "flags": 1, "matrix": [10, 0], "x": 198, "y": 51 } + ] + } +} diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h new file mode 100644 index 0000000000..cd63e025fc --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h @@ -0,0 +1,129 @@ +/* Copyright 2019 MechMerlin + * Copyright 2020 @ben_roe (keycapsss.com) + * Copyright 2023 @Ex3c4Def + * + * 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 . + */ + +#pragma once + +/* Select hand configuration */ +//------------------------------------------ +// #define MASTER_LEFT +#define MASTER_RIGHT +// #define EE_HANDS +//------------------------------------------ + + +// If you are using an Elite C rev3 on the slave side, uncomment the lines below: +//------------------------------------------ +// #define SPLIT_USB_DETECT +// #define NO_USB_STARTUP_CHECK +//------------------------------------------ + + +// 'new' RGB Matrix definitions, used when RGB_MATRIX_ENABLE = yes in rules.mk +//------------------------------------------ + #define RGB_MATRIX_FRAMEBUFFER_EFFECTS + // #define RGB_MATRIX_KEYPRESSES + // #define RGB_MATRIX_KEYRELEASES + + // These modes don’t require any additional defines. + #define ENABLE_RGB_MATRIX_NONE + #define ENABLE_RGB_MATRIX_SOLID_COLOR // Static single hue, no speed support + + #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue + // #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes + // #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes + // #define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation + // #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right + // #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness + // #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient + // #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right + // #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in + // #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient Chevron shapped scrolling left to right + // #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard + // #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard + // #define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard + #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard + // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard + // #define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue + // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation + // #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back + // #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left + // #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right + // #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Single hue fractal filled keys pulsing horizontally out to edges + // #define ENABLE_RGB_MATRIX_PIXEL_FLOW // Pulsing RGB flow along LED wiring with random hues + // #define ENABLE_RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues + + // These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available. + #define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! + // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation + + // These modes also require the RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES define to be available. + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out + + #define RGB_MATRIX_VAL_STEP 4 + #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR + #define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set + #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set + #define RGB_MATRIX_DEFAULT_VAL 60 //RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set + #define RGB_MATRIX_DEFAULT_SPD 60 // Sets the default animation speed, if none has been set +//------------------------------------------ + + +// 'old' RGB Lightning definitions, used when RGBLIGHT_ENABLE = yes in rules.mk +//------------------------------------------ +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_SLEEP /* the RGB lighting will be switched off when the host goes to sleep */ +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE +//------------------------------------------ + + +// pointing device definitions +//------------------------------------------ +#if defined(POINTING_DEVICE_DRIVER_pimoroni_trackball) +# define POINTING_DEVICE_ROTATION_180 // may be used for trackball in 2nd position +#endif +//------------------------------------------ + + diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c new file mode 100644 index 0000000000..f7e434c881 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c @@ -0,0 +1,122 @@ +/* Copyright 2019 Leo Batyuk + * Copyright 2020 Drashna Jaelre <@drashna> + * Copyright 2020 @ben_roe (keycapsss.com) + * Copyright 2023 @Ex3c4Def + * + * 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 + +enum layers { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* QWERTY + * ,--------------------------------------------. ,----------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | LShift | A | S | D | F | G |---------------. ,---------------| H | J | K | L | ; | ' | + * |---------+------+------+------+------+------| ( | [ | | ] | ) |------+------+------+------+------+-----------| + * | LCTRL | Z | X | C | V | B |------|--------| |-------|-------| N | M | , | . | / |RShift/Enter| + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), + KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_BSPC, KC_RGUI, KC_RALT +), +/* LOWER +* QWERTY + * ,--------------------------------------------. ,----------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | ` | ! | @ | # | $ | % |---------------. ,---------------| ^ | & | * | ( | ) | ~ | + * |---------+------+------+------+------+------| | | | | |------+------+------+------+------+-----------| + * | | | | | | |------|--------| |-------|-------| | _ | + | { | } | \ | + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ +[_LOWER] = LAYOUT( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, + _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS, + _______, _______, _______, _______,_______, _______, _______, _______, _______, _______ +), +/* RAISE + * ,--------------------------------------------. ,----------------------------------------------. + * | | | | | | | | | | | | | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | F1 | F2 | F3 | F4 | F5 | F6 |---------------. ,---------------| Left | Down | Up |Right | ; | | + * |---------+------+------+------+------+------| [ | [ | | [ | [ |------+------+------+------+------+-----------| + * | F7 | F8 | F9 | F10 | F11 | F12 |------|--------| |-------|-------| + | - | = | [ | ] | \ | + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +), +/* ADJUST (Press LOWER and RAISE together) + * ,--------------------------------------------. ,----------------------------------------------. + * | QK_BOOT | | | | | | | | | | | | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | RGB ON | HUE+ | SAT+ | VAL+ | | | | PREV | PLAY | NEXT | | | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | MODE | HUE- | SAT- | VAL- | | |---------------. ,---------------| VOL+ | MUTE | VOL- | | | | + * |---------+------+------+------+------+------| | | | | |------+------+------+------+------+-----------| + * | | | | | | |------|--------| |-------|-------| | | | | | | + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ +[_ADJUST] = LAYOUT( + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +) +}; + + + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, + [_LOWER] = { ENCODER_CCW_CW(RGB_HUI, KC_TAB), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/readme.md b/keyboards/keycapsss/kimiko/rev2/keymaps/default/readme.md new file mode 100644 index 0000000000..bf9fcdd50e --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/readme.md @@ -0,0 +1,31 @@ +# Kimiko Rev2 + +A split keyboard with 4x6 vertically staggered keys and thumb keys. + +![Kimiko Rev2](https://i.imgur.com/TBP8Bcrh.jpg) + +- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) +- Hardware Supported: Pro Micro 5V/16Mhz and compatible +- Hardware Availability: [Keycapsss.com](https://keycapsss.com) + +## Features + +- 62 Per key RGB led's (SK6812 Mini-E) + - RGB Matrix is enabled as default in rules.mk + - The effects can be configured in config.h +- Support for 1 rotary encoder per side (two possible positions) +- Support for 1 OLED display per side + - 128x32 (SSD1306) or Nice!View are supported + - With 1 OLED on each side, they have to be the same + - Default configuration for 128x32 OLED + + +Make firmware .hex for this keyboard (after setting up your build environment): + +```bash +qmk compile -kb keycapsss/kimiko/rev2 -km rev2 +``` + +Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller. + +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). diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk new file mode 100644 index 0000000000..420f29d8f7 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk @@ -0,0 +1,8 @@ +TRI_LAYER_ENABLE = yes +ENCODER_MAP_ENABLE = yes + +RGBLIGHT_ENABLE = no # Enable keyboard 'old' RGB lightning +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB Matrix lightning + +# POINTING_DEVICE_ENABLE = yes +# POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/vial/config.h b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/config.h new file mode 100644 index 0000000000..7605fa9da9 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/config.h @@ -0,0 +1,129 @@ +/* Copyright 2019 MechMerlin + * Copyright 2023 @Ex3c4Def + * Copyright 2023 @ben_roe (keycapsss.com) + * + * 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 . + */ + +#pragma once + +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#define VIAL_KEYBOARD_UID {0x95, 0x67, 0x21, 0xB7, 0x4B, 0x3A, 0x85, 0xE5} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 6 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 0 } +#define VIALRGB_NO_DIRECT + +/* Select hand configuration */ +//------------------------------------------ +// #define MASTER_LEFT +#define MASTER_RIGHT +// #define EE_HANDS +//------------------------------------------ + + +// If you are using an Elite C rev3 on the slave side, uncomment the lines below: +//------------------------------------------ +// #define SPLIT_USB_DETECT +// #define NO_USB_STARTUP_CHECK +//------------------------------------------ + + +// 'new' RGB Matrix definitions, used when RGB_MATRIX_ENABLE = yes in rules.mk +//------------------------------------------ +#ifdef RGB_MATRIX_ENABLE + // #define RGB_MATRIX_FRAMEBUFFER_EFFECTS + // #define RGB_MATRIX_KEYPRESSES + // #define RGB_MATRIX_KEYRELEASES + + // These modes don’t require any additional defines. + #define ENABLE_RGB_MATRIX_NONE + #define ENABLE_RGB_MATRIX_SOLID_COLOR // Static single hue, no speed support + + #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue + #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes + // #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes + // #define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation + // #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right + // #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness + // #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient + // #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right + // #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in + // #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient Chevron shapped scrolling left to right + // #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard + // #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard + // #define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard + // #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard + // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard + // #define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue + // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation + // #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back + // #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left + // #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right + // #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Single hue fractal filled keys pulsing horizontally out to edges + // #define ENABLE_RGB_MATRIX_PIXEL_FLOW // Pulsing RGB flow along LED wiring with random hues + // #define ENABLE_RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues + + // These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available. + // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! + // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation + + // These modes also require the RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES define to be available. + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out + // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out + + #define RGB_MATRIX_VAL_STEP 4 + #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR + #define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set + #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set + #define RGB_MATRIX_DEFAULT_VAL 60 //RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set + #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set +#endif +//------------------------------------------ + + +// 'old' RGB Lightning definitions, used when RGBLIGHT_ENABLE = yes in rules.mk +//------------------------------------------ +#ifdef RGBLIGHT_ENABLE +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_SLEEP /* the RGB lighting will be switched off when the host goes to sleep */ +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE +#endif +//------------------------------------------ diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/vial/keymap.c b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/keymap.c new file mode 100644 index 0000000000..63b2c176ca --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/keymap.c @@ -0,0 +1,129 @@ +/* Copyright 2019 Leo Batyuk + * Copyright 2020 Drashna Jaelre <@drashna> + * Copyright 2020 @ben_roe (keycapsss.com) + * Copyright 2023 @Ex3c4Def + * + * 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 + +enum layers { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* QWERTY + * ,--------------------------------------------. ,----------------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | LShift | A | S | D | F | G |---------------. ,---------------| H | J | K | L | ; | ' | + * |---------+------+------+------+------+------| [ | [ | | [ | [ |------+------+------+------+------+-----------| + * | LCTRL | Z | X | C | V | B |------|--------| |-------|-------| N | M | , | . | / |RShift/Enter| + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_LBRC, KC_RBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), + KC_LCTL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI, KC_RALT +), +/* LOWER +* QWERTY + * ,--------------------------------------------. ,----------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | ` | ! | @ | # | $ | % |---------------. ,---------------| ^ | & | * | ( | ) | ~ | + * |---------+------+------+------+------+------| | | | | |------+------+------+------+------+-----------| + * | | | | | | |------|--------| |-------|-------| | _ | + | { | } | \ | + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ +[_LOWER] = LAYOUT( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, + _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS, + _______, _______, _______, _______,_______, _______, _______, _______, _______, _______ +), +/* RAISE + * ,--------------------------------------------. ,----------------------------------------------. + * | | | | | | | | | | | | | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | F1 | F2 | F3 | F4 | F5 | F6 |---------------. ,---------------| Left | Down | Up |Right | ; | | + * |---------+------+------+------+------+------| [ | [ | | [ | [ |------+------+------+------+------+-----------| + * | F7 | F8 | F9 | F10 | F11 | F12 |------|--------| |-------|-------| + | - | = | [ | ] | \ | + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +), +/* ADJUST (Press LOWER and RAISE together) + * ,--------------------------------------------. ,----------------------------------------------. + * | QK_BOOT | | | | | | | | | | | | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | RGB ON | HUE+ | SAT+ | VAL+ | | | | PREV | PLAY | NEXT | | | | + * |---------+------+------+------+------+------| |------+------+------+------+------+-----------| + * | MODE | HUE- | SAT- | VAL- | | |---------------. ,---------------| VOL+ | MUTE | VOL- | | | | + * |---------+------+------+------+------+------| | | | | |------+------+------+------+------+-----------| + * | | | | | | |------|--------| |-------|-------| | | | | | | + * `--------------------------------------------| / \ |----------------------------------------------' + * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT | + * `----------------------------------' '---------------------------------' + */ +[_ADJUST] = LAYOUT( + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +) +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); + return state; +} + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, + [_LOWER] = { ENCODER_CCW_CW(RGB_HUI, KC_TAB), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + // Encoder 1 Encoder 2 +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/vial/rules.mk b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/rules.mk new file mode 100644 index 0000000000..7e1db9fe6e --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/rules.mk @@ -0,0 +1,15 @@ +ENCODER_MAP_ENABLE = yes + +VIA_ENABLE = yes +VIAL_ENABLE = yes + +RGBLIGHT_ENABLE = no # Enable keyboard 'old' RGB lightning +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB Matrix lightning +VIALRGB_ENABLE = yes # RGB_MATRIX_ENABLE is required + +# Disabled, because firmware size is to big for Pro Micros +MOUSEKEY_ENABLE = no +QMK_SETTINGS = no +TAP_DANCE_ENABLE = no +COMBO_ENABLE = no +KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/vial/vial.json b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/vial.json new file mode 100644 index 0000000000..ff7486a202 --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/vial/vial.json @@ -0,0 +1,369 @@ +{ + "name": "Keycapsss Kimiko rev2", + "vendorId": "0x7983", + "productId": "0x4B69", + "lighting": "vialrgb", + "matrix": { "rows": 12, "cols": 6 }, + "layouts": { + "keymap": [ + [ + { + "x": 3 + }, + "0,3", + { + "x": 10 + }, + "6,3" + ], + [ + { + "y": -0.69, + "x": 2 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 8 + }, + "6,4", + { + "x": 1 + }, + "6,2" + ], + [ + { + "y": -0.85, + "x": 5 + }, + "0,5", + { + "x": 6 + }, + "6,5" + ], + [ + { + "y": -0.5 + }, + "0,0", + "0,1", + { + "x": 14 + }, + "6,1", + "6,0" + ], + [ + { + "y": -0.96, + "x": 3 + }, + "1,3", + { + "x": 10 + }, + "7,3" + ], + [ + { + "y": -0.69, + "x": 2 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 8 + }, + "7,4", + { + "x": 1 + }, + "7,2" + ], + [ + { + "y": -0.8500000000000001, + "x": 5 + }, + "1,5", + { + "x": 6 + }, + "7,5" + ], + [ + { + "y": -0.5 + }, + "1,0", + "1,1", + { + "x": 14 + }, + "7,1", + "7,0" + ], + [ + { + "y": -0.96, + "x": 3 + }, + "2,3", + { + "x": 10 + }, + "8,3" + ], + [ + { + "y": -0.69, + "x": 2 + }, + "2,2", + { + "x": 1 + }, + "2,4", + { + "x": 8 + }, + "8,4", + { + "x": 1 + }, + "8,2" + ], + [ + { + "y": -0.8500000000000001, + "x": 5 + }, + "2,5", + { + "x": 6 + }, + "8,5" + ], + [ + { + "y": -0.5 + }, + "2,0", + "2,1", + { + "x": 14 + }, + "8,1", + "8,0" + ], + [ + { + "y": -0.96, + "x": 3 + }, + "3,3", + { + "x": 10 + }, + "9,3" + ], + [ + { + "y": -0.69, + "x": 2 + }, + "3,2", + { + "x": 1 + }, + "3,4", + { + "x": 8 + }, + "9,4", + { + "x": 1 + }, + "9,2" + ], + [ + { + "y": -0.8500000000000001, + "x": 5 + }, + "3,5", + { + "x": 6 + }, + "9,5" + ], + [ + { + "y": -0.5 + }, + "3,0", + "3,1", + { + "x": 14 + }, + "9,1", + "9,0" + ], + [ + { + "y": -0.5300000000000011, + "x": 13.5 + }, + "10,1", + "10,0" + ], + [ + { + "y": -0.9999999999999991, + "x": 2.5 + }, + "4,0", + "4,1" + ], + [ + { + "r": 15, + "rx": 5.1, + "ry": 5.1, + "y": -0.5499999999999998, + "x": -0.5 + }, + "4,2" + ], + [ + { + "r": 35, + "rx": 6.5, + "ry": 5.25, + "y": -0.04999999999999982, + "x": -0.5999999999999996 + }, + "4,3" + ], + [ + { + "rx": 6.55, + "ry": 4.56, + "y": -0.4400000000000004, + "x": -0.25 + }, + "5,5\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "rx": 6.9, + "ry": 3.56, + "y": -0.56, + "x": -0.5 + }, + "0,0\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "rx": 7.61, + "ry": 4.27, + "y": -0.77, + "x": -0.5099999999999998 + }, + "0,1\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "r": 45, + "rx": 6.55, + "ry": 5.97, + "y": -0.5699999999999994, + "x": 0.04999999999999982 + }, + "4,4" + ], + [ + { + "rx": 7.26, + "ry": 5.27, + "y": -0.5700000000000003, + "x": 0.040000000000000036 + }, + "4,5" + ], + [ + { + "r": -45, + "rx": 10.74, + "y": -0.6699999999999999, + "x": -1.040000000000001 + }, + "10,5" + ], + [ + { + "rx": 11.45, + "ry": 5.97, + "y": -0.6699999999999999, + "x": -1.049999999999999 + }, + "10,4" + ], + [ + { + "r": -35, + "rx": 10.39, + "ry": 4.27, + "y": -0.7699999999999996, + "x": -0.5 + }, + "1,0\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "rx": 11.1, + "ry": 3.56, + "y": -0.5800000000000001, + "x": -0.5 + }, + "1,1\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "rx": 11.45, + "ry": 4.56, + "y": -0.5, + "x": -0.75 + }, + "11,5\n\n\n\n\n\n\n\n\ne1" + ], + [ + { + "rx": 12.16, + "ry": 5.27, + "y": -0.5, + "x": -0.9600000000000009 + }, + "10,3" + ], + [ + { + "r": -15, + "rx": 13.25, + "ry": 4.75, + "y": -0.2999999999999998, + "x": -0.9499999999999993 + }, + "10,2" + ] + ] + } +} diff --git a/keyboards/keycapsss/kimiko/rev2/rules.mk b/keyboards/keycapsss/kimiko/rev2/rules.mk new file mode 100644 index 0000000000..7d895c7f4d --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev2/rules.mk @@ -0,0 +1 @@ +# File is left intentionally blank diff --git a/keyboards/keycapsss/kimiko/rules.mk b/keyboards/keycapsss/kimiko/rules.mk index 7aeacb46d0..cb9f69d6bb 100644 --- a/keyboards/keycapsss/kimiko/rules.mk +++ b/keyboards/keycapsss/kimiko/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - -DEFAULT_FOLDER = keycapsss/kimiko/rev1 +DEFAULT_FOLDER = keycapsss/kimiko/rev2