diff options
Diffstat (limited to 'keyboards/custommk')
19 files changed, 337 insertions, 528 deletions
diff --git a/keyboards/custommk/evo70/config.h b/keyboards/custommk/evo70/config.h index 633cbec155..3010e4989d 100644 --- a/keyboards/custommk/evo70/config.h +++ b/keyboards/custommk/evo70/config.h @@ -16,25 +16,10 @@ #pragma once - #define OLED_UPDATE_INTERVAL 33 #define OLED_DISABLE_TIMEOUT #define TAP_CODE_DELAY 10 -#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 -#define RGBLIGHT_LAYERS -#define RGBLIGHT_LIMIT_VAL 128 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4 - -#define RGBLIGHT_SLEEP
\ No newline at end of file diff --git a/keyboards/custommk/evo70/evo70.c b/keyboards/custommk/evo70/evo70.c index 23ec0ec8f1..f2874c4e8a 100644 --- a/keyboards/custommk/evo70/evo70.c +++ b/keyboards/custommk/evo70/evo70.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "evo70.h" +#include "quantum.h" #include <stdbool.h> #include "matrix.h" #include OLED_FONT_H diff --git a/keyboards/custommk/evo70/evo70.h b/keyboards/custommk/evo70/evo70.h deleted file mode 100644 index 2766da19c9..0000000000 --- a/keyboards/custommk/evo70/evo70.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 customMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K11, K61, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K62, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K66, K31, K63, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K57, K55, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K52, K54, K65, K51, K53, K56, K67, E00A, K59, K5A, E00B, K5C, K5D, K5E \ -) { \ - { K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K51, K52, K53, K54, K55, K56, K57, E00A, K59, K5A, E00B, K5C, K5D, K5E }, \ - { K61, K62, K63, KC_NO, K65, K66, K67, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index 1ea89ad92a..769e2e6118 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -4,6 +4,21 @@ "maintainer": "customMK", "manufacturer": "customMK", "tags": ["70%", "encoder", "underglow", "backlight"], + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true, + "oled": true + }, + "build": { + "lto": true + }, "usb": { "vid": "0xF35B", "pid": "0xFAB5", @@ -26,106 +41,119 @@ "matrix_pins": { "cols": ["F1", "F4", "E6", "B1", "B7", "B0", "E2", "D4", "D6", "D7", "B4", "B3", "B6", "C6"], "rows": ["D3", "D2", "F7", "F6", "F5", "F0"] - }, "rgblight": { "led_count": 48, - "pin": "B2", "hue_steps": 4, "saturation_steps": 8, "brightness_steps": 4, + "max_brightness": 128, + "sleep": true, "animations": { "alternating": true, "breathing": true, "christmas": true, - "knight": true, "rainbow_mood": true, "rainbow_swirl": true, - "rgb_test": true, "snake": true, - "static_gradient": true, - "twinkle": true + "static_gradient": true } }, + "ws2812": { + "pin": "B2" + }, "layouts": { "LAYOUT": { "layout": [ - {"label":"KC_ESC", "x":2.5, "y":1.1}, - {"label":"KC_1", "x":3.5, "y":1.1}, - {"label":"KC_2", "x":4.5, "y":1.1}, - {"label":"KC_3", "x":5.5, "y":1.1}, - {"label":"KC_4", "x":6.5, "y":1.1}, - {"label":"KC_5", "x":7.5, "y":1.1}, - {"label":"KC_6", "x":8.5, "y":1.1}, - {"label":"KC_7", "x":9.5, "y":1.1}, - {"label":"KC_8", "x":10.5, "y":1.1}, - {"label":"KC_9", "x":11.5, "y":1.1}, - {"label":"KC_0", "x":12.5, "y":1.1}, - {"label":"KC_MINS", "x":13.5, "y":1.1}, - {"label":"KC_EQL", "x":14.5, "y":1.1}, - {"label":"KC_BSPC", "x":15.5, "y":1.1, "w":2}, - {"label":"KC_DEL", "x":17.5, "y":1.1}, - {"label":"KC_TAB", "x":2.5, "y":2.1, "w":1.5}, - {"label":"KC_Q", "x":4, "y":2.1}, - {"label":"KC_W", "x":5, "y":2.1}, - {"label":"KC_E", "x":6, "y":2.1}, - {"label":"KC_R", "x":7, "y":2.1}, - {"label":"KC_T", "x":8, "y":2.1}, - {"label":"KC_Y", "x":9, "y":2.1}, - {"label":"KC_U", "x":10, "y":2.1}, - {"label":"KC_I", "x":11, "y":2.1}, - {"label":"KC_O", "x":12, "y":2.1}, - {"label":"KC_P", "x":13, "y":2.1}, - {"label":"KC_LBRC", "x":14, "y":2.1}, - {"label":"KC_RBRC", "x":15, "y":2.1}, - {"label":"KC_BSLS", "x":16, "y":2.1, "w":1.5}, - {"label":"KC_PGUP", "x":17.5, "y":2.1}, - {"label":"KC_F1", "x":0, "y":3.1}, - {"label":"KC_F2", "x":1, "y":3.1}, - {"label":"KC_CAPS", "x":2.5, "y":3.1, "w":1.75}, - {"label":"KC_A", "x":4.25, "y":3.1}, - {"label":"KC_S", "x":5.25, "y":3.1}, - {"label":"KC_D", "x":6.25, "y":3.1}, - {"label":"KC_F", "x":7.25, "y":3.1}, - {"label":"KC_G", "x":8.25, "y":3.1}, - {"label":"KC_H", "x":9.25, "y":3.1}, - {"label":"KC_J", "x":10.25, "y":3.1}, - {"label":"KC_K", "x":11.25, "y":3.1}, - {"label":"KC_L", "x":12.25, "y":3.1}, - {"label":"KC_SCLN", "x":13.25, "y":3.1}, - {"label":"KC_QUOT", "x":14.25, "y":3.1}, - {"label":"KC_ENT", "x":15.25, "y":3.1, "w":2.25}, - {"label":"KC_PGDN", "x":17.5, "y":3.1}, - {"label":"KC_F3", "x":0, "y":4.1}, - {"label":"KC_F4", "x":1, "y":4.1}, - {"label":"KC_LSFT", "x":2.5, "y":4.1, "w":2.25}, - {"label":"KC_Z", "x":4.75, "y":4.1}, - {"label":"KC_X", "x":5.75, "y":4.1}, - {"label":"KC_C", "x":6.75, "y":4.1}, - {"label":"KC_V", "x":7.75, "y":4.1}, - {"label":"KC_B", "x":8.75, "y":4.1}, - {"label":"KC_N", "x":9.75, "y":4.1}, - {"label":"KC_M", "x":10.75, "y":4.1}, - {"label":"KC_COMM", "x":11.75, "y":4.1}, - {"label":"KC_DOT", "x":12.75, "y":4.1}, - {"label":"KC_SLSH", "x":13.75, "y":4.1}, - {"label":"KC_RSFT", "x":14.75, "y":4.1, "w":1.75}, - {"label":"KC_UP", "x":16.5, "y":4.1}, - {"label":"KC_END", "x":17.5, "y":4.1}, - {"label":"KC_F5", "x":0, "y":5.1}, - {"label":"KC_F6", "x":1, "y":5.1}, - {"label":"KC_LCTL", "x":2.5, "y":5.1, "w":1.25}, - {"label":"KC_LGUI", "x":3.75, "y":5.1, "w":1.25}, - {"label":"KC_LALT", "x":5, "y":5.1, "w":1.25}, - {"label":"KC_SPC", "x":6.25, "y":5.1, "w":6.25}, - {"label":"KC_TRNS", "x":0.5, "y":1.1}, - {"label":"KC_VOLD", "x":0, "y":0}, - {"label":"KC_RALT", "x":12.5, "y":5.1, "w":1.25}, - {"label":"KC_RCTL", "x":13.75, "y":5.1, "w":1.25}, - {"label":"KC_VOLU", "x":1, "y":0}, - {"label":"KC_LEFT", "x":15.5, "y":5.1}, - {"label":"KC_DOWN", "x":16.5, "y":5.1}, - {"label":"KC_RGHT", "x":17.5, "y":5.1}] + {"matrix": [0, 0], "x": 2.5, "y": 1.1}, + {"matrix": [5, 0], "x": 3.5, "y": 1.1}, + {"matrix": [0, 1], "x": 4.5, "y": 1.1}, + {"matrix": [0, 2], "x": 5.5, "y": 1.1}, + {"matrix": [0, 3], "x": 6.5, "y": 1.1}, + {"matrix": [0, 4], "x": 7.5, "y": 1.1}, + {"matrix": [0, 5], "x": 8.5, "y": 1.1}, + {"matrix": [0, 6], "x": 9.5, "y": 1.1}, + {"matrix": [0, 7], "x": 10.5, "y": 1.1}, + {"matrix": [0, 8], "x": 11.5, "y": 1.1}, + {"matrix": [0, 9], "x": 12.5, "y": 1.1}, + {"matrix": [0, 10], "x": 13.5, "y": 1.1}, + {"matrix": [0, 11], "x": 14.5, "y": 1.1}, + {"matrix": [0, 12], "x": 15.5, "y": 1.1, "w": 2}, + {"matrix": [0, 13], "x": 17.5, "y": 1.1}, + + {"matrix": [5, 1], "x": 2.5, "y": 2.1, "w": 1.5}, + {"matrix": [1, 0], "x": 4, "y": 2.1}, + {"matrix": [1, 1], "x": 5, "y": 2.1}, + {"matrix": [1, 2], "x": 6, "y": 2.1}, + {"matrix": [1, 3], "x": 7, "y": 2.1}, + {"matrix": [1, 4], "x": 8, "y": 2.1}, + {"matrix": [1, 5], "x": 9, "y": 2.1}, + {"matrix": [1, 6], "x": 10, "y": 2.1}, + {"matrix": [1, 7], "x": 11, "y": 2.1}, + {"matrix": [1, 8], "x": 12, "y": 2.1}, + {"matrix": [1, 9], "x": 13, "y": 2.1}, + {"matrix": [1, 10], "x": 14, "y": 2.1}, + {"matrix": [1, 11], "x": 15, "y": 2.1}, + {"matrix": [1, 12], "x": 16, "y": 2.1, "w": 1.5}, + {"matrix": [1, 13], "x": 17.5, "y": 2.1}, + + {"matrix": [5, 5], "x": 0, "y": 3.1}, + {"matrix": [2, 0], "x": 1, "y": 3.1}, + + {"matrix": [5, 2], "x": 2.5, "y": 3.1, "w": 1.75}, + {"matrix": [2, 1], "x": 4.25, "y": 3.1}, + {"matrix": [2, 2], "x": 5.25, "y": 3.1}, + {"matrix": [2, 3], "x": 6.25, "y": 3.1}, + {"matrix": [2, 4], "x": 7.25, "y": 3.1}, + {"matrix": [2, 5], "x": 8.25, "y": 3.1}, + {"matrix": [2, 6], "x": 9.25, "y": 3.1}, + {"matrix": [2, 7], "x": 10.25, "y": 3.1}, + {"matrix": [2, 8], "x": 11.25, "y": 3.1}, + {"matrix": [2, 9], "x": 12.25, "y": 3.1}, + {"matrix": [2, 10], "x": 13.25, "y": 3.1}, + {"matrix": [2, 11], "x": 14.25, "y": 3.1}, + {"matrix": [2, 12], "x": 15.25, "y": 3.1, "w": 2.25}, + {"matrix": [2, 13], "x": 17.5, "y": 3.1}, + + {"matrix": [4, 6], "x": 0, "y": 4.1}, + {"matrix": [4, 4], "x": 1, "y": 4.1}, + + {"matrix": [3, 0], "x": 2.5, "y": 4.1, "w": 2.25}, + {"matrix": [3, 1], "x": 4.75, "y": 4.1}, + {"matrix": [3, 2], "x": 5.75, "y": 4.1}, + {"matrix": [3, 3], "x": 6.75, "y": 4.1}, + {"matrix": [3, 4], "x": 7.75, "y": 4.1}, + {"matrix": [3, 5], "x": 8.75, "y": 4.1}, + {"matrix": [3, 6], "x": 9.75, "y": 4.1}, + {"matrix": [3, 7], "x": 10.75, "y": 4.1}, + {"matrix": [3, 8], "x": 11.75, "y": 4.1}, + {"matrix": [3, 9], "x": 12.75, "y": 4.1}, + {"matrix": [3, 10], "x": 13.75, "y": 4.1}, + {"matrix": [3, 11], "x": 14.75, "y": 4.1, "w": 1.75}, + {"matrix": [3, 12], "x": 16.5, "y": 4.1}, + {"matrix": [3, 13], "x": 17.5, "y": 4.1}, + + {"matrix": [4, 1], "x": 0, "y": 5.1}, + {"matrix": [4, 3], "x": 1, "y": 5.1}, + + {"matrix": [5, 4], "x": 2.5, "y": 5.1, "w": 1.25}, + {"matrix": [4, 0], "x": 3.75, "y": 5.1, "w": 1.25}, + {"matrix": [4, 2], "x": 5, "y": 5.1, "w": 1.25}, + {"matrix": [4, 5], "x": 6.25, "y": 5.1, "w": 6.25}, + + {"matrix": [5, 6], "x": 0.5, "y": 1.1}, + + {"matrix": [4, 7], "x": 0, "y": 0}, + + {"matrix": [4, 8], "x": 12.5, "y": 5.1, "w": 1.25}, + {"matrix": [4, 9], "x": 13.75, "y": 5.1, "w": 1.25}, + + {"matrix": [4, 10], "x": 1, "y": 0}, + + {"matrix": [4, 11], "x": 15.5, "y": 5.1}, + {"matrix": [4, 12], "x": 16.5, "y": 5.1}, + {"matrix": [4, 13], "x": 17.5, "y": 5.1} + ] } } } diff --git a/keyboards/custommk/evo70/keymaps/default/keymap.c b/keyboards/custommk/evo70/keymaps/default/keymap.c index cf912e0d08..6f518dd964 100644 --- a/keyboards/custommk/evo70/keymaps/default/keymap.c +++ b/keyboards/custommk/evo70/keymaps/default/keymap.c @@ -19,31 +19,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT), - - [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), }; diff --git a/keyboards/custommk/evo70/keymaps/default/readme.md b/keyboards/custommk/evo70/keymaps/default/readme.md deleted file mode 100644 index 427180663d..0000000000 --- a/keyboards/custommk/evo70/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default EVO70 Layout - -This is the default layout for EVO70.
\ No newline at end of file diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c index 74f68590cf..34de0889ee 100644 --- a/keyboards/custommk/evo70/keymaps/via/keymap.c +++ b/keyboards/custommk/evo70/keymaps/via/keymap.c @@ -19,33 +19,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT), + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT + ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), }; static bool custom_encoder_mode = false; @@ -57,12 +44,14 @@ void set_custom_encoder_mode_user(bool custom_mode) { keyevent_t encoder_ccw = { .key = (keypos_t){.row = 4, .col = 7}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder_cw = { .key = (keypos_t){.row = 4, .col = 10}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; @@ -70,12 +59,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) { if (custom_encoder_mode) { if (clockwise) { encoder_cw.pressed = true; - encoder_cw.time = (timer_read() | 1); + encoder_cw.time = timer_read(); action_exec(encoder_cw); } else { encoder_ccw.pressed = true; - encoder_ccw.time = (timer_read() | 1); + encoder_ccw.time = timer_read(); action_exec(encoder_ccw); } return false; @@ -84,15 +73,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } void matrix_scan_user(void) { - if (IS_PRESSED(encoder_ccw)) { + if (encoder_ccw.pressed) { encoder_ccw.pressed = false; - encoder_ccw.time = (timer_read() | 1); + encoder_ccw.time = timer_read(); action_exec(encoder_ccw); } - if (IS_PRESSED(encoder_cw)) { + if (encoder_cw.pressed) { encoder_cw.pressed = false; - encoder_cw.time = (timer_read() | 1); + encoder_cw.time = timer_read(); action_exec(encoder_cw); } -}
\ No newline at end of file +} diff --git a/keyboards/custommk/evo70/keymaps/via/readme.md b/keyboards/custommk/evo70/keymaps/via/readme.md deleted file mode 100644 index 19f936fac7..0000000000 --- a/keyboards/custommk/evo70/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# EVO70 Layout for VIA - -This is the via layout for the EVO70. It is identical to the default layout except VIA is enabled.
\ No newline at end of file diff --git a/keyboards/custommk/evo70/keymaps/via/rules.mk b/keyboards/custommk/evo70/keymaps/via/rules.mk index 43061db1dd..1e5b99807c 100644 --- a/keyboards/custommk/evo70/keymaps/via/rules.mk +++ b/keyboards/custommk/evo70/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/custommk/evo70/rules.mk b/keyboards/custommk/evo70/rules.mk index 1f9083a182..6e7633bfe0 100644 --- a/keyboards/custommk/evo70/rules.mk +++ b/keyboards/custommk/evo70/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -LTO_ENABLE = yes +# This file intentionally left blank diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h index c5e7661c65..2967c1a31c 100644 --- a/keyboards/custommk/genesis/rev1/config.h +++ b/keyboards/custommk/genesis/rev1/config.h @@ -16,17 +16,8 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 } -#define MATRIX_COL_PINS { F4, F5, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index aaab705432..2b0b245b45 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -1,13 +1,21 @@ { - "keyboard_name": "Genesis Rev1", + "keyboard_name": "Genesis Rev1", "manufacturer": "customMK", - "url": "https://www.customMK.com", - "maintainer": "customMK", + "url": "https://www.customMK.com", + "maintainer": "customMK", "usb": { "vid": "0xF35B", "pid": "0xFAB0", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["F4", "F5", "D7", "B4"], + "rows": ["F0", "C7", "C6", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7", "resolution": 2}, @@ -18,11 +26,57 @@ "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { - "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}] + "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": [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": [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": [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}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4} + ] }, "LAYOUT_numpad_5x4": { - "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}] + "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1, "h": 2}, + + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [4, 0], "x": 3, "y": 3, "h": 2}, + + {"matrix": [4, 2], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 2, "y": 4} + ] } - } } diff --git a/keyboards/custommk/genesis/rev1/rev1.c b/keyboards/custommk/genesis/rev1/rev1.c deleted file mode 100644 index ac40eedbf2..0000000000 --- a/keyboards/custommk/genesis/rev1/rev1.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 customMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "rev1.h" - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) return false; - /* top left encoder */ - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - /* top right encoder */ - else if (index == 1) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} diff --git a/keyboards/custommk/genesis/rev1/rev1.h b/keyboards/custommk/genesis/rev1/rev1.h deleted file mode 100644 index 0516b41ad8..0000000000 --- a/keyboards/custommk/genesis/rev1/rev1.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 customMK - * - * 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 distribute |