From a336c2c5005251e4cb0f3a62ccabdb4cfccad915 Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 6 Dec 2022 17:10:48 +0800 Subject: Merge upstream master to 2022 Q4 breaking change --- keyboards/matrix/abelx/config.h | 110 ---- keyboards/matrix/abelx/keymaps/default/keymap.c | 41 -- keyboards/matrix/abelx/keymaps/iso/keymap.c | 39 -- keyboards/matrix/cain_re/config.h | 60 -- keyboards/matrix/cain_re/keymaps/default/keymap.c | 40 -- keyboards/matrix/falcon/keymaps/via/keymap.c | 46 -- keyboards/matrix/m12og/rev1/config.h | 57 -- .../matrix/m12og/rev1/keymaps/default/keymap.c | 50 -- keyboards/matrix/m12og/rev1/rules.mk | 26 - keyboards/matrix/m12og/rev2/config.h | 39 -- .../matrix/m12og/rev2/keymaps/default/keymap.c | 25 - keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c | 24 - keyboards/matrix/m12og/rev2/keymaps/via/keymap.c | 57 -- keyboards/matrix/m20add/config.h | 99 ---- keyboards/matrix/m20add/keymaps/default/keymap.c | 26 - keyboards/matrix/m20add/keymaps/iso/keymap.c | 24 - keyboards/matrix/m20add/rgb_ring.c | 457 --------------- keyboards/matrix/me/keymaps/default/keymap.c | 37 -- keyboards/matrix/me/keymaps/via/keymap.c | 56 -- keyboards/matrix/noah/config.h | 101 ---- keyboards/matrix/noah/keymaps/blockader/keymap.c | 652 --------------------- keyboards/matrix/noah/keymaps/default/keymap.c | 20 - keyboards/matrix/noah/keymaps/iso/keymap.c | 20 - keyboards/matrix/noah/keymaps/splitspace/keymap.c | 20 - keyboards/matrix/noah/keymaps/wkl/keymap.c | 20 - keyboards/matrix/noah/noah.c | 230 -------- 26 files changed, 2376 deletions(-) delete mode 100644 keyboards/matrix/abelx/config.h delete mode 100644 keyboards/matrix/abelx/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/abelx/keymaps/iso/keymap.c delete mode 100644 keyboards/matrix/cain_re/config.h delete mode 100644 keyboards/matrix/cain_re/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/falcon/keymaps/via/keymap.c delete mode 100644 keyboards/matrix/m12og/rev1/config.h delete mode 100644 keyboards/matrix/m12og/rev1/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/m12og/rev1/rules.mk delete mode 100644 keyboards/matrix/m12og/rev2/config.h delete mode 100644 keyboards/matrix/m12og/rev2/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c delete mode 100644 keyboards/matrix/m12og/rev2/keymaps/via/keymap.c delete mode 100644 keyboards/matrix/m20add/config.h delete mode 100644 keyboards/matrix/m20add/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/m20add/keymaps/iso/keymap.c delete mode 100644 keyboards/matrix/m20add/rgb_ring.c delete mode 100644 keyboards/matrix/me/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/me/keymaps/via/keymap.c delete mode 100644 keyboards/matrix/noah/config.h delete mode 100644 keyboards/matrix/noah/keymaps/blockader/keymap.c delete mode 100644 keyboards/matrix/noah/keymaps/default/keymap.c delete mode 100644 keyboards/matrix/noah/keymaps/iso/keymap.c delete mode 100644 keyboards/matrix/noah/keymaps/splitspace/keymap.c delete mode 100644 keyboards/matrix/noah/keymaps/wkl/keymap.c delete mode 100644 keyboards/matrix/noah/noah.c (limited to 'keyboards/matrix') diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h deleted file mode 100644 index 06f9d31860..0000000000 --- a/keyboards/matrix/abelx/config.h +++ /dev/null @@ -1,110 +0,0 @@ -/** - * config.h - * - * Copyright 2020 astro - * - * 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 - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - -#define DEF_PIN(port, pin) (((port) << 8) | pin) -#define GET_PORT(pp) (((pp) >> 8) & 0xFF) -#define GET_PIN(pp) ((pp) & 0xFF) - -#define CUSTOM_MATRIX_ROW_PINS { \ - DEF_PIN(TCA6424_PORT2, 7), \ - DEF_PIN(TCA6424_PORT2, 6), \ - DEF_PIN(TCA6424_PORT2, 0), \ - DEF_PIN(TCA6424_PORT2, 2), \ - DEF_PIN(TCA6424_PORT2, 4), \ - DEF_PIN(TCA6424_PORT2, 5) } - -#define CUSTOM_MATRIX_COL_PINS { \ - DEF_PIN(TCA6424_PORT2, 1), \ - DEF_PIN(TCA6424_PORT1, 7), \ - DEF_PIN(TCA6424_PORT1, 6), \ - DEF_PIN(TCA6424_PORT1, 5), \ - DEF_PIN(TCA6424_PORT1, 4), \ - DEF_PIN(TCA6424_PORT1, 3), \ - DEF_PIN(TCA6424_PORT1, 2), \ - DEF_PIN(TCA6424_PORT1, 1), \ - DEF_PIN(TCA6424_PORT1, 0), \ - DEF_PIN(TCA6424_PORT0, 7), \ - DEF_PIN(TCA6424_PORT0, 6), \ - DEF_PIN(TCA6424_PORT0, 5), \ - DEF_PIN(TCA6424_PORT0, 4), \ - DEF_PIN(TCA6424_PORT0, 3), \ - DEF_PIN(TCA6424_PORT0, 2), \ - DEF_PIN(TCA6424_PORT0, 1) } - -#define ROW1_MASK 0x80 -#define ROW2_MASK 0x40 -#define ROW3_MASK 0x01 -#define ROW4_MASK 0x04 -#define ROW5_MASK 0x10 -#define ROW6_MASK 0x20 -#define ROW_PORT TCA6424_PORT2 - -#define COL1_MASK 0x02 -#define COL2_MASK 0x80 -#define COL3_MASK 0x40 -#define COL4_MASK 0x20 -#define COL5_MASK 0x10 -#define COL6_MASK 0x08 -#define COL7_MASK 0x04 -#define COL8_MASK 0x02 -#define COL9_MASK 0x01 -#define COL10_MASK 0x80 -#define COL11_MASK 0x40 -#define COL12_MASK 0x20 -#define COL13_MASK 0x10 -#define COL14_MASK 0x08 -#define COL15_MASK 0x04 -#define COL16_MASK 0x02 - - -#define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - -// i2c setting -#define USE_I2CV1 -#define I2C1_SCL 8 -#define I2C1_SDA 9 -#define I2C1_CLOCK_SPEED 400000 -#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - - -// rgb light setting -#define RGBLED_NUM 9 -#define RGB_DI_PIN B4 -#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 AW9523B_RGB_NUM 4 - -#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE diff --git a/keyboards/matrix/abelx/keymaps/default/keymap.c b/keyboards/matrix/abelx/keymaps/default/keymap.c deleted file mode 100644 index e4d2cd41f5..0000000000 --- a/keyboards/matrix/abelx/keymaps/default/keymap.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * keymap.c - * - * Copyright 2020 astro - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_ansi( - - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - - [1]=LAYOUT_tkl_ansi( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/abelx/keymaps/iso/keymap.c b/keyboards/matrix/abelx/keymaps/iso/keymap.c deleted file mode 100644 index e006109905..0000000000 --- a/keyboards/matrix/abelx/keymaps/iso/keymap.c +++ /dev/null @@ -1,39 +0,0 @@ -/** - * keymap.c - * - * Copyright 2020 astro - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, - KC_LSFT, KC_LGUI, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_tkl_iso( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h deleted file mode 100644 index 74acef9af3..0000000000 --- a/keyboards/matrix/cain_re/config.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * config.h - * - Copyright 2020 astro - - 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 - -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 9 -#define MATRIX_COLS 12 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, C7, C6, D5, D2, D4, D7, B7, D1 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, B5, B6, B3, B2, B1, D0, B4, D6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E6 - -#ifdef RGB_DI_PIN -#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 RGBLED_NUM 14 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP -#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 } -#endif - -#define CAPS_PIN D3 -#define NUM_PIN F7 -#define SCROLL_PIN B0 diff --git a/keyboards/matrix/cain_re/keymaps/default/keymap.c b/keyboards/matrix/cain_re/keymaps/default/keymap.c deleted file mode 100644 index 8df1dabe61..0000000000 --- a/keyboards/matrix/cain_re/keymaps/default/keymap.c +++ /dev/null @@ -1,40 +0,0 @@ -/** - * keymap.c - * - Copyright 2020 astro - - 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, - 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_P1, KC_P2, KC_P3, KC_PENT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_all( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, _______,_______,_______,_______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/falcon/keymaps/via/keymap.c b/keyboards/matrix/falcon/keymaps/via/keymap.c deleted file mode 100644 index 469a875c5b..0000000000 --- a/keyboards/matrix/falcon/keymaps/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -/** - * keymap.c - * - Copyright 2021 astro - 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, 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_DEL, KC_BSPC, - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LALT, KC_SPC, KC_RGUI,KC_RALT), - - [1] = LAYOUT_all( - KC_GRV, 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_DEL, - QK_BOOT, _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SCRL,KC_PSCR,KC_PGUP,_______,KC_INS, - _______, KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______, _______,_______,KC_HOME,KC_END,_______, _______, - _______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,_______,_______, - _______,_______, _______, _______,MO(2)), - - [2] = LAYOUT_all( - _______, _______,_______, _______,_______, _______,_______, _______,_______, _______,_______, _______,_______,_______,_______, - _______, _______,KC_VOLU,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, - KC_MUTE, KC_MPRV,KC_VOLD,KC_MNXT,_______,_______,_______,_______, _______,_______,_______,_______,_______, _______, - _______, _______, RGB_TOG,RGB_MOD,RGB_RMOD,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,_______,_______,_______, - _______,_______, KC_MPLY, _______,_______), - - [3] = LAYOUT_all( - _______, _______,_______, _______,_______, _______,_______, _______,_______, _______,_______, _______,_______,_______,_______, - _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, - _______, _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, - _______,_______, _______, _______,_______) -}; diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h deleted file mode 100644 index ca4ee5b96c..0000000000 --- a/keyboards/matrix/m12og/rev1/config.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright 2021 kb-elmo - -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 - -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - -/* Keyboard Matrix Assignments */ - -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Status LEDs */ -#define LED_CAPS_LOCK_PIN B6 -#define LED_SCROLL_LOCK_PIN B5 - -/* RGB */ -#define RGB_DI_PIN B8 -#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 RGBLED_NUM 16 -#define RGBLIGHT_SLEEP -#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 diff --git a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c deleted file mode 100644 index 10ed423186..0000000000 --- a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2021 kb-elmo - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_all( - KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, KC_TRNS, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; - -bool led_update_user(led_t led_state) { - static uint8_t caps_state = 0; - if (caps_state != led_state.caps_lock) { - if (led_state.caps_lock) { - rgblight_sethsv_noeeprom(HSV_CYAN); - rgblight_mode_noeeprom(1); - } else { - rgblight_sethsv_noeeprom(5, 255, 255); - rgblight_mode_noeeprom(37); - } - caps_state = led_state.caps_lock; - } - return true; -}; diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk deleted file mode 100644 index 136d07cbaa..0000000000 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# MCU name -MCU = STM32F103 - -MCU_LDSCRIPT = m12og_v1 - -BOARD = m12og_v1 - -# Bootloader selection -BOOTLOADER = custom - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # HAS TO BE ON! Otherwise the custom matrix doesn't work -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -CUSTOM_MATRIX = lite -SRC += matrix.c diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h deleted file mode 100644 index c63f92d151..0000000000 --- a/keyboards/matrix/m12og/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * config.h - */ - -#pragma once - -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 7 -#define MATRIX_COLS 14 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, F0, B7, C7, D3, B0, D1 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, B6, B5, B4, D7, D0, D2, D6, D4, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B3 - -#ifdef RGB_DI_PIN -#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 RGBLED_NUM 16 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP -#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#endif diff --git a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c deleted file mode 100644 index 71436fddd0..0000000000 --- a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c +++ /dev/null @@ -1,25 +0,0 @@ -/** - * keymap.c - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_tkl_ansi( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c deleted file mode 100644 index 4c3b86ec4b..0000000000 --- a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c +++ /dev/null @@ -1,24 +0,0 @@ -/** - * keymap.c - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, - KC_LSFT, KC_LGUI, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_tkl_iso( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c deleted file mode 100644 index 2f0bbe2c69..0000000000 --- a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2021 kb-elmo - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1]=LAYOUT_all( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT - ), - [2]=LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3]=LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h deleted file mode 100644 index 664dd3d0c1..0000000000 --- a/keyboards/matrix/m20add/config.h +++ /dev/null @@ -1,99 +0,0 @@ -/** - * config.h - * - */ - -#pragma once - -#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - -#define DEF_PIN(port, pin) (((port) << 8) | pin) -#define GET_PORT(pp) (((pp) >> 8) & 0xFF) -#define GET_PIN(pp) ((pp) & 0xFF) - -#define ROW1_MASK 0x80 -#define ROW2_MASK 0x40 -#define ROW3_MASK 0x01 -#define ROW4_MASK 0x04 -#define ROW5_MASK 0x10 -#define ROW6_MASK 0x20 -#define ROW_PORT TCA6424_PORT2 - -#define COL1_MASK 0x02 -#define COL2_MASK 0x80 -#define COL3_MASK 0x40 -#define COL4_MASK 0x20 -#define COL5_MASK 0x10 -#define COL6_MASK 0x08 -#define COL7_MASK 0x04 -#define COL8_MASK 0x02 -#define COL9_MASK 0x01 -#define COL10_MASK 0x80 -#define COL11_MASK 0x40 -#define COL12_MASK 0x20 -#define COL13_MASK 0x10 -#define COL14_MASK 0x08 -#define COL15_MASK 0x04 -#define COL16_MASK 0x02 - -// Note: MATRIX_ROW_PINS only works with standard pin names. -#define MATRIX_M20_ROW_PINS { \ - DEF_PIN(TCA6424_PORT2, 7), \ - DEF_PIN(TCA6424_PORT2, 6), \ - DEF_PIN(TCA6424_PORT2, 0), \ - DEF_PIN(TCA6424_PORT2, 2), \ - DEF_PIN(TCA6424_PORT2, 4), \ - DEF_PIN(TCA6424_PORT2, 5) } - -// Note: MATRIX_COL_PINS only works with standard pin names. -#define MATRIX_M20_COL_PINS { \ - DEF_PIN(TCA6424_PORT2, 1), \ - DEF_PIN(TCA6424_PORT1, 7), \ - DEF_PIN(TCA6424_PORT1, 6), \ - DEF_PIN(TCA6424_PORT1, 5), \ - DEF_PIN(TCA6424_PORT1, 4), \ - DEF_PIN(TCA6424_PORT1, 3), \ - DEF_PIN(TCA6424_PORT1, 2), \ - DEF_PIN(TCA6424_PORT1, 1), \ - DEF_PIN(TCA6424_PORT1, 0), \ - DEF_PIN(TCA6424_PORT0, 7), \ - DEF_PIN(TCA6424_PORT0, 6), \ - DEF_PIN(TCA6424_PORT0, 5), \ - DEF_PIN(TCA6424_PORT0, 4), \ - DEF_PIN(TCA6424_PORT0, 3), \ - DEF_PIN(TCA6424_PORT0, 2), \ - DEF_PIN(TCA6424_PORT0, 1) } - - - -#define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - -// i2c setting -#define I2C1_SCL_PIN B8 -#define I2C1_SDA_PIN B9 -#define I2C1_CLOCK_SPEED 400000 -#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -// rgb light setting -#define RGB_DI_PIN B4 // reserved pin for future usage -#define RGBLED_NUM 20 -#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 DRIVER_ADDR_1 0b1110100 -#define DRIVER_COUNT 1 -#define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/matrix/m20add/keymaps/default/keymap.c b/keyboards/matrix/m20add/keymaps/default/keymap.c deleted file mode 100644 index 0cd0e23916..0000000000 --- a/keyboards/matrix/m20add/keymaps/default/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** - * keymap.c - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_ansi_tsangan( - - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_tkl_ansi_tsangan( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, KC_F24, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/m20add/keymaps/iso/keymap.c b/keyboards/matrix/m20add/keymaps/iso/keymap.c deleted file mode 100644 index 85bfbaa660..0000000000 --- a/keyboards/matrix/m20add/keymaps/iso/keymap.c +++ /dev/null @@ -1,24 +0,0 @@ -/** - * keymap.c - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_iso_tsangan( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, - KC_LSFT, KC_LGUI, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_tkl_iso_tsangan( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c deleted file mode 100644 index 4466ec3bea..0000000000 --- a/keyboards/matrix/m20add/rgb_ring.c +++ /dev/null @@ -1,457 +0,0 @@ -/** - * @file rgb_ring.c - * @author astro - * - * 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 "rgb_ring.h" - -#include -#include "quantum.h" -#include "rgblight.h" -#include "drivers/led/issi/is31fl3731.h" -#include "i2c_master.h" - - -#ifndef RGBLIGHT_ENABLE -#error "MUST enable rgblight" -#endif -// rgb ring leds setting - -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to IS31 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, C1_1, C3_2, C4_2}, - {0, C1_2, C2_2, C4_3}, - {0, C1_3, C2_3, C3_3}, - {0, C1_4, C2_4, C3_4}, - {0, C1_5, C2_5, C3_5}, - {0, C1_6, C2_6, C3_6}, - {0, C1_7, C2_7, C3_7}, - {0, C1_8, C2_8, C3_8}, - - {0, C9_1, C8_1, C7_1}, - {0, C9_2, C8_2, C7_2}, - {0, C9_3, C8_3, C7_3}, - {0, C9_4, C8_4, C7_4}, - {0, C9_5, C8_5, C7_5}, - {0, C9_6, C8_6, C7_6}, - {0, C9_7, C8_7, C6_6}, - {0, C9_8, C7_7, C6_7}, - - {0, C1_9, C3_10, C4_10}, - {0, C1_10, C2_10, C4_11}, - {0, C1_11, C2_11, C3_11}, - {0, C1_12, C2_12, C3_12}, -}; - -#define RING_OUTER_BEGIN 0 -#define RING_OUTER_END 15 -#define RING_OUTER_SIZE (RING_OUTER_END + 1 - RING_OUTER_BEGIN) - -#define RING_INNER_BEGIN 16 -#define RING_INNER_END 19 -#define RING_INNER_SIZE (RING_INNER_END + 1 - RING_INNER_BEGIN) - -#define SPEED_MAX 100 -#define SPEED_STEP 10 - -typedef enum { - RING_STATE_INIT, - RING_STATE_QMK, - RING_STATE_CUSTOM, -} RING_STATE; - -typedef enum { - RING_EFFECT_1, - RING_EFFECT_2, - RING_EFFECT_3, - RING_EFFECT_4, - RING_EFFECT_5, - RING_EFFECT_6, - RING_EFFECT_MAX -} RING_EFFECT; - -typedef struct { - uint8_t state; - uint8_t effect; - uint8_t speed; - uint8_t outer_index; - uint8_t inner_index; - uint8_t effect_count; - uint8_t led_begin; - uint8_t led_end; - bool led_forward; - bool led_clear; -} rgb_ring_t; - -static rgb_ring_t rgb_ring = { - .state = RING_STATE_INIT, - .effect = RING_EFFECT_1, - .speed = 10, - .outer_index = 0, - .inner_index = 0, - .effect_count = 0, - .led_begin = RING_OUTER_BEGIN, - .led_end = RING_OUTER_END, - .led_forward = true, - .led_clear = false, -}; - -static void rgb_ring_reset(void) -{ - rgb_ring.effect_count = 0; - rgb_ring.led_begin = RING_OUTER_BEGIN; - rgb_ring.led_end = RING_OUTER_END; - rgb_ring.led_forward = true; - rgb_ring.led_clear = false; -} - -extern animation_status_t animation_status; -extern rgblight_config_t rgblight_config; - -#define EFFECT_TEST_INTERVAL 50 -#define EFFECT_TEST_COUNT 5 -#define EFFECT_TEST_HUE_STEP 85 -#define EFFECT_TEST_VAL_STEP 17 -static void testing_mode(void) -{ - if (timer_elapsed(animation_status.last_timer) > EFFECT_TEST_INTERVAL) { - HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - //IS31FL3731_set_color_all(c.r, c.g, c.b); - IS31FL3731_set_color_all(0, 0, 0); - IS31FL3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b); - h.v = EFFECT_TEST_VAL_STEP*rgb_ring.outer_index; - c = hsv_to_rgb(h); - for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) { - IS31FL3731_set_color(i, c.r, c.g, c.b); - } - rgb_ring.outer_index = (rgb_ring.outer_index + 1) % RING_OUTER_SIZE; - //rgb_ring.inner_index = (rgb_ring.inner_index + 1) % RING_INNER_SIZE; - - if (rgb_ring.outer_index == RING_OUTER_BEGIN) { - rgblight_config.hue += EFFECT_TEST_HUE_STEP; - rgb_ring.effect_count++; - } - animation_status.last_timer = timer_read(); - } - if (rgb_ring.effect_count > EFFECT_TEST_COUNT) { - rgb_ring_reset(); - rgb_ring.state = RING_STATE_QMK; - rgblight_set(); - } -} - -static bool need_update(uint32_t max_interval) -{ - uint32_t interval = timer_elapsed(animation_status.last_timer); - return (interval*rgb_ring.speed) > max_interval; -} - -static void update_effect(uint32_t max_count) -{ - if (rgb_ring.effect_count > max_count) { - rgb_ring_reset(); - rgb_ring.effect = (rgb_ring.effect + 1) % RING_EFFECT_MAX; - } -} - -#define EFFECT_1_INTERVAL 1000 -#define EFFECT_1_COUNT 64 -#define EFFECT_1_HUE_STEP 15 - -static void ring_effect_no_1(void) -{ - if (need_update(EFFECT_1_INTERVAL)) { - HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; - for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) { - RGB c = hsv_to_rgb(h); - IS31FL3731_set_color(i, c.r, c.g, c.b); - } - rgblight_config.hue += EFFECT_1_HUE_STEP; - rgb_ring.effect_count++; - animation_status.last_timer = timer_read(); - } - - update_effect(EFFECT_1_COUNT); -} - -#define EFFECT_2_INTERVAL 1000 -#define EFFECT_2_COUNT 64 -#define EFFECT_2_HUE_STEP 15 - -static void ring_effect_no_2(void) -{ - if (need_update(EFFECT_2_INTERVAL)) { - IS31FL3731_set_color_all(0, 0, 0); - HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - - IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b); - IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b); - - rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE; - rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - 1) % RING_OUTER_SIZE; - - rgblight_config.hue += EFFECT_2_HUE_STEP; - rgb_ring.effect_count++; - animation_status.last_timer = timer_read(); - } - - update_effect(EFFECT_2_COUNT); -} - -#define EFFECT_3_INTERVAL 1000 -#define EFFECT_3_COUNT 64 -#define EFFECT_3_HUE_STEP 15 - -static void ring_effect_no_3(void) -{ - if (rgb_ring.effect_count == 0) { - IS31FL3731_set_color_all(0, 0, 0); - } - - if (need_update(EFFECT_3_INTERVAL)) { - HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; - - if (rgb_ring.led_clear) { - IS31FL3731_set_color(rgb_ring.led_begin, 0, 0, 0); - IS31FL3731_set_color(rgb_ring.led_end, 0, 0, 0); - } else { - RGB c = hsv_to_rgb(h); - IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b); - IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b); - } - - rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE; - if (rgb_ring.led_begin == rgb_ring.led_end) { - if (rgb_ring.led_forward) { - rgb_ring.led_begin = RING_OUTER_BEGIN; - rgb_ring.led_end = RING_OUTER_END+1; - } else { - rgb_ring.led_begin = RING_OUTER_BEGIN + RING_OUTER_SIZE/2; - rgb_ring.led_end = RING_OUTER_END+1 - RING_OUTER_SIZE/2; - } - - if (!rgb_ring.led_clear) { - rgb_ring.led_forward = !rgb_ring.led_forward; - } - - rgb_ring.led_clear = !rgb_ring.led_clear; - } - - rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - 1) % RING_OUTER_SIZE; - - rgblight_config.hue += EFFECT_3_HUE_STEP; - rgb_ring.effect_count++; - animation_status.last_timer = timer_read(); - } - - update_effect(EFFECT_3_COUNT); -} - -#define EFFECT_4_INTERVAL 1000 -#define EFFECT_4_COUNT 64 -#define EFFECT_4_STEP 3 -static void ring_effect_no_4(void) -{ - if (need_update(EFFECT_4_INTERVAL)) { - IS31FL3731_set_color_all(0, 0, 0); - HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - - IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b); - IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b); - - rgb_ring.led_begin = (rgb_ring.led_begin + EFFECT_4_STEP) % RING_OUTER_SIZE; - rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - EFFECT_4_STEP) % RING_OUTER_SIZE; - - rgblight_config.hue += EFFECT_1_HUE_STEP; - rgb_ring.effect_count++; - animation_status.last_timer = timer_read(); - } - - update_effect(EFFECT_4_COUNT); -} - -#define EFFECT_5_INTERVAL 1000 -#define EFFECT_5_COUNT 64 -#define EFFECT_5_HUE_STEP 16 -static void ring_effect_no_5(void) -{ - if (need_update(EFFECT_5_INTERVAL)) { - IS31FL3731_set_color_all(0, 0, 0); - for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) { - HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - IS31FL3731_set_color(i, c.r, c.g, c.b); - } - for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) { - HSV h = {rgblight_config.hue+EFFECT_5_HUE_STEP, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - IS31FL3731_set_color(i, c.r, c.g, c.b); - } - rgblight_config.hue += EFFECT_5_HUE_STEP; - rgb_ring.effect_count++; - animation_status.last_timer = timer_read(); - } - - update_effect(EFFECT_5_COUNT); -} - -#define EFFECT_6_INTERVAL 1000 -#define EFFECT_6_COUNT 64 -#define EFFECT_I_HUE_STEP 10 -#define EFFECT_O_HUE_STEP 10 -static void ring_effect_no_6(void) -{ - if (need_update(EFFECT_6_INTERVAL)) { - IS31FL3731_set_color_all(0, 0, 0); - for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) { - HSV h = {rgblight_config.hue+i*EFFECT_I_HUE_STEP, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - IS31FL3731_set_color(i, c.r, c.g, c.b); - } - for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) { - HSV h = {rgblight_config.hue+i*EFFECT_O_HUE_STEP, rgblight_config.sat, rgblight_config.val}; - RGB c = hsv_to_rgb(h); - IS31FL3731_set_color(i, c.r, c.g, c.b); - } - rgblight_config.hue += EFFECT_I_HUE_STEP; - rgb_ring.effect_count++; - animation_status.last_timer = timer_read(); - } - - update_effect(EFFECT_6_COUNT); -} - -typedef void(*effect_fun)(void); -static effect_fun effect_funcs[RING_EFFECT_MAX] = { - ring_effect_no_1, - ring_effect_no_2, - ring_effect_no_3, - ring_effect_no_4, - ring_effect_no_5, - ring_effect_no_6, -}; - -static void custom_effects(void) -{ - effect_funcs[rgb_ring.effect](); -} - -void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) -{ - if (rgb_ring.state != RING_STATE_QMK) { - return; - } - - for (uint8_t i = 0; i < num_leds; i++) { - IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b); - } -} - - -void rgb_ring_init(void) -{ - i2c_init(); - IS31FL3731_init(DRIVER_ADDR_1); - for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) { - bool enabled = true; - IS31FL3731_set_led_control_register(index, enabled, enabled, enabled); - } - IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0); -} - -void rgb_ring_task(void) -{ - switch (rgb_ring.state) { - case RING_STATE_INIT: // testing mode - testing_mode(); - break; - case RING_STATE_QMK: // qmk effects - //rgblight_task(); - break; - case RING_STATE_CUSTOM: // custom effects - custom_effects(); - break; - default: - break; - }; - - IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) -{ - if (record->event.pressed) { - switch(keycode) { - case RGB_MODE_FORWARD: - if (rgb_ring.state == RING_STATE_INIT) { - // in testing mode, do nothing - return false; - } else if (rgb_ring.state == RING_STATE_CUSTOM) { - // switch to qmk mode - rgblight_config.mode = 1; - rgb_ring.state = RING_STATE_QMK; - rgblight_mode(rgblight_config.mode); - return false; - } else { - // in qmk mode, switch to custom mode? - if (rgblight_config.mode >= RGBLIGHT_MODES) { - rgb_ring.state = RING_STATE_CUSTOM; - return false; - } - } - break; - case RGB_MODE_REVERSE: - if (rgb_ring.state == RING_STATE_INIT) { - // in testing mode, do nothing - return false; - } else if (rgb_ring.state == RING_STATE_CUSTOM) { - // switch to qmk mode - rgblight_config.mode = RGBLIGHT_MODES; - rgb_ring.state = RING_STATE_QMK; - rgblight_mode(rgblight_config.mode); - return false; - } else { - // in qmk mode, switch to custom mode? - if (rgblight_config.mode <= 1) { - rgb_ring.state = RING_STATE_CUSTOM; - return false; - } - } - break; - case KC_F24: - if (rgb_ring.state == RING_STATE_QMK) { - rgb_ring.state = RING_STATE_CUSTOM; - rgb_ring_reset(); - return false; - } else if (rgb_ring.state == RING_STATE_CUSTOM) { - rgb_ring.state = RING_STATE_QMK; - return false; - } - break; - default: - break; - } - } - return process_record_user(keycode, record); -} diff --git a/keyboards/matrix/me/keymaps/default/keymap.c b/keyboards/matrix/me/keymaps/default/keymap.c deleted file mode 100644 index f26d0b5294..0000000000 --- a/keyboards/matrix/me/keymaps/default/keymap.c +++ /dev/null @@ -1,37 +0,0 @@ -/** - * keymap.c - * - Copyright 2021 astro - 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_tkl_ansi_tsangan( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_tkl_ansi_tsangan( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), -}; diff --git a/keyboards/matrix/me/keymaps/via/keymap.c b/keyboards/matrix/me/keymaps/via/keymap.c deleted file mode 100644 index 532646504b..0000000000 --- a/keyboards/matrix/me/keymaps/via/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -/** - * keymap.c - * - Copyright 2021 astro - 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0]=LAYOUT_all( - - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, LT(1,KC_PAUS), - - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,KC_BSLS, KC_ENT, - KC_LSFT, KC_LGUI, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1]=LAYOUT_all( - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, KC_F24, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, KC_MPLY, _______, _______, __