summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek
diff options
context:
space:
mode:
authorlokher <lokher@gmail.com>2022-12-06 17:10:48 +0800
committerlokher <lokher@gmail.com>2022-12-07 15:50:49 +0800
commita336c2c5005251e4cb0f3a62ccabdb4cfccad915 (patch)
tree3c948b631a5e3b6f940dabe02fad3c7487e6f350 /keyboards/melgeek
parent27fc28fd2ff52e079a5bc58d6aaea4c752420615 (diff)
Merge upstream master to 2022 Q4 breaking change
Diffstat (limited to 'keyboards/melgeek')
-rwxr-xr-xkeyboards/melgeek/mach80/config.h83
-rwxr-xr-xkeyboards/melgeek/mach80/keymaps/default/keymap.c37
-rwxr-xr-xkeyboards/melgeek/mach80/keymaps/tkl/keymap.c37
-rwxr-xr-xkeyboards/melgeek/mach80/keymaps/via/keymap.c53
-rwxr-xr-xkeyboards/melgeek/mach80/keymaps/wkl/keymap.c37
-rwxr-xr-xkeyboards/melgeek/mach80/rev1/config.h41
-rwxr-xr-xkeyboards/melgeek/mach80/rev1/rev1.c193
-rwxr-xr-xkeyboards/melgeek/mach80/rev2/config.h41
-rwxr-xr-xkeyboards/melgeek/mach80/rev2/rev2.c191
-rw-r--r--keyboards/melgeek/mj61/config.h83
-rw-r--r--keyboards/melgeek/mj61/keymaps/default/keymap.c42
-rw-r--r--keyboards/melgeek/mj61/keymaps/via/keymap.c49
-rw-r--r--keyboards/melgeek/mj61/rev1/config.h37
-rw-r--r--keyboards/melgeek/mj61/rev1/rev1.c124
-rw-r--r--keyboards/melgeek/mj61/rev2/config.h37
-rw-r--r--keyboards/melgeek/mj61/rev2/rev2.c134
-rw-r--r--keyboards/melgeek/mj63/config.h83
-rw-r--r--keyboards/melgeek/mj63/keymaps/default/keymap.c41
-rw-r--r--keyboards/melgeek/mj63/keymaps/via/keymap.c48
-rw-r--r--keyboards/melgeek/mj63/rev1/config.h37
-rw-r--r--keyboards/melgeek/mj63/rev1/rev1.c130
-rw-r--r--keyboards/melgeek/mj63/rev2/config.h37
-rw-r--r--keyboards/melgeek/mj63/rev2/rev2.c134
-rw-r--r--keyboards/melgeek/mj64/config.h83
-rw-r--r--keyboards/melgeek/mj64/keymaps/default/keymap.c34
-rw-r--r--keyboards/melgeek/mj64/keymaps/via/keymap.c48
-rw-r--r--keyboards/melgeek/mj64/rev1/config.h37
-rw-r--r--keyboards/melgeek/mj64/rev1/rev1.c126
-rw-r--r--keyboards/melgeek/mj64/rev2/config.h37
-rw-r--r--keyboards/melgeek/mj64/rev2/rev2.c130
-rw-r--r--keyboards/melgeek/mj64/rev3/config.h37
-rw-r--r--keyboards/melgeek/mj64/rev3/rev3.c134
-rw-r--r--keyboards/melgeek/mj65/config.h83
-rw-r--r--keyboards/melgeek/mj65/keymaps/default/keymap.c34
-rw-r--r--keyboards/melgeek/mj65/keymaps/via/keymap.c48
-rw-r--r--keyboards/melgeek/mj65/rev3/config.h37
-rw-r--r--keyboards/melgeek/mj65/rev3/rev3.c139
-rwxr-xr-xkeyboards/melgeek/mj6xy/info.json2133
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default/keymap.c33
-rw-r--r--keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c35
-rw-r--r--keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c35
-rw-r--r--keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/via/keymap.c47
-rwxr-xr-xkeyboards/melgeek/mj6xy/mj6xy.h473
-rwxr-xr-xkeyboards/melgeek/mj6xy/readme.md28
-rwxr-xr-xkeyboards/melgeek/mj6xy/rev3/config.h60
-rwxr-xr-xkeyboards/melgeek/mojo68/config.h82
-rwxr-xr-xkeyboards/melgeek/mojo68/keymaps/default/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mojo68/keymaps/via/keymap.c49
-rwxr-xr-xkeyboards/melgeek/mojo68/rev1/config.h37
-rwxr-xr-xkeyboards/melgeek/mojo68/rev1/rev1.c161
-rw-r--r--keyboards/melgeek/mojo75/config.h84
-rw-r--r--keyboards/melgeek/mojo75/keymaps/default/keymap.c37
-rw-r--r--keyboards/melgeek/mojo75/keymaps/via/keymap.c53
-rw-r--r--keyboards/melgeek/mojo75/rev1/config.h38
-rw-r--r--keyboards/melgeek/mojo75/rev1/rev1.c160
-rwxr-xr-xkeyboards/melgeek/tegic/config.h80
-rwxr-xr-xkeyboards/melgeek/tegic/keymaps/default/keymap.c38
-rwxr-xr-xkeyboards/melgeek/tegic/keymaps/via/keymap.c53
-rwxr-xr-xkeyboards/melgeek/tegic/rev1/config.h41
-rwxr-xr-xkeyboards/melgeek/tegic/rev1/rev1.c155
-rw-r--r--keyboards/melgeek/z70ultra/config.h84
-rw-r--r--keyboards/melgeek/z70ultra/keymaps/default/keymap.c34
-rw-r--r--keyboards/melgeek/z70ultra/keymaps/via/keymap.c48
-rw-r--r--keyboards/melgeek/z70ultra/z70ultra.c178
90 files changed, 0 insertions, 7937 deletions
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
deleted file mode 100755
index 18d7eb8dfa..0000000000
--- a/keyboards/melgeek/mach80/config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_MULTISPLASH
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 0b0110000
-#define DRIVER_COUNT 1
-
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SAT
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/melgeek/mach80/keymaps/default/keymap.c b/keyboards/melgeek/mach80/keymaps/default/keymap.c
deleted file mode 100755
index 3530c9e7cb..0000000000
--- a/keyboards/melgeek/mach80/keymaps/default/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.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 <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_tkl_ansi( /* Base */
- QK_GESC, 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, MO(1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [1] = LAYOUT_tkl_ansi( /* FN */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_END, _______,
- _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
- )
-};
diff --git a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
deleted file mode 100755
index 3ce16cd736..0000000000
--- a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.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 <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_tkl_ansi( /* Base */
- QK_GESC, 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, MO(1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [1] = LAYOUT_tkl_ansi( /* FN */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_END, _______,
- _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
- )
-};
diff --git a/keyboards/melgeek/mach80/keymaps/via/keymap.c b/keyboards/melgeek/mach80/keymaps/via/keymap.c
deleted file mode 100755
index 3ec65081b7..0000000000
--- a/keyboards/melgeek/mach80/keymaps/via/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.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 <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_tkl_ansi( /* Base */
- QK_GESC, 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, MO(1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [1] = LAYOUT_tkl_ansi( /* FN */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
- _______, _______, _______, _______, _______, _______, ___