summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek/mj61
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/melgeek/mj61')
-rw-r--r--keyboards/melgeek/mj61/config.h84
-rw-r--r--keyboards/melgeek/mj61/info.json82
-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/keymaps/via/rules.mk2
-rw-r--r--keyboards/melgeek/mj61/mj61.c17
-rw-r--r--keyboards/melgeek/mj61/mj61.h35
-rw-r--r--keyboards/melgeek/mj61/readme.md15
-rw-r--r--keyboards/melgeek/mj61/rev1/config.h37
-rw-r--r--keyboards/melgeek/mj61/rev1/rev1.c124
-rw-r--r--keyboards/melgeek/mj61/rev1/rules.mk23
-rw-r--r--keyboards/melgeek/mj61/rev2/config.h37
-rw-r--r--keyboards/melgeek/mj61/rev2/rev2.c134
-rw-r--r--keyboards/melgeek/mj61/rev2/rules.mk23
14 files changed, 0 insertions, 704 deletions
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h
deleted file mode 100644
index 407beba1e8..0000000000
--- a/keyboards/melgeek/mj61/config.h
+++ /dev/null
@@ -1,84 +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 5
-#define MATRIX_COLS 14
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3
-
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#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
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# 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_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# 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
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 0b0110000
-#define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json
deleted file mode 100644
index 559ea8da32..0000000000
--- a/keyboards/melgeek/mj61/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "keyboard_name": "MJ61",
- "manufacturer": "MelGeek",
- "url": "",
- "maintainer": "melgeek001365",
- "usb": {
- "vid": "0xEDED",
- "pid": "0xED61",
- "device_version": "0.0.1"
- },
- "layouts": {
- "LAYOUT_60_ansi": {
- "layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0, "w":2},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2, "w":2.25},
-
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":2.75},
-
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"x":10, "y":4, "w":1.25},
- {"x":11.25, "y":4, "w":1.25},
- {"x":12.5, "y":4, "w":1.25},
- {"x":13.75, "y":4, "w":1.25}
- ]
- }
- }
-}
diff --git a/keyboards/melgeek/mj61/keymaps/default/keymap.c b/keyboards/melgeek/mj61/keymaps/default/keymap.c
deleted file mode 100644
index ee0e82580b..0000000000
--- a/keyboards/melgeek/mj61/keymaps/default/keymap.c
+++ /dev/null
@@ -1,42 +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_60_ansi(
- KC_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(2), KC_RCTL
- ),
- [1] = LAYOUT_60_ansi(
- KC_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_DEL,
- _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
- _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
- KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_MNXT,
- _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [2] = LAYOUT_60_ansi(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
-
diff --git a/keyboards/melgeek/mj61/keymaps/via/keymap.c b/keyboards/melgeek/mj61/keymaps/via/keymap.c
deleted file mode 100644
index 01b48fb585..0000000000
--- a/keyboards/melgeek/mj61/keymaps/via/keymap.c
+++ /dev/null
@@ -1,49 +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_60_ansi(
- KC_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(2), KC_RCTL
- ),
- [1] = LAYOUT_60_ansi(
- KC_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_DEL,
- _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
- _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
- KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_MNXT,
- _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [2] = LAYOUT_60_ansi(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [3] = LAYOUT_60_ansi(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
-
diff --git a/keyboards/melgeek/mj61/keymaps/via/rules.mk b/keyboards/melgeek/mj61/keymaps/via/rules.mk
deleted file mode 100644
index 36b7ba9cbc..0000000000
--- a/keyboards/melgeek/mj61/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/melgeek/mj61/mj61.c b/keyboards/melgeek/mj61/mj61.c
deleted file mode 100644
index a3aa29676a..0000000000
--- a/keyboards/melgeek/mj61/mj61.c
+++ /dev/null
@@ -1,17 +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 "mj61.h"
diff --git a/keyboards/melgeek/mj61/mj61.h b/keyboards/melgeek/mj61/mj61.h
deleted file mode 100644
index 1881196dba..0000000000
--- a/keyboards/melgeek/mj61/mj61.h
+++ /dev/null
@@ -1,35 +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 "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K43, K45, K49, K4A, K4B, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
- { K40, K41, XXX, K43, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D } \
-}
diff --git a/keyboards/melgeek/mj61/readme.md b/keyboards/melgeek/mj61/readme.md
deleted file mode 100644
index 2db0e71b6f..0000000000
--- a/keyboards/melgeek/mj61/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# MelGeek MJ61
-
-![MJ61](https://cdn.shopifycdn.net/s/files/1/0078/2863/5712/products/a0ebad495be43c4c42403878b4af4ac2_1024x1024@2x.jpg?v=1600672895)
-
-A hotswap 60% RGB Custom Mechanical keyboard.
-
-* Keyboard Maintainer: [melgeek](https://github.com/melgeek001365)
-* Hardware Supported: MJ61 V1.1.2 20200612
-* Hardware Availability: [MelGeek](https://www.melgeek.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
- make melgeek/mj61/rev1:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h
deleted file mode 100644
index bba46db2dd..0000000000
--- a/keyboards/melgeek/mj61/rev1/config.h
+++ /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/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define DRIVER_LED_TOTAL 63
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
deleted file mode 100644
index 9d8de36d88..0000000000
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ /dev/null
@@ -1,124 +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 "mj61.h"
-
-#ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
-};
-
-led_config_t g_led_config = {
- {
- /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */
- { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */
- { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED,}, /* R2 */
- { 52, NO_LED, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED }, /* R3 */
- { 53, 54, NO_LED, 55, 61, 56, 62, NO_LED, NO_LED, 57, 58, 59, 60, NO_LED }, /* R4 */
- }, {
- {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0},
- {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
- {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
- {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48},
- {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64},
- }, {
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- }
-};
-
-void suspend_power_down_kb(void) {
- rgb_matrix_set_suspend_state(true);
- suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
- rgb_matrix_set_suspend_state(false);
- suspend_wakeup_init_user();
-}
-#endif
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(A2);
- writePinHigh(A2);
- keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk
deleted file mode 100644
index bd31b34dc1..0000000000
--- a/keyboards/melgeek/mj61/rev1/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
-NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
-
-LAYOUTS = 60_ansi
diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h
deleted file mode 100644
index e17f291934..0000000000
--- a/keyboards/melgeek/mj61/rev2/config.h
+++ /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/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define DRIVER_LED_TOTAL 71
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
deleted file mode 100644
index b46cf08c4e..0000000000
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ /dev/null
@@ -1,134 +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 "mj61.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-};
-
-led_config_t g_led_config = {
- {
- /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */
- { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */
- { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */
- { 46, NO_LED, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, NO_LED }, /* R3 */
- { 61, 62, NO_LED, 63, NO_LED, 65, NO_LED, NO_LED, NO_LED, 67, 68, 69, NO_LED, 70 }, /* R4 */
- }, {
- {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, {224, 0}, {240, 0},
- {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
- {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32},
- {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48}, {240, 48},
- {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64},
- }, {
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- }
-};
-
-void suspend_power_down_kb(void) {
- rgb_matrix_set_suspend_state(true);
- suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
- rgb_matrix_set_suspend_state(false);
- suspend_wakeup_init_user();
-}
-#endif
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(A2);
- writePinHigh(A2);
- keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk
deleted file mode 100644
index bd31b34dc1..0000000000
--- a/keyboards/melgeek/mj61/rev2/rules.mk
+++ /dev/null
@