From 21899b306c74a638993090ec0ee4b3b99307b6a3 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 15:39:07 +0800 Subject: [PATCH 01/58] Create keyboard.json --- keyboards/mmd/keyboard.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/mmd/keyboard.json diff --git a/keyboards/mmd/keyboard.json b/keyboards/mmd/keyboard.json new file mode 100644 index 00000000000..46bea8cfe5f --- /dev/null +++ b/keyboards/mmd/keyboard.json @@ -0,0 +1 @@ +"keyboard_name": "B0K08", From d093e2b30b4bbb5229a4d84147a7970d480c86a8 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 16:18:55 +0800 Subject: [PATCH 02/58] Delete keyboards/mmd directory delete test file qmk_firmware/keyboards/mmd --- keyboards/mmd/keyboard.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/mmd/keyboard.json diff --git a/keyboards/mmd/keyboard.json b/keyboards/mmd/keyboard.json deleted file mode 100644 index 46bea8cfe5f..00000000000 --- a/keyboards/mmd/keyboard.json +++ /dev/null @@ -1 +0,0 @@ -"keyboard_name": "B0K08", From 04e6ace84beeee098599c141e17172112e50c187 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:38:04 +0800 Subject: [PATCH 03/58] Create keymap.c --- keyboards/MMD-KM17/keymaps/default/keymap.c | 61 +++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 keyboards/MMD-KM17/keymaps/default/keymap.c diff --git a/keyboards/MMD-KM17/keymaps/default/keymap.c b/keyboards/MMD-KM17/keymaps/default/keymap.c new file mode 100644 index 00000000000..453d589f025 --- /dev/null +++ b/keyboards/MMD-KM17/keymaps/default/keymap.c @@ -0,0 +1,61 @@ +/* +Copyright 2021 owlab +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( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [1] = LAYOUT( + _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ), + [2] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [3] = LAYOUT( + _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ) +}; + + + + From d60c64f8f06d16804ba3454c95e9a3e3399b0dd5 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:39:37 +0800 Subject: [PATCH 04/58] Create keymap.c --- keyboards/MMD-KM17/keymaps/via/keymap.c | 76 +++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 keyboards/MMD-KM17/keymaps/via/keymap.c diff --git a/keyboards/MMD-KM17/keymaps/via/keymap.c b/keyboards/MMD-KM17/keymaps/via/keymap.c new file mode 100644 index 00000000000..8e45af354d9 --- /dev/null +++ b/keyboards/MMD-KM17/keymaps/via/keymap.c @@ -0,0 +1,76 @@ +/* +Copyright 2021 owlab +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + + +#include QMK_KEYBOARD_H + + +enum custom_keycodes { +#ifdef VIA_ENABLE +// KC_USB = QK_USER, + KC_24G = QK_KB_0, +#else + KC_24G = SAFE_RANGE, +#endif + KC_BLE1, + KC_BLE2, + KC_BLE3, + WIN_LOCK, + KC_RESET, + KC_BAT, + ENC_TG +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + + [0] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [1] = LAYOUT( + _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ), + [2] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [3] = LAYOUT( + _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ) +}; + + From 23d1a538e11e85d5cc431ce9e7a077a7930a3d78 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:40:13 +0800 Subject: [PATCH 05/58] Create rules.mk --- keyboards/MMD-KM17/keymaps/via/rules.mk | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 keyboards/MMD-KM17/keymaps/via/rules.mk diff --git a/keyboards/MMD-KM17/keymaps/via/rules.mk b/keyboards/MMD-KM17/keymaps/via/rules.mk new file mode 100644 index 00000000000..d750ac3ddee --- /dev/null +++ b/keyboards/MMD-KM17/keymaps/via/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + + From 48354685d4384f5c9f6ab747dcf4c4b5e16c6bf9 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:41:20 +0800 Subject: [PATCH 06/58] Create config.h --- keyboards/MMD-KM17/config.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 keyboards/MMD-KM17/config.h diff --git a/keyboards/MMD-KM17/config.h b/keyboards/MMD-KM17/config.h new file mode 100644 index 00000000000..96f6c3bfafd --- /dev/null +++ b/keyboards/MMD-KM17/config.h @@ -0,0 +1,32 @@ +/* Copyright 2022 Jacky + * + * 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 + + +#define RGB_MATRIX_LED_COUNT 81 +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 1 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 + +#define ENCODERS_PAD_A {B3} +#define ENCODERS_PAD_B {A7} + +#define ENCODER_RESOLUTION 4 + From 0ff5d3dfe3a857c5b0c08c8c75ba1d1a3370c941 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:42:03 +0800 Subject: [PATCH 07/58] Create halconf.h --- keyboards/MMD-KM17/halconf.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 keyboards/MMD-KM17/halconf.h diff --git a/keyboards/MMD-KM17/halconf.h b/keyboards/MMD-KM17/halconf.h new file mode 100644 index 00000000000..9a1c234154c --- /dev/null +++ b/keyboards/MMD-KM17/halconf.h @@ -0,0 +1,6 @@ +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next + From bada9b59fe3aa6967bf2c1c22d2de5e2c56c1ea1 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:44:30 +0800 Subject: [PATCH 08/58] Create keyboard.json --- keyboards/MMD-KM17/keyboard.json | 262 +++++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) create mode 100644 keyboards/MMD-KM17/keyboard.json diff --git a/keyboards/MMD-KM17/keyboard.json b/keyboards/MMD-KM17/keyboard.json new file mode 100644 index 00000000000..c642edabe63 --- /dev/null +++ b/keyboards/MMD-KM17/keyboard.json @@ -0,0 +1,262 @@ +{ + "manufacturer": "MMD", + "keyboard_name": "MMD-KM17", + "board": "STM32_F103_STM32DUINO", + "bootloader": "stm32duino", + "url": "www.i-chip.cn", + "maintainer": "Jacky", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix":true + }, + "matrix_pins": { + "rows": ["A0","A1","A2","A3","A4","A5"], + "cols": ["B0","C15","C14", "C13","A15", "B7","B6","B5","B4","B12","B13","B14","A14","B2","B15"] + }, + "processor": "STM32F103", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x3021", + "vid": "0x28E9" + }, + "ws2812": { + "pin": "A6", + "driver": "pwm" + }, + "rgb_matrix": { + "driver": "ws2812", + "animations": { + "solid_color":true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "layout": [ + { "flags": 4, "matrix": [5, 5], "x": 93, "y": 6 }, + { "flags": 4, "matrix": [5, 10], "x": 150, "y": 6 }, + { "flags": 4, "matrix": [5, 11], "x": 169, "y": 6 }, + { "flags": 4, "matrix": [5, 12], "x": 194, "y": 6 }, + { "flags": 4, "matrix": [5, 13], "x": 209, "y": 6 }, + { "flags": 4, "matrix": [5, 14], "x": 224, "y": 6 }, + + { "flags": 4, "matrix": [4, 14], "x": 224, "y": 6 }, + { "flags": 4, "matrix": [4, 13], "x": 213, "y": 6 }, + { "flags": 4, "matrix": [4, 12], "x": 192, "y": 6 }, + { "flags": 4, "matrix": [4, 11], "x": 172, "y": 6 }, + { "flags": 4, "matrix": [4, 10], "x": 156, "y": 6 }, + { "flags": 4, "matrix": [4, 9], "x": 141, "y": 6 }, + { "flags": 4, "matrix": [4, 8], "x": 126, "y": 6 }, + { "flags": 4, "matrix": [4, 7], "x": 111, "y": 6 }, + { "flags": 4, "matrix": [4, 6], "x": 95, "y": 6 }, + { "flags": 4, "matrix": [4, 5], "x": 80, "y": 6 }, + { "flags": 4, "matrix": [4, 4], "x": 65, "y": 6 }, + { "flags": 4, "matrix": [4, 3], "x": 50, "y": 6 }, + { "flags": 4, "matrix": [4, 2], "x": 34, "y": 6 }, + + { "flags": 4, "matrix": [5, 2], "x": 40, "y": 6 }, + { "flags": 4, "matrix": [5, 1], "x": 21, "y": 6 }, + { "flags": 4, "matrix": [5, 0], "x": 2, "y": 6 }, + { "flags": 4, "matrix": [4, 0], "x": 10, "y": 6 }, + + { "flags": 4, "matrix": [3, 0], "x": 1, "y": 6 }, + { "flags": 4, "matrix": [3, 1], "x": 22, "y": 6 }, + { "flags": 4, "matrix": [3, 2], "x": 37, "y": 6 }, + { "flags": 4, "matrix": [3, 3], "x": 52, "y": 6 }, + { "flags": 4, "matrix": [3, 4], "x": 68, "y": 6 }, + { "flags": 4, "matrix": [3, 5], "x": 83, "y": 6 }, + { "flags": 4, "matrix": [3, 6], "x": 98, "y": 6 }, + { "flags": 4, "matrix": [3, 7], "x": 113, "y": 6 }, + { "flags": 4, "matrix": [3, 8], "x": 129, "y": 6 }, + { "flags": 4, "matrix": [3, 9], "x": 144, "y": 6 }, + { "flags": 4, "matrix": [3, 10], "x": 159, "y": 6 }, + { "flags": 4, "matrix": [3, 11], "x": 174, "y": 6 }, + { "flags": 4, "matrix": [3, 13], "x": 199, "y": 6 }, + { "flags": 4, "matrix": [3, 14], "x": 224, "y": 6 }, + + { "flags": 4, "matrix": [2, 14], "x": 224, "y": 6 }, + { "flags": 4, "matrix": [2, 13], "x": 209, "y": 6 }, + { "flags": 4, "matrix": [2, 12], "x": 190, "y": 6 }, + { "flags": 4, "matrix": [2, 11], "x": 175, "y": 6 }, + { "flags": 4, "matrix": [2, 10], "x": 160, "y": 6 }, + { "flags": 4, "matrix": [2, 9], "x": 145, "y": 6 }, + { "flags": 4, "matrix": [2, 8], "x": 129, "y": 6 }, + { "flags": 4, "matrix": [2, 7], "x": 114, "y": 6 }, + { "flags": 4, "matrix": [2, 6], "x": 99, "y": 6 }, + { "flags": 4, "matrix": [2, 5], "x": 84, "y": 6 }, + { "flags": 4, "matrix": [2, 4], "x": 69, "y": 6 }, + { "flags": 4, "matrix": [2, 3], "x": 53, "y": 6 }, + { "flags": 4, "matrix": [2, 2], "x": 38, "y": 6 }, + { "flags": 4, "matrix": [2, 1], "x": 23, "y": 6 }, + { "flags": 4, "matrix": [2, 0], "x": 4, "y": 6 }, + + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 6 }, + { "flags": 4, "matrix": [1, 1], "x": 11, "y": 6 }, + { "flags": 4, "matrix": [1, 2], "x": 26, "y": 6 }, + { "flags": 4, "matrix": [1, 3], "x": 41, "y": 6 }, + { "flags": 4, "matrix": [1, 4], "x": 56, "y": 6 }, + { "flags": 4, "matrix": [1, 5], "x": 72, "y": 6 }, + { "flags": 4, "matrix": [1, 6], "x": 87, "y": 6 }, + { "flags": 4, "matrix": [1, 7], "x": 102, "y": 6 }, + { "flags": 4, "matrix": [1, 8], "x": 117, "y": 6 }, + { "flags": 4, "matrix": [1, 9], "x": 133, "y": 6 }, + { "flags": 4, "matrix": [1, 10], "x": 148, "y": 6 }, + { "flags": 4, "matrix": [1, 11], "x": 163, "y": 6 }, + { "flags": 4, "matrix": [1, 12], "x": 178, "y": 6 }, + { "flags": 4, "matrix": [1, 13], "x": 201, "y": 6 }, + { "flags": 4, "matrix": [1, 14], "x": 224, "y": 6 }, + + { "flags": 4, "matrix": [0, 13], "x": 213, "y": 6 }, + { "flags": 4, "matrix": [0, 12], "x": 194, "y": 6 }, + { "flags": 4, "matrix": [0, 11], "x": 179, "y": 6 }, + { "flags": 4, "matrix": [0, 10], "x": 164, "y": 6 }, + { "flags": 4, "matrix": [0, 9], "x": 149, "y": 6 }, + { "flags": 4, "matrix": [0, 8], "x": 129, "y": 6 }, + { "flags": 4, "matrix": [0, 7], "x": 114, "y": 6 }, + { "flags": 4, "matrix": [0, 6], "x": 99, "y": 6 }, + { "flags": 4, "matrix": [0, 5], "x": 84, "y": 6 }, + { "flags": 4, "matrix": [0, 4], "x": 65, "y": 6 }, + { "flags": 4, "matrix": [0, 3], "x": 50, "y": 6 }, + { "flags": 4, "matrix": [0, 2], "x": 34, "y": 6 }, + { "flags": 4, "matrix": [0, 1], "x": 19, "y": 6 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 6 } + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + + {"matrix":[0, 0],"x": 0,"y": 0}, + {"matrix":[0, 1],"x": 1.25,"y": 0}, + {"matrix":[0, 2],"x": 2.25, "y": 0}, + {"matrix":[0, 3],"x": 3.25, "y": 0}, + {"matrix":[0, 4],"x": 4.25, "y": 0}, + {"matrix":[0, 5],"x": 5.5, "y": 0}, + {"matrix":[0, 6],"x": 6.5, "y": 0}, + {"matrix":[0, 7],"x": 7.5, "y": 0}, + {"matrix":[0, 8],"x": 8.5, "y": 0}, + {"matrix":[0, 9],"x": 9.75, "y": 0}, + {"matrix":[0, 10],"x": 10.75, "y": 0}, + {"matrix":[0, 11],"x": 11.75, "y": 0}, + {"matrix":[0, 12],"x": 12.75, "y": 0}, + {"matrix":[0, 13],"x": 14, "y": 0}, + {"matrix":[0, 14],"x": 15, "y": 0}, + + {"matrix":[1, 0],"x": 0, "y": 1.25}, + {"matrix":[1, 1],"x": 1, "y": 1.25}, + {"matrix":[1, 2],"x": 2, "y": 1.25}, + {"matrix":[1, 3],"x": 3, "y": 1.25}, + {"matrix":[1, 4],"x": 4, "y": 1.25}, + {"matrix":[1, 5],"x": 5, "y": 1.25}, + {"matrix":[1, 6],"x": 6, "y": 1.25}, + {"matrix":[1, 7],"x": 7, "y": 1.25}, + {"matrix":[1, 8],"x": 8, "y": 1.25}, + {"matrix":[1, 9],"x": 9, "y": 1.25}, + {"matrix":[1, 10],"x": 10, "y": 1.25}, + {"matrix":[1, 11],"x": 11, "y": 1.25}, + {"matrix":[1, 12],"x": 12, "y": 1.25}, + {"matrix":[1, 13],"x": 13, "y": 1.25,"w":2}, + {"matrix":[1, 14],"x": 15, "y": 1.25}, + + {"matrix":[2, 0],"x": 0,"y": 2.25}, + {"matrix":[2, 1],"x": 1.5, "y": 2.25}, + {"matrix":[2, 2],"x": 2.5, "y": 2.25}, + {"matrix":[2, 3],"x": 3.5, "y": 2.25}, + {"matrix":[2, 4],"x": 4.5, "y": 2.25}, + {"matrix":[2, 5],"x": 5.5, "y": 2.25}, + {"matrix":[2, 6],"x": 6.5, "y": 2.25}, + {"matrix":[2, 7],"x": 7.5, "y": 2.25}, + {"matrix":[2, 8],"x": 8.5, "y": 2.25}, + {"matrix":[2, 9],"x": 9.5, "y": 2.25}, + {"matrix":[2, 10],"x": 10.5, "y": 2.25}, + {"matrix":[2, 11],"x": 11.5, "y": 2.25}, + {"matrix":[2, 12],"x": 12.5, "y": 2.25}, + {"matrix":[2, 13],"x": 13.5, "y": 2.25,"w":1.5}, + {"matrix":[2, 14],"x": 15, "y": 2.25}, + + {"matrix":[3, 0],"x": 0, "y": 3.25}, + {"matrix":[3, 1],"x": 1.75, "y": 3.25}, + {"matrix":[3, 2],"x": 2.75, "y": 3.25}, + {"matrix":[3, 3],"x": 3.75, "y": 3.25}, + {"matrix":[3, 4],"x": 4.75, "y": 3.25}, + {"matrix":[3, 5],"x": 5.75, "y": 3.25}, + {"matrix":[3, 6],"x": 6.75, "y": 3.25}, + {"matrix":[3, 7],"x": 7.75, "y": 3.25}, + {"matrix":[3, 8],"x": 8.75, "y": 3.25}, + {"matrix":[3, 9],"x": 9.75, "y": 3.25}, + {"matrix":[3, 10],"x": 10.75, "y": 3.25}, + {"matrix":[3, 11],"x": 11.75, "y": 3.25}, + {"matrix":[3, 13],"x": 12.75, "y": 3.25,"w":2.25}, + {"matrix":[3, 14],"x": 15, "y": 3.25}, + + {"matrix":[4, 0],"x": 0, "y": 4.25}, + {"matrix":[4, 2],"x": 2.25, "y": 4.25}, + {"matrix":[4, 3],"x": 3.25, "y": 4.25}, + {"matrix":[4, 4],"x": 4.25, "y": 4.25}, + {"matrix":[4, 5],"x": 5.25, "y": 4.25}, + {"matrix":[4, 6],"x": 6.25, "y": 4.25}, + {"matrix":[4, 7],"x": 7.25, "y": 4.25}, + {"matrix":[4, 8],"x": 8.25, "y": 4.25}, + {"matrix":[4, 9],"x": 9.25, "y": 4.25}, + {"matrix":[4, 10],"x": 10.25, "y": 4.25}, + {"matrix":[4, 11],"x": 11.25, "y": 4.25}, + {"matrix":[4, 12],"x": 12.25, "y": 4.25,"w":1.75}, + {"matrix":[4, 13],"x": 14, "y": 4.25}, + {"matrix":[4, 14],"x": 15, "y": 4.25}, + + {"matrix":[5, 0],"x": 0, "y": 5.25,"w":1.25}, + {"matrix":[5, 1],"x": 1.25, "y": 5.25,"w":1.25}, + {"matrix":[5, 2],"x": 2.5, "y": 5.25,"w":1.25}, + {"matrix":[5, 5],"x": 3.75, "y": 5.25,"w":6.25}, + {"matrix":[5, 10],"x": 10, "y": 5.25,"w":1.25}, + {"matrix":[5, 11],"x": 11.25, "y": 5.25,"w":1.25}, + {"matrix":[5, 12],"x": 13, "y": 5.25}, + {"matrix":[5, 13],"x": 14, "y": 5.25}, + {"matrix":[5, 14],"x": 15, "y": 5.25} + ] + } + } +} + + + + From 4b11b8220b3a91ccb3700cc942a9c1aad4de8af0 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:46:47 +0800 Subject: [PATCH 09/58] Create mmd-km17.c --- keyboards/MMD-KM17/mmd-km17.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 keyboards/MMD-KM17/mmd-km17.c diff --git a/keyboards/MMD-KM17/mmd-km17.c b/keyboards/MMD-KM17/mmd-km17.c new file mode 100644 index 00000000000..d51d8f99bfe --- /dev/null +++ b/keyboards/MMD-KM17/mmd-km17.c @@ -0,0 +1,33 @@ +/* Copyright 2022 Jacky + * + * 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 "quantum.h" + + +void keyboard_pre_init_kb(void) { + setPinOutput(A8); + writePinHigh(A8); +} + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return false; +} + + From 0e1dd850eed270f8a31e2baab7165357e66003b5 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:47:38 +0800 Subject: [PATCH 10/58] Create mcuconf.h --- keyboards/MMD-KM17/mcuconf.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 keyboards/MMD-KM17/mcuconf.h diff --git a/keyboards/MMD-KM17/mcuconf.h b/keyboards/MMD-KM17/mcuconf.h new file mode 100644 index 00000000000..9caef1b80a7 --- /dev/null +++ b/keyboards/MMD-KM17/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2021 Glorious, LLC + * + * 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_next + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE From 86b36aee8e7b42c42be4443a3aebc28df02c2a73 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 17:48:10 +0800 Subject: [PATCH 11/58] Create rules.mk --- keyboards/MMD-KM17/rules.mk | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 keyboards/MMD-KM17/rules.mk diff --git a/keyboards/MMD-KM17/rules.mk b/keyboards/MMD-KM17/rules.mk new file mode 100644 index 00000000000..a90a6678876 --- /dev/null +++ b/keyboards/MMD-KM17/rules.mk @@ -0,0 +1,2 @@ +MCU_LDSCRIPT = STM32F103xB +ENCODER_ENABLE = yes From 87b764f03f9217293cf652412eb2c6c3f97d7ab8 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 18:00:17 +0800 Subject: [PATCH 12/58] Create readme.md --- keyboards/MMD-KM17/readme.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 keyboards/MMD-KM17/readme.md diff --git a/keyboards/MMD-KM17/readme.md b/keyboards/MMD-KM17/readme.md new file mode 100644 index 00000000000..8668fedfc63 --- /dev/null +++ b/keyboards/MMD-KM17/readme.md @@ -0,0 +1,22 @@ +# MMD-KM17 + + +* A customizable soldering 75% keyboard. + +* Keyboard Maintainer: JACKY(https://github.com/JackyJia73) +* Hardware Supported: MMD-KM17 +* Hardware Availability: [MMD-KM17](https://github.com/Smartmmd/qmk_firmware/new/master/keyboards) + +Make example for this keyboard (after setting up your build environment): + + make MMD-KM17:default +Flashing example for this keyboard: + + make MMD-KM17:default:flash + +See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. + +## Bootloader ESC the bootloader in 3 ways: +* **Bootmagic reset: Hold down Enter in the keyboard then replug +* **Physical reset button: Briefly press the button on the back of the PCB +* **Keycode in layout: Press the key mapped to QK_BOOT From 4ad729f63acfe6086a698677c93f89b5675eac0a Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 18:01:47 +0800 Subject: [PATCH 13/58] Update readme.md --- keyboards/MMD-KM17/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/MMD-KM17/readme.md b/keyboards/MMD-KM17/readme.md index 8668fedfc63..750a876a6ba 100644 --- a/keyboards/MMD-KM17/readme.md +++ b/keyboards/MMD-KM17/readme.md @@ -3,7 +3,7 @@ * A customizable soldering 75% keyboard. -* Keyboard Maintainer: JACKY(https://github.com/JackyJia73) +* Keyboard Maintainer: [JACKY](https://github.com/JackyJia73) * Hardware Supported: MMD-KM17 * Hardware Availability: [MMD-KM17](https://github.com/Smartmmd/qmk_firmware/new/master/keyboards) From b8295041d96ede57e6a2c6ea3211ea272820ad6c Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 18:15:35 +0800 Subject: [PATCH 14/58] Update readme.md --- keyboards/MMD-KM17/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/MMD-KM17/readme.md b/keyboards/MMD-KM17/readme.md index 750a876a6ba..f4f9c17d8b3 100644 --- a/keyboards/MMD-KM17/readme.md +++ b/keyboards/MMD-KM17/readme.md @@ -5,7 +5,7 @@ * Keyboard Maintainer: [JACKY](https://github.com/JackyJia73) * Hardware Supported: MMD-KM17 -* Hardware Availability: [MMD-KM17](https://github.com/Smartmmd/qmk_firmware/new/master/keyboards) +* Hardware Availability: [MMD-KM17](https://github.com/Smartmmd/qmk_firmware/new/master) Make example for this keyboard (after setting up your build environment): From 7a82636d387a57e952d3b67db48299dbdc5b26f7 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Fri, 14 Jun 2024 18:19:09 +0800 Subject: [PATCH 15/58] Update readme.md --- keyboards/MMD-KM17/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/MMD-KM17/readme.md b/keyboards/MMD-KM17/readme.md index f4f9c17d8b3..a86366367e2 100644 --- a/keyboards/MMD-KM17/readme.md +++ b/keyboards/MMD-KM17/readme.md @@ -5,7 +5,7 @@ * Keyboard Maintainer: [JACKY](https://github.com/JackyJia73) * Hardware Supported: MMD-KM17 -* Hardware Availability: [MMD-KM17](https://github.com/Smartmmd/qmk_firmware/new/master) +* Hardware Availability: [MMD-KM17](https://github.com/Smartmmd) Make example for this keyboard (after setting up your build environment): From c9f6531131c5b5742f92a1ec3e0ab4d3492c1073 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:53:05 +0800 Subject: [PATCH 16/58] Add km17 keyboard --- keyboards/MMD-KM17/keyboard.json | 262 ------------------ keyboards/{MMD-KM17 => mmd/km17}/config.h | 0 keyboards/{MMD-KM17 => mmd/km17}/halconf.h | 0 keyboards/mmd/km17/keyboard.json | 246 ++++++++++++++++ .../km17}/keymaps/default/keymap.c | 0 .../km17}/keymaps/via/keymap.c | 0 .../km17}/keymaps/via/rules.mk | 0 .../{MMD-KM17/mmd-km17.c => mmd/km17/km17.c} | 0 keyboards/{MMD-KM17 => mmd/km17}/mcuconf.h | 0 keyboards/{MMD-KM17 => mmd/km17}/readme.md | 10 +- keyboards/{MMD-KM17 => mmd/km17}/rules.mk | 0 11 files changed, 251 insertions(+), 267 deletions(-) delete mode 100644 keyboards/MMD-KM17/keyboard.json rename keyboards/{MMD-KM17 => mmd/km17}/config.h (100%) rename keyboards/{MMD-KM17 => mmd/km17}/halconf.h (100%) create mode 100644 keyboards/mmd/km17/keyboard.json rename keyboards/{MMD-KM17 => mmd/km17}/keymaps/default/keymap.c (100%) rename keyboards/{MMD-KM17 => mmd/km17}/keymaps/via/keymap.c (100%) rename keyboards/{MMD-KM17 => mmd/km17}/keymaps/via/rules.mk (100%) rename keyboards/{MMD-KM17/mmd-km17.c => mmd/km17/km17.c} (100%) rename keyboards/{MMD-KM17 => mmd/km17}/mcuconf.h (100%) rename keyboards/{MMD-KM17 => mmd/km17}/readme.md (70%) rename keyboards/{MMD-KM17 => mmd/km17}/rules.mk (100%) diff --git a/keyboards/MMD-KM17/keyboard.json b/keyboards/MMD-KM17/keyboard.json deleted file mode 100644 index c642edabe63..00000000000 --- a/keyboards/MMD-KM17/keyboard.json +++ /dev/null @@ -1,262 +0,0 @@ -{ - "manufacturer": "MMD", - "keyboard_name": "MMD-KM17", - "board": "STM32_F103_STM32DUINO", - "bootloader": "stm32duino", - "url": "www.i-chip.cn", - "maintainer": "Jacky", - "diode_direction": "ROW2COL", - "features": { - "bootmagic": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix":true - }, - "matrix_pins": { - "rows": ["A0","A1","A2","A3","A4","A5"], - "cols": ["B0","C15","C14", "C13","A15", "B7","B6","B5","B4","B12","B13","B14","A14","B2","B15"] - }, - "processor": "STM32F103", - "usb": { - "device_version": "0.0.1", - "force_nkro": true, - "pid": "0x3021", - "vid": "0x28E9" - }, - "ws2812": { - "pin": "A6", - "driver": "pwm" - }, - "rgb_matrix": { - "driver": "ws2812", - "animations": { - "solid_color":true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "rainbow_moving_chevron": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "layout": [ - { "flags": 4, "matrix": [5, 5], "x": 93, "y": 6 }, - { "flags": 4, "matrix": [5, 10], "x": 150, "y": 6 }, - { "flags": 4, "matrix": [5, 11], "x": 169, "y": 6 }, - { "flags": 4, "matrix": [5, 12], "x": 194, "y": 6 }, - { "flags": 4, "matrix": [5, 13], "x": 209, "y": 6 }, - { "flags": 4, "matrix": [5, 14], "x": 224, "y": 6 }, - - { "flags": 4, "matrix": [4, 14], "x": 224, "y": 6 }, - { "flags": 4, "matrix": [4, 13], "x": 213, "y": 6 }, - { "flags": 4, "matrix": [4, 12], "x": 192, "y": 6 }, - { "flags": 4, "matrix": [4, 11], "x": 172, "y": 6 }, - { "flags": 4, "matrix": [4, 10], "x": 156, "y": 6 }, - { "flags": 4, "matrix": [4, 9], "x": 141, "y": 6 }, - { "flags": 4, "matrix": [4, 8], "x": 126, "y": 6 }, - { "flags": 4, "matrix": [4, 7], "x": 111, "y": 6 }, - { "flags": 4, "matrix": [4, 6], "x": 95, "y": 6 }, - { "flags": 4, "matrix": [4, 5], "x": 80, "y": 6 }, - { "flags": 4, "matrix": [4, 4], "x": 65, "y": 6 }, - { "flags": 4, "matrix": [4, 3], "x": 50, "y": 6 }, - { "flags": 4, "matrix": [4, 2], "x": 34, "y": 6 }, - - { "flags": 4, "matrix": [5, 2], "x": 40, "y": 6 }, - { "flags": 4, "matrix": [5, 1], "x": 21, "y": 6 }, - { "flags": 4, "matrix": [5, 0], "x": 2, "y": 6 }, - { "flags": 4, "matrix": [4, 0], "x": 10, "y": 6 }, - - { "flags": 4, "matrix": [3, 0], "x": 1, "y": 6 }, - { "flags": 4, "matrix": [3, 1], "x": 22, "y": 6 }, - { "flags": 4, "matrix": [3, 2], "x": 37, "y": 6 }, - { "flags": 4, "matrix": [3, 3], "x": 52, "y": 6 }, - { "flags": 4, "matrix": [3, 4], "x": 68, "y": 6 }, - { "flags": 4, "matrix": [3, 5], "x": 83, "y": 6 }, - { "flags": 4, "matrix": [3, 6], "x": 98, "y": 6 }, - { "flags": 4, "matrix": [3, 7], "x": 113, "y": 6 }, - { "flags": 4, "matrix": [3, 8], "x": 129, "y": 6 }, - { "flags": 4, "matrix": [3, 9], "x": 144, "y": 6 }, - { "flags": 4, "matrix": [3, 10], "x": 159, "y": 6 }, - { "flags": 4, "matrix": [3, 11], "x": 174, "y": 6 }, - { "flags": 4, "matrix": [3, 13], "x": 199, "y": 6 }, - { "flags": 4, "matrix": [3, 14], "x": 224, "y": 6 }, - - { "flags": 4, "matrix": [2, 14], "x": 224, "y": 6 }, - { "flags": 4, "matrix": [2, 13], "x": 209, "y": 6 }, - { "flags": 4, "matrix": [2, 12], "x": 190, "y": 6 }, - { "flags": 4, "matrix": [2, 11], "x": 175, "y": 6 }, - { "flags": 4, "matrix": [2, 10], "x": 160, "y": 6 }, - { "flags": 4, "matrix": [2, 9], "x": 145, "y": 6 }, - { "flags": 4, "matrix": [2, 8], "x": 129, "y": 6 }, - { "flags": 4, "matrix": [2, 7], "x": 114, "y": 6 }, - { "flags": 4, "matrix": [2, 6], "x": 99, "y": 6 }, - { "flags": 4, "matrix": [2, 5], "x": 84, "y": 6 }, - { "flags": 4, "matrix": [2, 4], "x": 69, "y": 6 }, - { "flags": 4, "matrix": [2, 3], "x": 53, "y": 6 }, - { "flags": 4, "matrix": [2, 2], "x": 38, "y": 6 }, - { "flags": 4, "matrix": [2, 1], "x": 23, "y": 6 }, - { "flags": 4, "matrix": [2, 0], "x": 4, "y": 6 }, - - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 6 }, - { "flags": 4, "matrix": [1, 1], "x": 11, "y": 6 }, - { "flags": 4, "matrix": [1, 2], "x": 26, "y": 6 }, - { "flags": 4, "matrix": [1, 3], "x": 41, "y": 6 }, - { "flags": 4, "matrix": [1, 4], "x": 56, "y": 6 }, - { "flags": 4, "matrix": [1, 5], "x": 72, "y": 6 }, - { "flags": 4, "matrix": [1, 6], "x": 87, "y": 6 }, - { "flags": 4, "matrix": [1, 7], "x": 102, "y": 6 }, - { "flags": 4, "matrix": [1, 8], "x": 117, "y": 6 }, - { "flags": 4, "matrix": [1, 9], "x": 133, "y": 6 }, - { "flags": 4, "matrix": [1, 10], "x": 148, "y": 6 }, - { "flags": 4, "matrix": [1, 11], "x": 163, "y": 6 }, - { "flags": 4, "matrix": [1, 12], "x": 178, "y": 6 }, - { "flags": 4, "matrix": [1, 13], "x": 201, "y": 6 }, - { "flags": 4, "matrix": [1, 14], "x": 224, "y": 6 }, - - { "flags": 4, "matrix": [0, 13], "x": 213, "y": 6 }, - { "flags": 4, "matrix": [0, 12], "x": 194, "y": 6 }, - { "flags": 4, "matrix": [0, 11], "x": 179, "y": 6 }, - { "flags": 4, "matrix": [0, 10], "x": 164, "y": 6 }, - { "flags": 4, "matrix": [0, 9], "x": 149, "y": 6 }, - { "flags": 4, "matrix": [0, 8], "x": 129, "y": 6 }, - { "flags": 4, "matrix": [0, 7], "x": 114, "y": 6 }, - { "flags": 4, "matrix": [0, 6], "x": 99, "y": 6 }, - { "flags": 4, "matrix": [0, 5], "x": 84, "y": 6 }, - { "flags": 4, "matrix": [0, 4], "x": 65, "y": 6 }, - { "flags": 4, "matrix": [0, 3], "x": 50, "y": 6 }, - { "flags": 4, "matrix": [0, 2], "x": 34, "y": 6 }, - { "flags": 4, "matrix": [0, 1], "x": 19, "y": 6 }, - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 6 } - ] - }, - "layouts": { - "LAYOUT": { - "layout": [ - - {"matrix":[0, 0],"x": 0,"y": 0}, - {"matrix":[0, 1],"x": 1.25,"y": 0}, - {"matrix":[0, 2],"x": 2.25, "y": 0}, - {"matrix":[0, 3],"x": 3.25, "y": 0}, - {"matrix":[0, 4],"x": 4.25, "y": 0}, - {"matrix":[0, 5],"x": 5.5, "y": 0}, - {"matrix":[0, 6],"x": 6.5, "y": 0}, - {"matrix":[0, 7],"x": 7.5, "y": 0}, - {"matrix":[0, 8],"x": 8.5, "y": 0}, - {"matrix":[0, 9],"x": 9.75, "y": 0}, - {"matrix":[0, 10],"x": 10.75, "y": 0}, - {"matrix":[0, 11],"x": 11.75, "y": 0}, - {"matrix":[0, 12],"x": 12.75, "y": 0}, - {"matrix":[0, 13],"x": 14, "y": 0}, - {"matrix":[0, 14],"x": 15, "y": 0}, - - {"matrix":[1, 0],"x": 0, "y": 1.25}, - {"matrix":[1, 1],"x": 1, "y": 1.25}, - {"matrix":[1, 2],"x": 2, "y": 1.25}, - {"matrix":[1, 3],"x": 3, "y": 1.25}, - {"matrix":[1, 4],"x": 4, "y": 1.25}, - {"matrix":[1, 5],"x": 5, "y": 1.25}, - {"matrix":[1, 6],"x": 6, "y": 1.25}, - {"matrix":[1, 7],"x": 7, "y": 1.25}, - {"matrix":[1, 8],"x": 8, "y": 1.25}, - {"matrix":[1, 9],"x": 9, "y": 1.25}, - {"matrix":[1, 10],"x": 10, "y": 1.25}, - {"matrix":[1, 11],"x": 11, "y": 1.25}, - {"matrix":[1, 12],"x": 12, "y": 1.25}, - {"matrix":[1, 13],"x": 13, "y": 1.25,"w":2}, - {"matrix":[1, 14],"x": 15, "y": 1.25}, - - {"matrix":[2, 0],"x": 0,"y": 2.25}, - {"matrix":[2, 1],"x": 1.5, "y": 2.25}, - {"matrix":[2, 2],"x": 2.5, "y": 2.25}, - {"matrix":[2, 3],"x": 3.5, "y": 2.25}, - {"matrix":[2, 4],"x": 4.5, "y": 2.25}, - {"matrix":[2, 5],"x": 5.5, "y": 2.25}, - {"matrix":[2, 6],"x": 6.5, "y": 2.25}, - {"matrix":[2, 7],"x": 7.5, "y": 2.25}, - {"matrix":[2, 8],"x": 8.5, "y": 2.25}, - {"matrix":[2, 9],"x": 9.5, "y": 2.25}, - {"matrix":[2, 10],"x": 10.5, "y": 2.25}, - {"matrix":[2, 11],"x": 11.5, "y": 2.25}, - {"matrix":[2, 12],"x": 12.5, "y": 2.25}, - {"matrix":[2, 13],"x": 13.5, "y": 2.25,"w":1.5}, - {"matrix":[2, 14],"x": 15, "y": 2.25}, - - {"matrix":[3, 0],"x": 0, "y": 3.25}, - {"matrix":[3, 1],"x": 1.75, "y": 3.25}, - {"matrix":[3, 2],"x": 2.75, "y": 3.25}, - {"matrix":[3, 3],"x": 3.75, "y": 3.25}, - {"matrix":[3, 4],"x": 4.75, "y": 3.25}, - {"matrix":[3, 5],"x": 5.75, "y": 3.25}, - {"matrix":[3, 6],"x": 6.75, "y": 3.25}, - {"matrix":[3, 7],"x": 7.75, "y": 3.25}, - {"matrix":[3, 8],"x": 8.75, "y": 3.25}, - {"matrix":[3, 9],"x": 9.75, "y": 3.25}, - {"matrix":[3, 10],"x": 10.75, "y": 3.25}, - {"matrix":[3, 11],"x": 11.75, "y": 3.25}, - {"matrix":[3, 13],"x": 12.75, "y": 3.25,"w":2.25}, - {"matrix":[3, 14],"x": 15, "y": 3.25}, - - {"matrix":[4, 0],"x": 0, "y": 4.25}, - {"matrix":[4, 2],"x": 2.25, "y": 4.25}, - {"matrix":[4, 3],"x": 3.25, "y": 4.25}, - {"matrix":[4, 4],"x": 4.25, "y": 4.25}, - {"matrix":[4, 5],"x": 5.25, "y": 4.25}, - {"matrix":[4, 6],"x": 6.25, "y": 4.25}, - {"matrix":[4, 7],"x": 7.25, "y": 4.25}, - {"matrix":[4, 8],"x": 8.25, "y": 4.25}, - {"matrix":[4, 9],"x": 9.25, "y": 4.25}, - {"matrix":[4, 10],"x": 10.25, "y": 4.25}, - {"matrix":[4, 11],"x": 11.25, "y": 4.25}, - {"matrix":[4, 12],"x": 12.25, "y": 4.25,"w":1.75}, - {"matrix":[4, 13],"x": 14, "y": 4.25}, - {"matrix":[4, 14],"x": 15, "y": 4.25}, - - {"matrix":[5, 0],"x": 0, "y": 5.25,"w":1.25}, - {"matrix":[5, 1],"x": 1.25, "y": 5.25,"w":1.25}, - {"matrix":[5, 2],"x": 2.5, "y": 5.25,"w":1.25}, - {"matrix":[5, 5],"x": 3.75, "y": 5.25,"w":6.25}, - {"matrix":[5, 10],"x": 10, "y": 5.25,"w":1.25}, - {"matrix":[5, 11],"x": 11.25, "y": 5.25,"w":1.25}, - {"matrix":[5, 12],"x": 13, "y": 5.25}, - {"matrix":[5, 13],"x": 14, "y": 5.25}, - {"matrix":[5, 14],"x": 15, "y": 5.25} - ] - } - } -} - - - - diff --git a/keyboards/MMD-KM17/config.h b/keyboards/mmd/km17/config.h similarity index 100% rename from keyboards/MMD-KM17/config.h rename to keyboards/mmd/km17/config.h diff --git a/keyboards/MMD-KM17/halconf.h b/keyboards/mmd/km17/halconf.h similarity index 100% rename from keyboards/MMD-KM17/halconf.h rename to keyboards/mmd/km17/halconf.h diff --git a/keyboards/mmd/km17/keyboard.json b/keyboards/mmd/km17/keyboard.json new file mode 100644 index 00000000000..919982ee46e --- /dev/null +++ b/keyboards/mmd/km17/keyboard.json @@ -0,0 +1,246 @@ +{ + "manufacturer": "MMD", + "keyboard_name": "MMD-KM17", + "maintainer": "Smartmmd", + "board": "STM32_F103_STM32DUINO", + "bootloader": "stm32duino", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B0", "C15", "C14", "C13", "A15", "B7", "B6", "B5", "B4", "B12", "B13", "B14", "A14", "B2", "B15"], + "rows": ["A0", "A1", "A2", "A3", "A4", "A5"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "animations": { + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "multisplash": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "solid_color": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [5, 5], "x": 93, "y": 6, "flags": 4}, + {"matrix": [5, 10], "x": 150, "y": 6, "flags": 4}, + {"matrix": [5, 11], "x": 169, "y": 6, "flags": 4}, + {"matrix": [5, 12], "x": 194, "y": 6, "flags": 4}, + {"matrix": [5, 13], "x": 209, "y": 6, "flags": 4}, + {"matrix": [5, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [4, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [4, 13], "x": 213, "y": 6, "flags": 4}, + {"matrix": [4, 12], "x": 192, "y": 6, "flags": 4}, + {"matrix": [4, 11], "x": 172, "y": 6, "flags": 4}, + {"matrix": [4, 10], "x": 156, "y": 6, "flags": 4}, + {"matrix": [4, 9], "x": 141, "y": 6, "flags": 4}, + {"matrix": [4, 8], "x": 126, "y": 6, "flags": 4}, + {"matrix": [4, 7], "x": 111, "y": 6, "flags": 4}, + {"matrix": [4, 6], "x": 95, "y": 6, "flags": 4}, + {"matrix": [4, 5], "x": 80, "y": 6, "flags": 4}, + {"matrix": [4, 4], "x": 65, "y": 6, "flags": 4}, + {"matrix": [4, 3], "x": 50, "y": 6, "flags": 4}, + {"matrix": [4, 2], "x": 34, "y": 6, "flags": 4}, + {"matrix": [5, 2], "x": 40, "y": 6, "flags": 4}, + {"matrix": [5, 1], "x": 21, "y": 6, "flags": 4}, + {"matrix": [5, 0], "x": 2, "y": 6, "flags": 4}, + {"matrix": [4, 0], "x": 10, "y": 6, "flags": 4}, + {"matrix": [3, 0], "x": 1, "y": 6, "flags": 4}, + {"matrix": [3, 1], "x": 22, "y": 6, "flags": 4}, + {"matrix": [3, 2], "x": 37, "y": 6, "flags": 4}, + {"matrix": [3, 3], "x": 52, "y": 6, "flags": 4}, + {"matrix": [3, 4], "x": 68, "y": 6, "flags": 4}, + {"matrix": [3, 5], "x": 83, "y": 6, "flags": 4}, + {"matrix": [3, 6], "x": 98, "y": 6, "flags": 4}, + {"matrix": [3, 7], "x": 113, "y": 6, "flags": 4}, + {"matrix": [3, 8], "x": 129, "y": 6, "flags": 4}, + {"matrix": [3, 9], "x": 144, "y": 6, "flags": 4}, + {"matrix": [3, 10], "x": 159, "y": 6, "flags": 4}, + {"matrix": [3, 11], "x": 174, "y": 6, "flags": 4}, + {"matrix": [3, 13], "x": 199, "y": 6, "flags": 4}, + {"matrix": [3, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [2, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [2, 13], "x": 209, "y": 6, "flags": 4}, + {"matrix": [2, 12], "x": 190, "y": 6, "flags": 4}, + {"matrix": [2, 11], "x": 175, "y": 6, "flags": 4}, + {"matrix": [2, 10], "x": 160, "y": 6, "flags": 4}, + {"matrix": [2, 9], "x": 145, "y": 6, "flags": 4}, + {"matrix": [2, 8], "x": 129, "y": 6, "flags": 4}, + {"matrix": [2, 7], "x": 114, "y": 6, "flags": 4}, + {"matrix": [2, 6], "x": 99, "y": 6, "flags": 4}, + {"matrix": [2, 5], "x": 84, "y": 6, "flags": 4}, + {"matrix": [2, 4], "x": 69, "y": 6, "flags": 4}, + {"matrix": [2, 3], "x": 53, "y": 6, "flags": 4}, + {"matrix": [2, 2], "x": 38, "y": 6, "flags": 4}, + {"matrix": [2, 1], "x": 23, "y": 6, "flags": 4}, + {"matrix": [2, 0], "x": 4, "y": 6, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 6, "flags": 4}, + {"matrix": [1, 1], "x": 11, "y": 6, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 6, "flags": 4}, + {"matrix": [1, 3], "x": 41, "y": 6, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 6, "flags": 4}, + {"matrix": [1, 5], "x": 72, "y": 6, "flags": 4}, + {"matrix": [1, 6], "x": 87, "y": 6, "flags": 4}, + {"matrix": [1, 7], "x": 102, "y": 6, "flags": 4}, + {"matrix": [1, 8], "x": 117, "y": 6, "flags": 4}, + {"matrix": [1, 9], "x": 133, "y": 6, "flags": 4}, + {"matrix": [1, 10], "x": 148, "y": 6, "flags": 4}, + {"matrix": [1, 11], "x": 163, "y": 6, "flags": 4}, + {"matrix": [1, 12], "x": 178, "y": 6, "flags": 4}, + {"matrix": [1, 13], "x": 201, "y": 6, "flags": 4}, + {"matrix": [1, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [0, 13], "x": 213, "y": 6, "flags": 4}, + {"matrix": [0, 12], "x": 194, "y": 6, "flags": 4}, + {"matrix": [0, 11], "x": 179, "y": 6, "flags": 4}, + {"matrix": [0, 10], "x": 164, "y": 6, "flags": 4}, + {"matrix": [0, 9], "x": 149, "y": 6, "flags": 4}, + {"matrix": [0, 8], "x": 129, "y": 6, "flags": 4}, + {"matrix": [0, 7], "x": 114, "y": 6, "flags": 4}, + {"matrix": [0, 6], "x": 99, "y": 6, "flags": 4}, + {"matrix": [0, 5], "x": 84, "y": 6, "flags": 4}, + {"matrix": [0, 4], "x": 65, "y": 6, "flags": 4}, + {"matrix": [0, 3], "x": 50, "y": 6, "flags": 4}, + {"matrix": [0, 2], "x": 34, "y": 6, "flags": 4}, + {"matrix": [0, 1], "x": 19, "y": 6, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 6, "flags": 4} + ] + }, + "url": "www.i-chip.cn", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x3021", + "vid": "0x28E9" + }, + "ws2812": { + "driver": "pwm", + "pin": "A6" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 14], "x": 15, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 13, "y": 5.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25} + ] + } + } +} diff --git a/keyboards/MMD-KM17/keymaps/default/keymap.c b/keyboards/mmd/km17/keymaps/default/keymap.c similarity index 100% rename from keyboards/MMD-KM17/keymaps/default/keymap.c rename to keyboards/mmd/km17/keymaps/default/keymap.c diff --git a/keyboards/MMD-KM17/keymaps/via/keymap.c b/keyboards/mmd/km17/keymaps/via/keymap.c similarity index 100% rename from keyboards/MMD-KM17/keymaps/via/keymap.c rename to keyboards/mmd/km17/keymaps/via/keymap.c diff --git a/keyboards/MMD-KM17/keymaps/via/rules.mk b/keyboards/mmd/km17/keymaps/via/rules.mk similarity index 100% rename from keyboards/MMD-KM17/keymaps/via/rules.mk rename to keyboards/mmd/km17/keymaps/via/rules.mk diff --git a/keyboards/MMD-KM17/mmd-km17.c b/keyboards/mmd/km17/km17.c similarity index 100% rename from keyboards/MMD-KM17/mmd-km17.c rename to keyboards/mmd/km17/km17.c diff --git a/keyboards/MMD-KM17/mcuconf.h b/keyboards/mmd/km17/mcuconf.h similarity index 100% rename from keyboards/MMD-KM17/mcuconf.h rename to keyboards/mmd/km17/mcuconf.h diff --git a/keyboards/MMD-KM17/readme.md b/keyboards/mmd/km17/readme.md similarity index 70% rename from keyboards/MMD-KM17/readme.md rename to keyboards/mmd/km17/readme.md index a86366367e2..7b9a16126f9 100644 --- a/keyboards/MMD-KM17/readme.md +++ b/keyboards/mmd/km17/readme.md @@ -3,16 +3,16 @@ * A customizable soldering 75% keyboard. -* Keyboard Maintainer: [JACKY](https://github.com/JackyJia73) -* Hardware Supported: MMD-KM17 -* Hardware Availability: [MMD-KM17](https://github.com/Smartmmd) +* Keyboard Maintainer: [MMD](https://github.com/Smartmmd) +* Hardware Supported: [MMD](https://github.com/Smartmmd) +* Hardware Availability: [MMD](https://github.com/Smartmmd) Make example for this keyboard (after setting up your build environment): - make MMD-KM17:default + make mmd/km17:default Flashing example for this keyboard: - make MMD-KM17:default:flash + make mmd/km17:default:flash See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. diff --git a/keyboards/MMD-KM17/rules.mk b/keyboards/mmd/km17/rules.mk similarity index 100% rename from keyboards/MMD-KM17/rules.mk rename to keyboards/mmd/km17/rules.mk From 07e15d2d73a5646dd09cc8ba8503366223aec412 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:59:43 +0800 Subject: [PATCH 17/58] default keymap update --- keyboards/mmd/km17/keymaps/default/keymap.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/keyboards/mmd/km17/keymaps/default/keymap.c b/keyboards/mmd/km17/keymaps/default/keymap.c index 453d589f025..8e45af354d9 100644 --- a/keyboards/mmd/km17/keymaps/default/keymap.c +++ b/keyboards/mmd/km17/keymaps/default/keymap.c @@ -12,9 +12,26 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + #include QMK_KEYBOARD_H +enum custom_keycodes { +#ifdef VIA_ENABLE +// KC_USB = QK_USER, + KC_24G = QK_KB_0, +#else + KC_24G = SAFE_RANGE, +#endif + KC_BLE1, + KC_BLE2, + KC_BLE3, + WIN_LOCK, + KC_RESET, + KC_BAT, + ENC_TG +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -57,5 +74,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - - From 25e3dda81a387ed7a7e0860887f76913af53bd72 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Sat, 22 Jun 2024 17:09:53 +0800 Subject: [PATCH 18/58] halconf.h license --- keyboards/mmd/km17/halconf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/keyboards/mmd/km17/halconf.h b/keyboards/mmd/km17/halconf.h index 9a1c234154c..ca7a4a689d0 100644 --- a/keyboards/mmd/km17/halconf.h +++ b/keyboards/mmd/km17/halconf.h @@ -1,3 +1,24 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/annepro2/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + #pragma once #define HAL_USE_PWM TRUE From 63c862754d94a793c4f91c7c3cb0a6cca7999e98 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 17:59:34 +0800 Subject: [PATCH 19/58] Update readme.md --- keyboards/mmd/km17/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mmd/km17/readme.md b/keyboards/mmd/km17/readme.md index 7b9a16126f9..97aee4457ca 100644 --- a/keyboards/mmd/km17/readme.md +++ b/keyboards/mmd/km17/readme.md @@ -1,4 +1,4 @@ -# MMD-KM17 +# MMD-KM75 * A customizable soldering 75% keyboard. @@ -9,10 +9,10 @@ Make example for this keyboard (after setting up your build environment): - make mmd/km17:default + make mmd/km75:default Flashing example for this keyboard: - make mmd/km17:default:flash + make mmd/km75:default:flash See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. From e696340e93962b101248cf1af2877e7807320de3 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:01:22 +0800 Subject: [PATCH 20/58] Create KM75 --- keyboards/mmd/KM75 | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/mmd/KM75 diff --git a/keyboards/mmd/KM75 b/keyboards/mmd/KM75 new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/keyboards/mmd/KM75 @@ -0,0 +1 @@ + From 76a2d9dbc2d6b83835c3653b70b838409eced83f Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:01:45 +0800 Subject: [PATCH 21/58] Delete keyboards/mmd/KM75 --- keyboards/mmd/KM75 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/mmd/KM75 diff --git a/keyboards/mmd/KM75 b/keyboards/mmd/KM75 deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/mmd/KM75 +++ /dev/null @@ -1 +0,0 @@ - From dbe4c1b1c6c374c15f362853fa6637fc8d356b90 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:02:21 +0800 Subject: [PATCH 22/58] Create km75 --- keyboards/mmd/km75 | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/mmd/km75 diff --git a/keyboards/mmd/km75 b/keyboards/mmd/km75 new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/keyboards/mmd/km75 @@ -0,0 +1 @@ + From 0435cc7ba4d81f5b87e541fa8454e9ad9e0d01f5 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:11:39 +0800 Subject: [PATCH 23/58] Delete keyboards/mmd/km75 --- keyboards/mmd/km75 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/mmd/km75 diff --git a/keyboards/mmd/km75 b/keyboards/mmd/km75 deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/mmd/km75 +++ /dev/null @@ -1 +0,0 @@ - From 84ab499c73646cc68ccf9d984c3e34b40dfe3291 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:12:36 +0800 Subject: [PATCH 24/58] Create keymap.c --- keyboards/mmd/km75/keymaps/default/keymap.c | 75 +++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 keyboards/mmd/km75/keymaps/default/keymap.c diff --git a/keyboards/mmd/km75/keymaps/default/keymap.c b/keyboards/mmd/km75/keymaps/default/keymap.c new file mode 100644 index 00000000000..da39cad376b --- /dev/null +++ b/keyboards/mmd/km75/keymaps/default/keymap.c @@ -0,0 +1,75 @@ +/* +Copyright 2021 owlab +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + + +#include QMK_KEYBOARD_H + + +enum custom_keycodes { +#ifdef VIA_ENABLE +// KC_USB = QK_USER, + KC_24G = QK_KB_0, +#else + KC_24G = SAFE_RANGE, +#endif + KC_BLE1, + KC_BLE2, + KC_BLE3, + WIN_LOCK, + KC_RESET, + KC_BAT, + ENC_TG +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + + [0] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [1] = LAYOUT( + _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ), + [2] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [3] = LAYOUT( + _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ) +}; + From 6d6226952e6085d333ee4853a265b1e0a4dd7c12 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:13:37 +0800 Subject: [PATCH 25/58] Create keymap.c --- keyboards/mmd/km75/keymaps/via/keymap.c | 75 +++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 keyboards/mmd/km75/keymaps/via/keymap.c diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c new file mode 100644 index 00000000000..da39cad376b --- /dev/null +++ b/keyboards/mmd/km75/keymaps/via/keymap.c @@ -0,0 +1,75 @@ +/* +Copyright 2021 owlab +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + + +#include QMK_KEYBOARD_H + + +enum custom_keycodes { +#ifdef VIA_ENABLE +// KC_USB = QK_USER, + KC_24G = QK_KB_0, +#else + KC_24G = SAFE_RANGE, +#endif + KC_BLE1, + KC_BLE2, + KC_BLE3, + WIN_LOCK, + KC_RESET, + KC_BAT, + ENC_TG +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + + [0] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [1] = LAYOUT( + _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ), + [2] = LAYOUT( + 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_DEL, ENC_TG, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [3] = LAYOUT( + _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + + ) +}; + From 2daac2ab143021835e983561dfaa201ea176eb8f Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:14:08 +0800 Subject: [PATCH 26/58] Create rules.mk --- keyboards/mmd/km75/keymaps/via/rules.mk | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 keyboards/mmd/km75/keymaps/via/rules.mk diff --git a/keyboards/mmd/km75/keymaps/via/rules.mk b/keyboards/mmd/km75/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/mmd/km75/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes From 11a099f3f4ab4eb3c2acfa16ddd8960a625a0237 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:14:51 +0800 Subject: [PATCH 27/58] Create config.h --- keyboards/mmd/km75/config.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 keyboards/mmd/km75/config.h diff --git a/keyboards/mmd/km75/config.h b/keyboards/mmd/km75/config.h new file mode 100644 index 00000000000..f9b0087b99e --- /dev/null +++ b/keyboards/mmd/km75/config.h @@ -0,0 +1,31 @@ +/* Copyright 2022 Jacky + * + * 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 + + +#define RGB_MATRIX_LED_COUNT 81 +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 1 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 + +#define ENCODERS_PAD_A {B3} +#define ENCODERS_PAD_B {A7} + +#define ENCODER_RESOLUTION 4 From bda78887a6fc80de16c94b5ef6bae298a938f797 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:15:27 +0800 Subject: [PATCH 28/58] Create halconf.h --- keyboards/mmd/km75/halconf.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 keyboards/mmd/km75/halconf.h diff --git a/keyboards/mmd/km75/halconf.h b/keyboards/mmd/km75/halconf.h new file mode 100644 index 00000000000..efa945ea7fb --- /dev/null +++ b/keyboards/mmd/km75/halconf.h @@ -0,0 +1,26 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/annepro2/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next From 0965537997714b6ef5f0372bd7361f1cea863012 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:16:21 +0800 Subject: [PATCH 29/58] Create keyboard.json --- keyboards/mmd/km75/keyboard.json | 246 +++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 keyboards/mmd/km75/keyboard.json diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json new file mode 100644 index 00000000000..3f8edf5b809 --- /dev/null +++ b/keyboards/mmd/km75/keyboard.json @@ -0,0 +1,246 @@ +{ + "manufacturer": "MMD", + "keyboard_name": "MMD-KM75", + "maintainer": "Smartmmd", + "board": "STM32_F103_STM32DUINO", + "bootloader": "stm32duino", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B0", "C15", "C14", "C13", "A15", "B7", "B6", "B5", "B4", "B12", "B13", "B14", "A14", "B2", "B15"], + "rows": ["A0", "A1", "A2", "A3", "A4", "A5"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "animations": { + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "multisplash": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "solid_color": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [5, 5], "x": 93, "y": 6, "flags": 4}, + {"matrix": [5, 10], "x": 150, "y": 6, "flags": 4}, + {"matrix": [5, 11], "x": 169, "y": 6, "flags": 4}, + {"matrix": [5, 12], "x": 194, "y": 6, "flags": 4}, + {"matrix": [5, 13], "x": 209, "y": 6, "flags": 4}, + {"matrix": [5, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [4, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [4, 13], "x": 213, "y": 6, "flags": 4}, + {"matrix": [4, 12], "x": 192, "y": 6, "flags": 4}, + {"matrix": [4, 11], "x": 172, "y": 6, "flags": 4}, + {"matrix": [4, 10], "x": 156, "y": 6, "flags": 4}, + {"matrix": [4, 9], "x": 141, "y": 6, "flags": 4}, + {"matrix": [4, 8], "x": 126, "y": 6, "flags": 4}, + {"matrix": [4, 7], "x": 111, "y": 6, "flags": 4}, + {"matrix": [4, 6], "x": 95, "y": 6, "flags": 4}, + {"matrix": [4, 5], "x": 80, "y": 6, "flags": 4}, + {"matrix": [4, 4], "x": 65, "y": 6, "flags": 4}, + {"matrix": [4, 3], "x": 50, "y": 6, "flags": 4}, + {"matrix": [4, 2], "x": 34, "y": 6, "flags": 4}, + {"matrix": [5, 2], "x": 40, "y": 6, "flags": 4}, + {"matrix": [5, 1], "x": 21, "y": 6, "flags": 4}, + {"matrix": [5, 0], "x": 2, "y": 6, "flags": 4}, + {"matrix": [4, 0], "x": 10, "y": 6, "flags": 4}, + {"matrix": [3, 0], "x": 1, "y": 6, "flags": 4}, + {"matrix": [3, 1], "x": 22, "y": 6, "flags": 4}, + {"matrix": [3, 2], "x": 37, "y": 6, "flags": 4}, + {"matrix": [3, 3], "x": 52, "y": 6, "flags": 4}, + {"matrix": [3, 4], "x": 68, "y": 6, "flags": 4}, + {"matrix": [3, 5], "x": 83, "y": 6, "flags": 4}, + {"matrix": [3, 6], "x": 98, "y": 6, "flags": 4}, + {"matrix": [3, 7], "x": 113, "y": 6, "flags": 4}, + {"matrix": [3, 8], "x": 129, "y": 6, "flags": 4}, + {"matrix": [3, 9], "x": 144, "y": 6, "flags": 4}, + {"matrix": [3, 10], "x": 159, "y": 6, "flags": 4}, + {"matrix": [3, 11], "x": 174, "y": 6, "flags": 4}, + {"matrix": [3, 13], "x": 199, "y": 6, "flags": 4}, + {"matrix": [3, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [2, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [2, 13], "x": 209, "y": 6, "flags": 4}, + {"matrix": [2, 12], "x": 190, "y": 6, "flags": 4}, + {"matrix": [2, 11], "x": 175, "y": 6, "flags": 4}, + {"matrix": [2, 10], "x": 160, "y": 6, "flags": 4}, + {"matrix": [2, 9], "x": 145, "y": 6, "flags": 4}, + {"matrix": [2, 8], "x": 129, "y": 6, "flags": 4}, + {"matrix": [2, 7], "x": 114, "y": 6, "flags": 4}, + {"matrix": [2, 6], "x": 99, "y": 6, "flags": 4}, + {"matrix": [2, 5], "x": 84, "y": 6, "flags": 4}, + {"matrix": [2, 4], "x": 69, "y": 6, "flags": 4}, + {"matrix": [2, 3], "x": 53, "y": 6, "flags": 4}, + {"matrix": [2, 2], "x": 38, "y": 6, "flags": 4}, + {"matrix": [2, 1], "x": 23, "y": 6, "flags": 4}, + {"matrix": [2, 0], "x": 4, "y": 6, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 6, "flags": 4}, + {"matrix": [1, 1], "x": 11, "y": 6, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 6, "flags": 4}, + {"matrix": [1, 3], "x": 41, "y": 6, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 6, "flags": 4}, + {"matrix": [1, 5], "x": 72, "y": 6, "flags": 4}, + {"matrix": [1, 6], "x": 87, "y": 6, "flags": 4}, + {"matrix": [1, 7], "x": 102, "y": 6, "flags": 4}, + {"matrix": [1, 8], "x": 117, "y": 6, "flags": 4}, + {"matrix": [1, 9], "x": 133, "y": 6, "flags": 4}, + {"matrix": [1, 10], "x": 148, "y": 6, "flags": 4}, + {"matrix": [1, 11], "x": 163, "y": 6, "flags": 4}, + {"matrix": [1, 12], "x": 178, "y": 6, "flags": 4}, + {"matrix": [1, 13], "x": 201, "y": 6, "flags": 4}, + {"matrix": [1, 14], "x": 224, "y": 6, "flags": 4}, + {"matrix": [0, 13], "x": 213, "y": 6, "flags": 4}, + {"matrix": [0, 12], "x": 194, "y": 6, "flags": 4}, + {"matrix": [0, 11], "x": 179, "y": 6, "flags": 4}, + {"matrix": [0, 10], "x": 164, "y": 6, "flags": 4}, + {"matrix": [0, 9], "x": 149, "y": 6, "flags": 4}, + {"matrix": [0, 8], "x": 129, "y": 6, "flags": 4}, + {"matrix": [0, 7], "x": 114, "y": 6, "flags": 4}, + {"matrix": [0, 6], "x": 99, "y": 6, "flags": 4}, + {"matrix": [0, 5], "x": 84, "y": 6, "flags": 4}, + {"matrix": [0, 4], "x": 65, "y": 6, "flags": 4}, + {"matrix": [0, 3], "x": 50, "y": 6, "flags": 4}, + {"matrix": [0, 2], "x": 34, "y": 6, "flags": 4}, + {"matrix": [0, 1], "x": 19, "y": 6, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 6, "flags": 4} + ] + }, + "url": "www.i-chip.cn", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x3021", + "vid": "0x28E9" + }, + "ws2812": { + "driver": "pwm", + "pin": "A6" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 14], "x": 15, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 13, "y": 5.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25} + ] + } + } +} From 66675adec386134d0cff912ced34c56afb18ca59 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:16:50 +0800 Subject: [PATCH 30/58] Create km75.c --- keyboards/mmd/km75/km75.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 keyboards/mmd/km75/km75.c diff --git a/keyboards/mmd/km75/km75.c b/keyboards/mmd/km75/km75.c new file mode 100644 index 00000000000..289ece8bd2f --- /dev/null +++ b/keyboards/mmd/km75/km75.c @@ -0,0 +1,31 @@ +/* Copyright 2022 Jacky + * + * 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 "quantum.h" + + +void keyboard_pre_init_kb(void) { + setPinOutput(A8); + writePinHigh(A8); +} + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return false; +} From 718c9d6e9a1fc770c68ebebe4da3fdf7d1f00441 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:17:15 +0800 Subject: [PATCH 31/58] Create mcuconf.h --- keyboards/mmd/km75/mcuconf.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 keyboards/mmd/km75/mcuconf.h diff --git a/keyboards/mmd/km75/mcuconf.h b/keyboards/mmd/km75/mcuconf.h new file mode 100644 index 00000000000..9caef1b80a7 --- /dev/null +++ b/keyboards/mmd/km75/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2021 Glorious, LLC + * + * 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_next + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE From cb8a1caed04e76f48f93d4bd9bb8068aafacdfa2 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:18:10 +0800 Subject: [PATCH 32/58] Create readme.md --- keyboards/mmd/km75/readme.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 keyboards/mmd/km75/readme.md diff --git a/keyboards/mmd/km75/readme.md b/keyboards/mmd/km75/readme.md new file mode 100644 index 00000000000..97aee4457ca --- /dev/null +++ b/keyboards/mmd/km75/readme.md @@ -0,0 +1,22 @@ +# MMD-KM75 + + +* A customizable soldering 75% keyboard. + +* Keyboard Maintainer: [MMD](https://github.com/Smartmmd) +* Hardware Supported: [MMD](https://github.com/Smartmmd) +* Hardware Availability: [MMD](https://github.com/Smartmmd) + +Make example for this keyboard (after setting up your build environment): + + make mmd/km75:default +Flashing example for this keyboard: + + make mmd/km75:default:flash + +See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. + +## Bootloader ESC the bootloader in 3 ways: +* **Bootmagic reset: Hold down Enter in the keyboard then replug +* **Physical reset button: Briefly press the button on the back of the PCB +* **Keycode in layout: Press the key mapped to QK_BOOT From 26933be1f7e2fba89bd9191c83a40ec36e688472 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:18:37 +0800 Subject: [PATCH 33/58] Create rules.mk --- keyboards/mmd/km75/rules.mk | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 keyboards/mmd/km75/rules.mk diff --git a/keyboards/mmd/km75/rules.mk b/keyboards/mmd/km75/rules.mk new file mode 100644 index 00000000000..a90a6678876 --- /dev/null +++ b/keyboards/mmd/km75/rules.mk @@ -0,0 +1,2 @@ +MCU_LDSCRIPT = STM32F103xB +ENCODER_ENABLE = yes From abfd6bf92db3f3cfddc8863de5673467499f6683 Mon Sep 17 00:00:00 2001 From: Smartmmd Date: Sat, 22 Jun 2024 18:19:01 +0800 Subject: [PATCH 34/58] Update readme.md --- keyboards/mmd/km17/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mmd/km17/readme.md b/keyboards/mmd/km17/readme.md index 97aee4457ca..7b9a16126f9 100644 --- a/keyboards/mmd/km17/readme.md +++ b/keyboards/mmd/km17/readme.md @@ -1,4 +1,4 @@ -# MMD-KM75 +# MMD-KM17 * A customizable soldering 75% keyboard. @@ -9,10 +9,10 @@ Make example for this keyboard (after setting up your build environment): - make mmd/km75:default + make mmd/km17:default Flashing example for this keyboard: - make mmd/km75:default:flash + make mmd/km17:default:flash See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. From 108e3d2b5cdf7a77c72afbadd013df15df2fa2a4 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Sat, 22 Jun 2024 18:41:36 +0800 Subject: [PATCH 35/58] keyboards name changed, remove non related wireless code (this is a USB only board) --- keyboards/mmd/km17/halconf.h | 5 ----- keyboards/mmd/km17/keyboard.json | 2 +- keyboards/mmd/km17/keymaps/default/keymap.c | 20 ++------------------ keyboards/mmd/km17/keymaps/via/keymap.c | 20 ++------------------ keyboards/mmd/km17/{km17.c => km75.c} | 0 keyboards/mmd/km17/readme.md | 6 +++--- 6 files changed, 8 insertions(+), 45 deletions(-) rename keyboards/mmd/km17/{km17.c => km75.c} (100%) diff --git a/keyboards/mmd/km17/halconf.h b/keyboards/mmd/km17/halconf.h index ca7a4a689d0..1a63b842b8d 100644 --- a/keyboards/mmd/km17/halconf.h +++ b/keyboards/mmd/km17/halconf.h @@ -14,11 +14,6 @@ * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/annepro2/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - #pragma once #define HAL_USE_PWM TRUE diff --git a/keyboards/mmd/km17/keyboard.json b/keyboards/mmd/km17/keyboard.json index 919982ee46e..3f8edf5b809 100644 --- a/keyboards/mmd/km17/keyboard.json +++ b/keyboards/mmd/km17/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "MMD", - "keyboard_name": "MMD-KM17", + "keyboard_name": "MMD-KM75", "maintainer": "Smartmmd", "board": "STM32_F103_STM32DUINO", "bootloader": "stm32duino", diff --git a/keyboards/mmd/km17/keymaps/default/keymap.c b/keyboards/mmd/km17/keymaps/default/keymap.c index 8e45af354d9..fd1404b6998 100644 --- a/keyboards/mmd/km17/keymaps/default/keymap.c +++ b/keyboards/mmd/km17/keymaps/default/keymap.c @@ -16,22 +16,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -enum custom_keycodes { -#ifdef VIA_ENABLE -// KC_USB = QK_USER, - KC_24G = QK_KB_0, -#else - KC_24G = SAFE_RANGE, -#endif - KC_BLE1, - KC_BLE2, - KC_BLE3, - WIN_LOCK, - KC_RESET, - KC_BAT, - ENC_TG -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -46,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, @@ -64,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, diff --git a/keyboards/mmd/km17/keymaps/via/keymap.c b/keyboards/mmd/km17/keymaps/via/keymap.c index 8e45af354d9..fd1404b6998 100644 --- a/keyboards/mmd/km17/keymaps/via/keymap.c +++ b/keyboards/mmd/km17/keymaps/via/keymap.c @@ -16,22 +16,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -enum custom_keycodes { -#ifdef VIA_ENABLE -// KC_USB = QK_USER, - KC_24G = QK_KB_0, -#else - KC_24G = SAFE_RANGE, -#endif - KC_BLE1, - KC_BLE2, - KC_BLE3, - WIN_LOCK, - KC_RESET, - KC_BAT, - ENC_TG -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -46,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, @@ -64,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, diff --git a/keyboards/mmd/km17/km17.c b/keyboards/mmd/km17/km75.c similarity index 100% rename from keyboards/mmd/km17/km17.c rename to keyboards/mmd/km17/km75.c diff --git a/keyboards/mmd/km17/readme.md b/keyboards/mmd/km17/readme.md index 7b9a16126f9..97aee4457ca 100644 --- a/keyboards/mmd/km17/readme.md +++ b/keyboards/mmd/km17/readme.md @@ -1,4 +1,4 @@ -# MMD-KM17 +# MMD-KM75 * A customizable soldering 75% keyboard. @@ -9,10 +9,10 @@ Make example for this keyboard (after setting up your build environment): - make mmd/km17:default + make mmd/km75:default Flashing example for this keyboard: - make mmd/km17:default:flash + make mmd/km75:default:flash See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. From 1a88922abe2e745c57382ae19bbbd2ad6bb70595 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:02:09 +0800 Subject: [PATCH 36/58] Name change to km75 from km17 --- keyboards/mmd/km17/config.h | 32 --- keyboards/mmd/km17/halconf.h | 22 -- keyboards/mmd/km17/keyboard.json | 246 -------------------- keyboards/mmd/km17/keymaps/default/keymap.c | 60 ----- keyboards/mmd/km17/keymaps/via/keymap.c | 60 ----- keyboards/mmd/km17/keymaps/via/rules.mk | 4 - keyboards/mmd/km17/km75.c | 33 --- keyboards/mmd/km17/mcuconf.h | 22 -- keyboards/mmd/km17/readme.md | 22 -- keyboards/mmd/km17/rules.mk | 2 - keyboards/mmd/km75/halconf.h | 4 - keyboards/mmd/km75/keymaps/default/keymap.c | 16 -- keyboards/mmd/km75/keymaps/via/keymap.c | 16 -- 13 files changed, 539 deletions(-) delete mode 100644 keyboards/mmd/km17/config.h delete mode 100644 keyboards/mmd/km17/halconf.h delete mode 100644 keyboards/mmd/km17/keyboard.json delete mode 100644 keyboards/mmd/km17/keymaps/default/keymap.c delete mode 100644 keyboards/mmd/km17/keymaps/via/keymap.c delete mode 100644 keyboards/mmd/km17/keymaps/via/rules.mk delete mode 100644 keyboards/mmd/km17/km75.c delete mode 100644 keyboards/mmd/km17/mcuconf.h delete mode 100644 keyboards/mmd/km17/readme.md delete mode 100644 keyboards/mmd/km17/rules.mk diff --git a/keyboards/mmd/km17/config.h b/keyboards/mmd/km17/config.h deleted file mode 100644 index 96f6c3bfafd..00000000000 --- a/keyboards/mmd/km17/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2022 Jacky - * - * 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 - - -#define RGB_MATRIX_LED_COUNT 81 -#define WS2812_PWM_DRIVER PWMD3 -#define WS2812_PWM_CHANNEL 1 -#define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 - -#define ENCODERS_PAD_A {B3} -#define ENCODERS_PAD_B {A7} - -#define ENCODER_RESOLUTION 4 - diff --git a/keyboards/mmd/km17/halconf.h b/keyboards/mmd/km17/halconf.h deleted file mode 100644 index 1a63b842b8d..00000000000 --- a/keyboards/mmd/km17/halconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 - -#define HAL_USE_PWM TRUE - -#include_next - diff --git a/keyboards/mmd/km17/keyboard.json b/keyboards/mmd/km17/keyboard.json deleted file mode 100644 index 3f8edf5b809..00000000000 --- a/keyboards/mmd/km17/keyboard.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "manufacturer": "MMD", - "keyboard_name": "MMD-KM75", - "maintainer": "Smartmmd", - "board": "STM32_F103_STM32DUINO", - "bootloader": "stm32duino", - "diode_direction": "ROW2COL", - "features": { - "bootmagic": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["B0", "C15", "C14", "C13", "A15", "B7", "B6", "B5", "B4", "B12", "B13", "B14", "A14", "B2", "B15"], - "rows": ["A0", "A1", "A2", "A3", "A4", "A5"] - }, - "processor": "STM32F103", - "rgb_matrix": { - "animations": { - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_sat": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "band_val": true, - "breathing": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "cycle_up_down": true, - "digital_rain": true, - "dual_beacon": true, - "gradient_left_right": true, - "gradient_up_down": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "multisplash": true, - "rainbow_beacon": true, - "rainbow_moving_chevron": true, - "rainbow_pinwheels": true, - "solid_color": true, - "solid_multisplash": true, - "solid_reactive": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_multinexus": true, - "solid_reactive_multiwide": true, - "solid_reactive_nexus": true, - "solid_reactive_simple": true, - "solid_reactive_wide": true, - "solid_splash": true, - "splash": true, - "typing_heatmap": true - }, - "driver": "ws2812", - "layout": [ - {"matrix": [5, 5], "x": 93, "y": 6, "flags": 4}, - {"matrix": [5, 10], "x": 150, "y": 6, "flags": 4}, - {"matrix": [5, 11], "x": 169, "y": 6, "flags": 4}, - {"matrix": [5, 12], "x": 194, "y": 6, "flags": 4}, - {"matrix": [5, 13], "x": 209, "y": 6, "flags": 4}, - {"matrix": [5, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [4, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [4, 13], "x": 213, "y": 6, "flags": 4}, - {"matrix": [4, 12], "x": 192, "y": 6, "flags": 4}, - {"matrix": [4, 11], "x": 172, "y": 6, "flags": 4}, - {"matrix": [4, 10], "x": 156, "y": 6, "flags": 4}, - {"matrix": [4, 9], "x": 141, "y": 6, "flags": 4}, - {"matrix": [4, 8], "x": 126, "y": 6, "flags": 4}, - {"matrix": [4, 7], "x": 111, "y": 6, "flags": 4}, - {"matrix": [4, 6], "x": 95, "y": 6, "flags": 4}, - {"matrix": [4, 5], "x": 80, "y": 6, "flags": 4}, - {"matrix": [4, 4], "x": 65, "y": 6, "flags": 4}, - {"matrix": [4, 3], "x": 50, "y": 6, "flags": 4}, - {"matrix": [4, 2], "x": 34, "y": 6, "flags": 4}, - {"matrix": [5, 2], "x": 40, "y": 6, "flags": 4}, - {"matrix": [5, 1], "x": 21, "y": 6, "flags": 4}, - {"matrix": [5, 0], "x": 2, "y": 6, "flags": 4}, - {"matrix": [4, 0], "x": 10, "y": 6, "flags": 4}, - {"matrix": [3, 0], "x": 1, "y": 6, "flags": 4}, - {"matrix": [3, 1], "x": 22, "y": 6, "flags": 4}, - {"matrix": [3, 2], "x": 37, "y": 6, "flags": 4}, - {"matrix": [3, 3], "x": 52, "y": 6, "flags": 4}, - {"matrix": [3, 4], "x": 68, "y": 6, "flags": 4}, - {"matrix": [3, 5], "x": 83, "y": 6, "flags": 4}, - {"matrix": [3, 6], "x": 98, "y": 6, "flags": 4}, - {"matrix": [3, 7], "x": 113, "y": 6, "flags": 4}, - {"matrix": [3, 8], "x": 129, "y": 6, "flags": 4}, - {"matrix": [3, 9], "x": 144, "y": 6, "flags": 4}, - {"matrix": [3, 10], "x": 159, "y": 6, "flags": 4}, - {"matrix": [3, 11], "x": 174, "y": 6, "flags": 4}, - {"matrix": [3, 13], "x": 199, "y": 6, "flags": 4}, - {"matrix": [3, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [2, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [2, 13], "x": 209, "y": 6, "flags": 4}, - {"matrix": [2, 12], "x": 190, "y": 6, "flags": 4}, - {"matrix": [2, 11], "x": 175, "y": 6, "flags": 4}, - {"matrix": [2, 10], "x": 160, "y": 6, "flags": 4}, - {"matrix": [2, 9], "x": 145, "y": 6, "flags": 4}, - {"matrix": [2, 8], "x": 129, "y": 6, "flags": 4}, - {"matrix": [2, 7], "x": 114, "y": 6, "flags": 4}, - {"matrix": [2, 6], "x": 99, "y": 6, "flags": 4}, - {"matrix": [2, 5], "x": 84, "y": 6, "flags": 4}, - {"matrix": [2, 4], "x": 69, "y": 6, "flags": 4}, - {"matrix": [2, 3], "x": 53, "y": 6, "flags": 4}, - {"matrix": [2, 2], "x": 38, "y": 6, "flags": 4}, - {"matrix": [2, 1], "x": 23, "y": 6, "flags": 4}, - {"matrix": [2, 0], "x": 4, "y": 6, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 6, "flags": 4}, - {"matrix": [1, 1], "x": 11, "y": 6, "flags": 4}, - {"matrix": [1, 2], "x": 26, "y": 6, "flags": 4}, - {"matrix": [1, 3], "x": 41, "y": 6, "flags": 4}, - {"matrix": [1, 4], "x": 56, "y": 6, "flags": 4}, - {"matrix": [1, 5], "x": 72, "y": 6, "flags": 4}, - {"matrix": [1, 6], "x": 87, "y": 6, "flags": 4}, - {"matrix": [1, 7], "x": 102, "y": 6, "flags": 4}, - {"matrix": [1, 8], "x": 117, "y": 6, "flags": 4}, - {"matrix": [1, 9], "x": 133, "y": 6, "flags": 4}, - {"matrix": [1, 10], "x": 148, "y": 6, "flags": 4}, - {"matrix": [1, 11], "x": 163, "y": 6, "flags": 4}, - {"matrix": [1, 12], "x": 178, "y": 6, "flags": 4}, - {"matrix": [1, 13], "x": 201, "y": 6, "flags": 4}, - {"matrix": [1, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [0, 13], "x": 213, "y": 6, "flags": 4}, - {"matrix": [0, 12], "x": 194, "y": 6, "flags": 4}, - {"matrix": [0, 11], "x": 179, "y": 6, "flags": 4}, - {"matrix": [0, 10], "x": 164, "y": 6, "flags": 4}, - {"matrix": [0, 9], "x": 149, "y": 6, "flags": 4}, - {"matrix": [0, 8], "x": 129, "y": 6, "flags": 4}, - {"matrix": [0, 7], "x": 114, "y": 6, "flags": 4}, - {"matrix": [0, 6], "x": 99, "y": 6, "flags": 4}, - {"matrix": [0, 5], "x": 84, "y": 6, "flags": 4}, - {"matrix": [0, 4], "x": 65, "y": 6, "flags": 4}, - {"matrix": [0, 3], "x": 50, "y": 6, "flags": 4}, - {"matrix": [0, 2], "x": 34, "y": 6, "flags": 4}, - {"matrix": [0, 1], "x": 19, "y": 6, "flags": 4}, - {"matrix": [0, 0], "x": 0, "y": 6, "flags": 4} - ] - }, - "url": "www.i-chip.cn", - "usb": { - "device_version": "0.0.1", - "force_nkro": true, - "pid": "0x3021", - "vid": "0x28E9" - }, - "ws2812": { - "driver": "pwm", - "pin": "A6" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1.25, "y": 0}, - {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.75, "y": 0}, - {"matrix": [0, 10], "x": 10.75, "y": 0}, - {"matrix": [0, 11], "x": 11.75, "y": 0}, - {"matrix": [0, 12], "x": 12.75, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.25}, - {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"matrix": [1, 7], "x": 7, "y": 1.25}, - {"matrix": [1, 8], "x": 8, "y": 1.25}, - {"matrix": [1, 9], "x": 9, "y": 1.25}, - {"matrix": [1, 10], "x": 10, "y": 1.25}, - {"matrix": [1, 11], "x": 11, "y": 1.25}, - {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, - {"matrix": [1, 14], "x": 15, "y": 1.25}, - {"matrix": [2, 0], "x": 0, "y": 2.25}, - {"matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [2, 14], "x": 15, "y": 2.25}, - {"matrix": [3, 0], "x": 0, "y": 3.25}, - {"matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, - {"matrix": [3, 14], "x": 15, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4.25}, - {"matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, - {"matrix": [4, 13], "x": 14, "y": 4.25}, - {"matrix": [4, 14], "x": 15, "y": 4.25}, - {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, - {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 12], "x": 13, "y": 5.25}, - {"matrix": [5, 13], "x": 14, "y": 5.25}, - {"matrix": [5, 14], "x": 15, "y": 5.25} - ] - } - } -} diff --git a/keyboards/mmd/km17/keymaps/default/keymap.c b/keyboards/mmd/km17/keymaps/default/keymap.c deleted file mode 100644 index fd1404b6998..00000000000 --- a/keyboards/mmd/km17/keymaps/default/keymap.c +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2021 owlab -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( - 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_DEL, ENC_TG, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [1] = LAYOUT( - _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ), - [2] = LAYOUT( - 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_DEL, ENC_TG, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ) -}; - - diff --git a/keyboards/mmd/km17/keymaps/via/keymap.c b/keyboards/mmd/km17/keymaps/via/keymap.c deleted file mode 100644 index fd1404b6998..00000000000 --- a/keyboards/mmd/km17/keymaps/via/keymap.c +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2021 owlab -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( - 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_DEL, ENC_TG, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [1] = LAYOUT( - _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ), - [2] = LAYOUT( - 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_DEL, ENC_TG, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ) -}; - - diff --git a/keyboards/mmd/km17/keymaps/via/rules.mk b/keyboards/mmd/km17/keymaps/via/rules.mk deleted file mode 100644 index d750ac3ddee..00000000000 --- a/keyboards/mmd/km17/keymaps/via/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes - - diff --git a/keyboards/mmd/km17/km75.c b/keyboards/mmd/km17/km75.c deleted file mode 100644 index d51d8f99bfe..00000000000 --- a/keyboards/mmd/km17/km75.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 Jacky - * - * 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 "quantum.h" - - -void keyboard_pre_init_kb(void) { - setPinOutput(A8); - writePinHigh(A8); -} - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return false; -} - - diff --git a/keyboards/mmd/km17/mcuconf.h b/keyboards/mmd/km17/mcuconf.h deleted file mode 100644 index 9caef1b80a7..00000000000 --- a/keyboards/mmd/km17/mcuconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Glorious, LLC - * - * 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_next - -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/mmd/km17/readme.md b/keyboards/mmd/km17/readme.md deleted file mode 100644 index 97aee4457ca..00000000000 --- a/keyboards/mmd/km17/readme.md +++ /dev/null @@ -1,22 +0,0 @@ -# MMD-KM75 - - -* A customizable soldering 75% keyboard. - -* Keyboard Maintainer: [MMD](https://github.com/Smartmmd) -* Hardware Supported: [MMD](https://github.com/Smartmmd) -* Hardware Availability: [MMD](https://github.com/Smartmmd) - -Make example for this keyboard (after setting up your build environment): - - make mmd/km75:default -Flashing example for this keyboard: - - make mmd/km75:default:flash - -See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. - -## Bootloader ESC the bootloader in 3 ways: -* **Bootmagic reset: Hold down Enter in the keyboard then replug -* **Physical reset button: Briefly press the button on the back of the PCB -* **Keycode in layout: Press the key mapped to QK_BOOT diff --git a/keyboards/mmd/km17/rules.mk b/keyboards/mmd/km17/rules.mk deleted file mode 100644 index a90a6678876..00000000000 --- a/keyboards/mmd/km17/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -MCU_LDSCRIPT = STM32F103xB -ENCODER_ENABLE = yes diff --git a/keyboards/mmd/km75/halconf.h b/keyboards/mmd/km75/halconf.h index efa945ea7fb..7bc79291270 100644 --- a/keyboards/mmd/km75/halconf.h +++ b/keyboards/mmd/km75/halconf.h @@ -14,10 +14,6 @@ * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/annepro2/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ #pragma once diff --git a/keyboards/mmd/km75/keymaps/default/keymap.c b/keyboards/mmd/km75/keymaps/default/keymap.c index da39cad376b..dc7b81bc984 100644 --- a/keyboards/mmd/km75/keymaps/default/keymap.c +++ b/keyboards/mmd/km75/keymaps/default/keymap.c @@ -16,22 +16,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -enum custom_keycodes { -#ifdef VIA_ENABLE -// KC_USB = QK_USER, - KC_24G = QK_KB_0, -#else - KC_24G = SAFE_RANGE, -#endif - KC_BLE1, - KC_BLE2, - KC_BLE3, - WIN_LOCK, - KC_RESET, - KC_BAT, - ENC_TG -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c index da39cad376b..dc7b81bc984 100644 --- a/keyboards/mmd/km75/keymaps/via/keymap.c +++ b/keyboards/mmd/km75/keymaps/via/keymap.c @@ -16,22 +16,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -enum custom_keycodes { -#ifdef VIA_ENABLE -// KC_USB = QK_USER, - KC_24G = QK_KB_0, -#else - KC_24G = SAFE_RANGE, -#endif - KC_BLE1, - KC_BLE2, - KC_BLE3, - WIN_LOCK, - KC_RESET, - KC_BAT, - ENC_TG -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 63d3494f9f043ddfac05e672ad9ced0448f0a455 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:16:37 +0800 Subject: [PATCH 37/58] Keymaps updates --- keyboards/mmd/km75/keymaps/default/keymap.c | 12 ++++++------ keyboards/mmd/km75/keymaps/via/keymap.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/mmd/km75/keymaps/default/keymap.c b/keyboards/mmd/km75/keymaps/default/keymap.c index dc7b81bc984..3f2e5eda4a9 100644 --- a/keyboards/mmd/km75/keymaps/default/keymap.c +++ b/keyboards/mmd/km75/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_DEL, ENC_TG, + 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_DEL, _______, 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_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, @@ -30,15 +30,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ), [2] = LAYOUT( - 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_DEL, ENC_TG, + 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_DEL, _______, 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_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, @@ -48,11 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ) }; diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c index dc7b81bc984..3f2e5eda4a9 100644 --- a/keyboards/mmd/km75/keymaps/via/keymap.c +++ b/keyboards/mmd/km75/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_DEL, ENC_TG, + 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_DEL, _______, 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_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, @@ -30,15 +30,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, WIN_LOCK, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ), [2] = LAYOUT( - 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_DEL, ENC_TG, + 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_DEL, _______, 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_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, @@ -48,11 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, KC_BAT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, KC_RESET, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ) }; From 2cd09a036799cd8086d2b1e2815bc99987d8060b Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:41:17 +0200 Subject: [PATCH 38/58] Update keyboards/mmd/km75/km75.c Co-authored-by: Drashna Jaelre --- keyboards/mmd/km75/km75.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/mmd/km75/km75.c b/keyboards/mmd/km75/km75.c index 289ece8bd2f..3b543a20235 100644 --- a/keyboards/mmd/km75/km75.c +++ b/keyboards/mmd/km75/km75.c @@ -21,11 +21,3 @@ void keyboard_pre_init_kb(void) { writePinHigh(A8); } -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return false; -} From 760b5d46a7d5c770a9e9a21ad09b90d36d6609fb Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:42:15 +0200 Subject: [PATCH 39/58] Update keyboards/mmd/km75/km75.c Co-authored-by: Drashna Jaelre --- keyboards/mmd/km75/km75.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/mmd/km75/km75.c b/keyboards/mmd/km75/km75.c index 3b543a20235..002a5db65d7 100644 --- a/keyboards/mmd/km75/km75.c +++ b/keyboards/mmd/km75/km75.c @@ -17,7 +17,9 @@ void keyboard_pre_init_kb(void) { - setPinOutput(A8); - writePinHigh(A8); + gpio_set_pin_output(A8); + gpio_write_pin_high(A8); + + keyboard_pre_init_user(); } From b157de1fcbd8d0b9e633400a86a31d5b30640c3a Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:55:21 +0200 Subject: [PATCH 40/58] Update keyboards/mmd/km75/config.h Co-authored-by: Drashna Jaelre --- keyboards/mmd/km75/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/mmd/km75/config.h b/keyboards/mmd/km75/config.h index f9b0087b99e..bb6e4046187 100644 --- a/keyboards/mmd/km75/config.h +++ b/keyboards/mmd/km75/config.h @@ -25,7 +25,3 @@ #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 #define WS2812_DMA_CHANNEL 3 -#define ENCODERS_PAD_A {B3} -#define ENCODERS_PAD_B {A7} - -#define ENCODER_RESOLUTION 4 From f29b64fffea9f913e28278e0739523f415e25cb6 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Thu, 4 Jul 2024 04:57:34 +0800 Subject: [PATCH 41/58] endcoder move to keyboard.json --- keyboards/mmd/km75/keyboard.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index 3f8edf5b809..d710c3eb12a 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -5,6 +5,11 @@ "board": "STM32_F103_STM32DUINO", "bootloader": "stm32duino", "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "B3", "pin_b": "A7", "resolution": 2} + ] + }, "features": { "bootmagic": true, "console": true, From d279d83f26108b4788c314543a5c987809a7aa19 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Thu, 4 Jul 2024 05:08:56 +0800 Subject: [PATCH 42/58] TAB change to space --- keyboards/mmd/km75/keymaps/default/keymap.c | 72 ++++++++++----------- keyboards/mmd/km75/keymaps/via/keymap.c | 72 ++++++++++----------- 2 files changed, 68 insertions(+), 76 deletions(-) diff --git a/keyboards/mmd/km75/keymaps/default/keymap.c b/keyboards/mmd/km75/keymaps/default/keymap.c index 3f2e5eda4a9..6572bf54b3c 100644 --- a/keyboards/mmd/km75/keymaps/default/keymap.c +++ b/keyboards/mmd/km75/keymaps/default/keymap.c @@ -18,42 +18,38 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [1] = LAYOUT( - _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ), - [2] = LAYOUT( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ) + [0] = LAYOUT( + 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_DEL, _______, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ), + [2] = LAYOUT( + 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_DEL, _______, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [3] = LAYOUT( + _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ) }; - + diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c index 3f2e5eda4a9..6572bf54b3c 100644 --- a/keyboards/mmd/km75/keymaps/via/keymap.c +++ b/keyboards/mmd/km75/keymaps/via/keymap.c @@ -18,42 +18,38 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [1] = LAYOUT( - _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ), - [2] = LAYOUT( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - - ) + [0] = LAYOUT( + 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_DEL, _______, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ), + [2] = LAYOUT( + 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_DEL, _______, + 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_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [3] = LAYOUT( + _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ) }; - + From c80997351b50963bdcb755f4a3c49117b7929c41 Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:28:12 +0200 Subject: [PATCH 43/58] Update keyboards/mmd/km75/config.h Co-authored-by: Ryan --- keyboards/mmd/km75/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mmd/km75/config.h b/keyboards/mmd/km75/config.h index bb6e4046187..f9c84341600 100644 --- a/keyboards/mmd/km75/config.h +++ b/keyboards/mmd/km75/config.h @@ -17,8 +17,6 @@ #pragma once - -#define RGB_MATRIX_LED_COUNT 81 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 2 From 83b72a7ca3db087319c42b26e45b1c9d4194dada Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:28:54 +0200 Subject: [PATCH 44/58] Update keyboards/mmd/km75/rules.mk Co-authored-by: Ryan --- keyboards/mmd/km75/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mmd/km75/rules.mk b/keyboards/mmd/km75/rules.mk index a90a6678876..5fae5866fd5 100644 --- a/keyboards/mmd/km75/rules.mk +++ b/keyboards/mmd/km75/rules.mk @@ -1,2 +1 @@ MCU_LDSCRIPT = STM32F103xB -ENCODER_ENABLE = yes From 7212e61254d23243c5a032a1ef1719b8b4809a3d Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:29:25 +0200 Subject: [PATCH 45/58] Update keyboards/mmd/km75/keyboard.json Co-authored-by: Ryan --- keyboards/mmd/km75/keyboard.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index d710c3eb12a..40006b590b7 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -16,7 +16,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true + "rgb_matrix": true, + "encoder": true }, "matrix_pins": { "cols": ["B0", "C15", "C14", "C13", "A15", "B7", "B6", "B5", "B4", "B12", "B13", "B14", "A14", "B2", "B15"], From 634412e69c9ddd7f1c9aeea114f4952331a81b51 Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:31:14 +0200 Subject: [PATCH 46/58] Update keyboards/mmd/km75/keyboard.json Co-authored-by: Joel Challis --- keyboards/mmd/km75/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index 40006b590b7..449098936f5 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -51,7 +51,6 @@ "rainbow_beacon": true, "rainbow_moving_chevron": true, "rainbow_pinwheels": true, - "solid_color": true, "solid_multisplash": true, "solid_reactive": true, "solid_reactive_cross": true, From 18ea74f588ab86ce7a00c0f48392deac8beeb0e0 Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:35:08 +0200 Subject: [PATCH 47/58] Update keyboards/mmd/km75/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/mmd/km75/keymaps/default/keymap.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/keyboards/mmd/km75/keymaps/default/keymap.c b/keyboards/mmd/km75/keymaps/default/keymap.c index 6572bf54b3c..fd98ca96628 100644 --- a/keyboards/mmd/km75/keymaps/default/keymap.c +++ b/keyboards/mmd/km75/keymaps/default/keymap.c @@ -33,23 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ), - [2] = LAYOUT( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ) }; From bb046d95a98561dd50b57582f2018d344b2e1b66 Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:36:03 +0200 Subject: [PATCH 48/58] Update keyboards/mmd/km75/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/mmd/km75/keymaps/via/keymap.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c index 6572bf54b3c..fd98ca96628 100644 --- a/keyboards/mmd/km75/keymaps/via/keymap.c +++ b/keyboards/mmd/km75/keymaps/via/keymap.c @@ -33,23 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ), - [2] = LAYOUT( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - - ), - [3] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ) }; From d06f16d75681f5b8587b5d0e6b49da3b4fb45ea4 Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:36:32 +0200 Subject: [PATCH 49/58] Update keyboards/mmd/km75/keyboard.json Co-authored-by: Joel Challis --- keyboards/mmd/km75/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index 449098936f5..0b0a78bedc8 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -2,7 +2,6 @@ "manufacturer": "MMD", "keyboard_name": "MMD-KM75", "maintainer": "Smartmmd", - "board": "STM32_F103_STM32DUINO", "bootloader": "stm32duino", "diode_direction": "ROW2COL", "encoder": { From 5de9a8e78f2175c7b6d5991c50d5f5298f1d3a92 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 5 Jul 2024 23:06:59 +0800 Subject: [PATCH 50/58] licence headers --- keyboards/mmd/km75/halconf.h | 2 +- keyboards/mmd/km75/keymaps/default/keymap.c | 30 ++++++++++----------- keyboards/mmd/km75/keymaps/via/keymap.c | 30 ++++++++++----------- keyboards/mmd/km75/mcuconf.h | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/keyboards/mmd/km75/halconf.h b/keyboards/mmd/km75/halconf.h index 7bc79291270..038dee0c0c6 100644 --- a/keyboards/mmd/km75/halconf.h +++ b/keyboards/mmd/km75/halconf.h @@ -1,4 +1,4 @@ -/* Copyright 2020 QMK +/* Copyright 2022 Jacky * * 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 diff --git a/keyboards/mmd/km75/keymaps/default/keymap.c b/keyboards/mmd/km75/keymaps/default/keymap.c index fd98ca96628..985fb695673 100644 --- a/keyboards/mmd/km75/keymaps/default/keymap.c +++ b/keyboards/mmd/km75/keymaps/default/keymap.c @@ -1,18 +1,18 @@ -/* -Copyright 2021 owlab -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 . -*/ - - +/* Copyright 2022 Jacky + * + * 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 diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c index fd98ca96628..985fb695673 100644 --- a/keyboards/mmd/km75/keymaps/via/keymap.c +++ b/keyboards/mmd/km75/keymaps/via/keymap.c @@ -1,18 +1,18 @@ -/* -Copyright 2021 owlab -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 . -*/ - - +/* Copyright 2022 Jacky + * + * 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 diff --git a/keyboards/mmd/km75/mcuconf.h b/keyboards/mmd/km75/mcuconf.h index 9caef1b80a7..c9fccf3c50a 100644 --- a/keyboards/mmd/km75/mcuconf.h +++ b/keyboards/mmd/km75/mcuconf.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Glorious, LLC +/* Copyright 2022 Jacky * * 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 From 2871af531612359eb243225e616f9a95d9777668 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:42:19 +0800 Subject: [PATCH 51/58] update hardware location links --- keyboards/mmd/km75/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mmd/km75/readme.md b/keyboards/mmd/km75/readme.md index 97aee4457ca..0a18acc5975 100644 --- a/keyboards/mmd/km75/readme.md +++ b/keyboards/mmd/km75/readme.md @@ -4,8 +4,8 @@ * A customizable soldering 75% keyboard. * Keyboard Maintainer: [MMD](https://github.com/Smartmmd) -* Hardware Supported: [MMD](https://github.com/Smartmmd) -* Hardware Availability: [MMD](https://github.com/Smartmmd) +* Hardware Supported: [i-game](http://www.i-game.tech) +* Hardware Availability: [i-game](http://www.i-game.tech) Make example for this keyboard (after setting up your build environment): From cf1e0655081133712867bc33632f4b162bc4452c Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:33:47 +0800 Subject: [PATCH 52/58] update RGB MTRIX LAYOUT, KEY LAYOUT --- keyboards/mmd/km75/keyboard.json | 337 ++++++++++++++++--------------- 1 file changed, 174 insertions(+), 163 deletions(-) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index 0b0a78bedc8..1a3befd885f 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -65,87 +65,93 @@ }, "driver": "ws2812", "layout": [ - {"matrix": [5, 5], "x": 93, "y": 6, "flags": 4}, - {"matrix": [5, 10], "x": 150, "y": 6, "flags": 4}, - {"matrix": [5, 11], "x": 169, "y": 6, "flags": 4}, - {"matrix": [5, 12], "x": 194, "y": 6, "flags": 4}, - {"matrix": [5, 13], "x": 209, "y": 6, "flags": 4}, - {"matrix": [5, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [4, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [4, 13], "x": 213, "y": 6, "flags": 4}, - {"matrix": [4, 12], "x": 192, "y": 6, "flags": 4}, - {"matrix": [4, 11], "x": 172, "y": 6, "flags": 4}, - {"matrix": [4, 10], "x": 156, "y": 6, "flags": 4}, - {"matrix": [4, 9], "x": 141, "y": 6, "flags": 4}, - {"matrix": [4, 8], "x": 126, "y": 6, "flags": 4}, - {"matrix": [4, 7], "x": 111, "y": 6, "flags": 4}, - {"matrix": [4, 6], "x": 95, "y": 6, "flags": 4}, - {"matrix": [4, 5], "x": 80, "y": 6, "flags": 4}, - {"matrix": [4, 4], "x": 65, "y": 6, "flags": 4}, - {"matrix": [4, 3], "x": 50, "y": 6, "flags": 4}, - {"matrix": [4, 2], "x": 34, "y": 6, "flags": 4}, - {"matrix": [5, 2], "x": 40, "y": 6, "flags": 4}, - {"matrix": [5, 1], "x": 21, "y": 6, "flags": 4}, - {"matrix": [5, 0], "x": 2, "y": 6, "flags": 4}, - {"matrix": [4, 0], "x": 10, "y": 6, "flags": 4}, - {"matrix": [3, 0], "x": 1, "y": 6, "flags": 4}, - {"matrix": [3, 1], "x": 22, "y": 6, "flags": 4}, - {"matrix": [3, 2], "x": 37, "y": 6, "flags": 4}, - {"matrix": [3, 3], "x": 52, "y": 6, "flags": 4}, - {"matrix": [3, 4], "x": 68, "y": 6, "flags": 4}, - {"matrix": [3, 5], "x": 83, "y": 6, "flags": 4}, - {"matrix": [3, 6], "x": 98, "y": 6, "flags": 4}, - {"matrix": [3, 7], "x": 113, "y": 6, "flags": 4}, - {"matrix": [3, 8], "x": 129, "y": 6, "flags": 4}, - {"matrix": [3, 9], "x": 144, "y": 6, "flags": 4}, - {"matrix": [3, 10], "x": 159, "y": 6, "flags": 4}, - {"matrix": [3, 11], "x": 174, "y": 6, "flags": 4}, - {"matrix": [3, 13], "x": 199, "y": 6, "flags": 4}, - {"matrix": [3, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [2, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [2, 13], "x": 209, "y": 6, "flags": 4}, - {"matrix": [2, 12], "x": 190, "y": 6, "flags": 4}, - {"matrix": [2, 11], "x": 175, "y": 6, "flags": 4}, - {"matrix": [2, 10], "x": 160, "y": 6, "flags": 4}, - {"matrix": [2, 9], "x": 145, "y": 6, "flags": 4}, - {"matrix": [2, 8], "x": 129, "y": 6, "flags": 4}, - {"matrix": [2, 7], "x": 114, "y": 6, "flags": 4}, - {"matrix": [2, 6], "x": 99, "y": 6, "flags": 4}, - {"matrix": [2, 5], "x": 84, "y": 6, "flags": 4}, - {"matrix": [2, 4], "x": 69, "y": 6, "flags": 4}, - {"matrix": [2, 3], "x": 53, "y": 6, "flags": 4}, - {"matrix": [2, 2], "x": 38, "y": 6, "flags": 4}, - {"matrix": [2, 1], "x": 23, "y": 6, "flags": 4}, - {"matrix": [2, 0], "x": 4, "y": 6, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 6, "flags": 4}, - {"matrix": [1, 1], "x": 11, "y": 6, "flags": 4}, - {"matrix": [1, 2], "x": 26, "y": 6, "flags": 4}, - {"matrix": [1, 3], "x": 41, "y": 6, "flags": 4}, - {"matrix": [1, 4], "x": 56, "y": 6, "flags": 4}, - {"matrix": [1, 5], "x": 72, "y": 6, "flags": 4}, - {"matrix": [1, 6], "x": 87, "y": 6, "flags": 4}, - {"matrix": [1, 7], "x": 102, "y": 6, "flags": 4}, - {"matrix": [1, 8], "x": 117, "y": 6, "flags": 4}, - {"matrix": [1, 9], "x": 133, "y": 6, "flags": 4}, - {"matrix": [1, 10], "x": 148, "y": 6, "flags": 4}, - {"matrix": [1, 11], "x": 163, "y": 6, "flags": 4}, - {"matrix": [1, 12], "x": 178, "y": 6, "flags": 4}, - {"matrix": [1, 13], "x": 201, "y": 6, "flags": 4}, - {"matrix": [1, 14], "x": 224, "y": 6, "flags": 4}, - {"matrix": [0, 13], "x": 213, "y": 6, "flags": 4}, - {"matrix": [0, 12], "x": 194, "y": 6, "flags": 4}, - {"matrix": [0, 11], "x": 179, "y": 6, "flags": 4}, - {"matrix": [0, 10], "x": 164, "y": 6, "flags": 4}, - {"matrix": [0, 9], "x": 149, "y": 6, "flags": 4}, - {"matrix": [0, 8], "x": 129, "y": 6, "flags": 4}, - {"matrix": [0, 7], "x": 114, "y": 6, "flags": 4}, - {"matrix": [0, 6], "x": 99, "y": 6, "flags": 4}, - {"matrix": [0, 5], "x": 84, "y": 6, "flags": 4}, - {"matrix": [0, 4], "x": 65, "y": 6, "flags": 4}, - {"matrix": [0, 3], "x": 50, "y": 6, "flags": 4}, - {"matrix": [0, 2], "x": 34, "y": 6, "flags": 4}, - {"matrix": [0, 1], "x": 19, "y": 6, "flags": 4}, - {"matrix": [0, 0], "x": 0, "y": 6, "flags": 4} + { "flags": 4, "matrix": [5, 5], "x": 93, "y": 64 }, + { "flags": 4, "matrix": [5, 10], "x": 150, "y": 64 }, + { "flags": 4, "matrix": [5, 11], "x": 169, "y": 64 }, + { "flags": 4, "matrix": [5, 12], "x": 194, "y": 64 }, + { "flags": 4, "matrix": [5, 13], "x": 209, "y": 64 }, + { "flags": 4, "matrix": [5, 14], "x": 224, "y": 64 }, + + { "flags": 4, "matrix": [4, 14], "x": 224, "y": 52 }, + { "flags": 4, "matrix": [4, 13], "x": 213, "y": 52 }, + { "flags": 4, "matrix": [4, 12], "x": 192, "y": 52 }, + { "flags": 4, "matrix": [4, 11], "x": 172, "y": 52 }, + { "flags": 4, "matrix": [4, 10], "x": 156, "y": 52 }, + { "flags": 4, "matrix": [4, 9], "x": 141, "y": 52 }, + { "flags": 4, "matrix": [4, 8], "x": 126, "y": 52 }, + { "flags": 4, "matrix": [4, 7], "x": 111, "y": 52 }, + { "flags": 4, "matrix": [4, 6], "x": 95, "y": 52 }, + { "flags": 4, "matrix": [4, 5], "x": 80, "y": 52 }, + { "flags": 4, "matrix": [4, 4], "x": 65, "y": 52 }, + { "flags": 4, "matrix": [4, 3], "x": 50, "y": 52 }, + { "flags": 4, "matrix": [4, 2], "x": 34, "y": 52 }, + + { "flags": 4, "matrix": [5, 2], "x": 40, "y": 64 }, + { "flags": 4, "matrix": [5, 1], "x": 21, "y": 64 }, + { "flags": 4, "matrix": [5, 0], "x": 2, "y": 64 }, + { "flags": 4, "matrix": [4, 0], "x": 10, "y": 52 }, + + { "flags": 4, "matrix": [3, 0], "x": 1, "y": 40 }, + { "flags": 4, "matrix": [3, 1], "x": 22, "y": 40 }, + { "flags": 4, "matrix": [3, 2], "x": 37, "y": 40 }, + { "flags": 4, "matrix": [3, 3], "x": 52, "y": 40 }, + { "flags": 4, "matrix": [3, 4], "x": 68, "y": 40 }, + { "flags": 4, "matrix": [3, 5], "x": 83, "y": 40 }, + { "flags": 4, "matrix": [3, 6], "x": 98, "y": 40 }, + { "flags": 4, "matrix": [3, 7], "x": 113,"y": 40 }, + { "flags": 4, "matrix": [3, 8], "x": 129,"y": 40 }, + { "flags": 4, "matrix": [3, 9], "x": 144,"y": 40 }, + { "flags": 4, "matrix": [3, 10], "x": 159,"y": 40 }, + { "flags": 4, "matrix": [3, 11], "x": 174,"y": 40 }, + { "flags": 4, "matrix": [3, 13], "x": 199,"y": 40 }, + { "flags": 4, "matrix": [3, 14], "x": 224,"y": 40 }, + + { "flags": 4, "matrix": [2, 14], "x": 224, "y": 28 }, + { "flags": 4, "matrix": [2, 13], "x": 209, "y": 28 }, + { "flags": 4, "matrix": [2, 12], "x": 190, "y": 28 }, + { "flags": 4, "matrix": [2, 11], "x": 175, "y": 28 }, + { "flags": 4, "matrix": [2, 10], "x": 160, "y": 28 }, + { "flags": 4, "matrix": [2, 9], "x": 145, "y": 28 }, + { "flags": 4, "matrix": [2, 8], "x": 129, "y": 28 }, + { "flags": 4, "matrix": [2, 7], "x": 114, "y": 28 }, + { "flags": 4, "matrix": [2, 6], "x": 99, "y": 28 }, + { "flags": 4, "matrix": [2, 5], "x": 84, "y": 28 }, + { "flags": 4, "matrix": [2, 4], "x": 69, "y": 28 }, + { "flags": 4, "matrix": [2, 3], "x": 53, "y": 28 }, + { "flags": 4, "matrix": [2, 2], "x": 38, "y": 28 }, + { "flags": 4, "matrix": [2, 1], "x": 23, "y": 28 }, + { "flags": 4, "matrix": [2, 0], "x": 4, "y": 28 }, + + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 15 }, + { "flags": 4, "matrix": [1, 1], "x": 11, "y": 15 }, + { "flags": 4, "matrix": [1, 2], "x": 26, "y": 15 }, + { "flags": 4, "matrix": [1, 3], "x": 41, "y": 15 }, + { "flags": 4, "matrix": [1, 4], "x": 56, "y": 15 }, + { "flags": 4, "matrix": [1, 5], "x": 72, "y": 15 }, + { "flags": 4, "matrix": [1, 6], "x": 87, "y": 15 }, + { "flags": 4, "matrix": [1, 7], "x": 102, "y": 15 }, + { "flags": 4, "matrix": [1, 8], "x": 117, "y": 15 }, + { "flags": 4, "matrix": [1, 9], "x": 133, "y": 15 }, + { "flags": 4, "matrix": [1, 10], "x": 148, "y": 15 }, + { "flags": 4, "matrix": [1, 11], "x": 163, "y": 15 }, + { "flags": 4, "matrix": [1, 12], "x": 178, "y": 15 }, + { "flags": 4, "matrix": [1, 13], "x": 201, "y": 15 }, + { "flags": 4, "matrix": [1, 14], "x": 224, "y": 15 }, + + { "flags": 4, "matrix": [0, 13], "x": 213, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x": 194, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x": 179, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 164, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 149, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 129, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 114, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 99, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 84, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 65, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 50, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 19, "y": 0 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 } ] }, "url": "www.i-chip.cn", @@ -162,88 +168,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1.25, "y": 0}, - {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.75, "y": 0}, - {"matrix": [0, 10], "x": 10.75, "y": 0}, - {"matrix": [0, 11], "x": 11.75, "y": 0}, - {"matrix": [0, 12], "x": 12.75, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.25}, - {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"matrix": [1, 7], "x": 7, "y": 1.25}, - {"matrix": [1, 8], "x": 8, "y": 1.25}, - {"matrix": [1, 9], "x": 9, "y": 1.25}, - {"matrix": [1, 10], "x": 10, "y": 1.25}, - {"matrix": [1, 11], "x": 11, "y": 1.25}, - {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, - {"matrix": [1, 14], "x": 15, "y": 1.25}, - {"matrix": [2, 0], "x": 0, "y": 2.25}, - {"matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [2, 14], "x": 15, "y": 2.25}, - {"matrix": [3, 0], "x": 0, "y": 3.25}, - {"matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, - {"matrix": [3, 14], "x": 15, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4.25}, - {"matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, - {"matrix": [4, 13], "x": 14, "y": 4.25}, - {"matrix": [4, 14], "x": 15, "y": 4.25}, - {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, - {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 12], "x": 13, "y": 5.25}, - {"matrix": [5, 13], "x": 14, "y": 5.25}, - {"matrix": [5, 14], "x": 15, "y": 5.25} + {"matrix":[0, 0],"x": 0,"y": 0}, + {"matrix":[0, 1],"x": 1.25,"y": 0}, + {"matrix":[0, 2],"x": 2.25, "y": 0}, + {"matrix":[0, 3],"x": 3.25, "y": 0}, + {"matrix":[0, 4],"x": 4.25, "y": 0}, + {"matrix":[0, 5],"x": 5.5, "y": 0}, + {"matrix":[0, 6],"x": 6.5, "y": 0}, + {"matrix":[0, 7],"x": 7.5, "y": 0}, + {"matrix":[0, 8],"x": 8.5, "y": 0}, + {"matrix":[0, 9],"x": 9.75, "y": 0}, + {"matrix":[0, 10],"x": 10.75, "y": 0}, + {"matrix":[0, 11],"x": 11.75, "y": 0}, + {"matrix":[0, 12],"x": 12.75, "y": 0}, + {"matrix":[0, 13],"x": 14, "y": 0}, + {"matrix":[0, 14],"x": 15, "y": 0}, + + {"matrix":[1, 0],"x": 0, "y": 1.25}, + {"matrix":[1, 1],"x": 1, "y": 1.25}, + {"matrix":[1, 2],"x": 2, "y": 1.25}, + {"matrix":[1, 3],"x": 3, "y": 1.25}, + {"matrix":[1, 4],"x": 4, "y": 1.25}, + {"matrix":[1, 5],"x": 5, "y": 1.25}, + {"matrix":[1, 6],"x": 6, "y": 1.25}, + {"matrix":[1, 7],"x": 7, "y": 1.25}, + {"matrix":[1, 8],"x": 8, "y": 1.25}, + {"matrix":[1, 9],"x": 9, "y": 1.25}, + {"matrix":[1, 10],"x": 10, "y": 1.25}, + {"matrix":[1, 11],"x": 11, "y": 1.25}, + {"matrix":[1, 12],"x": 12, "y": 1.25}, + {"matrix":[1, 13],"x": 13, "y": 1.25,"w":2}, + {"matrix":[1, 14],"x": 15, "y": 1.25}, + + {"matrix":[2, 0],"x": 0, "y": 2.25,"w":1.5}, + {"matrix":[2, 1],"x": 1.5, "y": 2.25}, + {"matrix":[2, 2],"x": 2.5, "y": 2.25}, + {"matrix":[2, 3],"x": 3.5, "y": 2.25}, + {"matrix":[2, 4],"x": 4.5, "y": 2.25}, + {"matrix":[2, 5],"x": 5.5, "y": 2.25}, + {"matrix":[2, 6],"x": 6.5, "y": 2.25}, + {"matrix":[2, 7],"x": 7.5, "y": 2.25}, + {"matrix":[2, 8],"x": 8.5, "y": 2.25}, + {"matrix":[2, 9],"x": 9.5, "y": 2.25}, + {"matrix":[2, 10],"x": 10.5, "y": 2.25}, + {"matrix":[2, 11],"x": 11.5, "y": 2.25}, + {"matrix":[2, 12],"x": 12.5, "y": 2.25}, + {"matrix":[2, 13],"x": 13.5, "y": 2.25,"w":1.5}, + {"matrix":[2, 14],"x": 15, "y": 2.25}, + + {"matrix":[3, 0],"x": 0, "y": 3.25,"w":1.75}, + {"matrix":[3, 1],"x": 1.75, "y": 3.25}, + {"matrix":[3, 2],"x": 2.75, "y": 3.25}, + {"matrix":[3, 3],"x": 3.75, "y": 3.25}, + {"matrix":[3, 4],"x": 4.75, "y": 3.25}, + {"matrix":[3, 5],"x": 5.75, "y": 3.25}, + {"matrix":[3, 6],"x": 6.75, "y": 3.25}, + {"matrix":[3, 7],"x": 7.75, "y": 3.25}, + {"matrix":[3, 8],"x": 8.75, "y": 3.25}, + {"matrix":[3, 9],"x": 9.75, "y": 3.25}, + {"matrix":[3, 10],"x": 10.75, "y": 3.25}, + {"matrix":[3, 11],"x": 11.75, "y": 3.25}, + {"matrix":[3, 13],"x": 12.75, "y": 3.25,"w":2.25}, + {"matrix":[3, 14],"x": 15, "y": 3.25}, + + {"matrix":[4, 0],"x": 0, "y": 4.25,"w":2.25}, + {"matrix":[4, 2],"x": 2.25, "y": 4.25}, + {"matrix":[4, 3],"x": 3.25, "y": 4.25}, + {"matrix":[4, 4],"x": 4.25, "y": 4.25}, + {"matrix":[4, 5],"x": 5.25, "y": 4.25}, + {"matrix":[4, 6],"x": 6.25, "y": 4.25}, + {"matrix":[4, 7],"x": 7.25, "y": 4.25}, + {"matrix":[4, 8],"x": 8.25, "y": 4.25}, + {"matrix":[4, 9],"x": 9.25, "y": 4.25}, + {"matrix":[4, 10],"x": 10.25, "y": 4.25}, + {"matrix":[4, 11],"x": 11.25, "y": 4.25}, + {"matrix":[4, 12],"x": 12.25, "y": 4.25,"w":1.75}, + {"matrix":[4, 13],"x": 14, "y": 4.25}, + {"matrix":[4, 14],"x": 15, "y": 4.25}, + + {"matrix":[5, 0],"x": 0, "y": 5.25,"w":1.25}, + {"matrix":[5, 1],"x": 1.25, "y": 5.25,"w":1.25}, + {"matrix":[5, 2],"x": 2.5, "y": 5.25,"w":1.25}, + {"matrix":[5, 5],"x": 3.75, "y": 5.25,"w":6.25}, + {"matrix":[5, 10],"x": 10, "y": 5.25,"w":1.25}, + {"matrix":[5, 11],"x": 11.25, "y": 5.25,"w":1.25}, + {"matrix":[5, 12],"x": 13, "y": 5.25}, + {"matrix":[5, 13],"x": 14, "y": 5.25}, + {"matrix":[5, 14],"x": 15, "y": 5.25} ] } } From fb0e1acb58994bf9c63915591ce1f0a56f212fcc Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 12 Jul 2024 16:24:33 +0800 Subject: [PATCH 53/58] update rgb effect --- keyboards/mmd/km75/keyboard.json | 37 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index 1a3befd885f..1d8ef659782 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -25,43 +25,44 @@ "processor": "STM32F103", "rgb_matrix": { "animations": { + "solid_color":true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, "band_pinwheel_sat": true, "band_pinwheel_val": true, - "band_sat": true, "band_spiral_sat": true, "band_spiral_val": true, - "band_val": true, - "breathing": true, "cycle_all": true, "cycle_left_right": true, + "cycle_up_down": true, "cycle_out_in": true, "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, "cycle_pinwheel": true, "cycle_spiral": true, - "cycle_up_down": true, - "digital_rain": true, "dual_beacon": true, - "gradient_left_right": true, - "gradient_up_down": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, "hue_breathing": true, "hue_pendulum": true, "hue_wave": true, - "multisplash": true, - "rainbow_beacon": true, - "rainbow_moving_chevron": true, - "rainbow_pinwheels": true, - "solid_multisplash": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, "solid_reactive_cross": true, "solid_reactive_multicross": true, - "solid_reactive_multinexus": true, - "solid_reactive_multiwide": true, "solid_reactive_nexus": true, - "solid_reactive_simple": true, - "solid_reactive_wide": true, - "solid_splash": true, + "solid_reactive_multinexus": true, "splash": true, - "typing_heatmap": true + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true }, "driver": "ws2812", "layout": [ From f3e7a3dc8c8a07536ea3f7b44898dbb15e9ad761 Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Fri, 12 Jul 2024 17:40:52 +0800 Subject: [PATCH 54/58] Update keyboards/mmd/km75/keyboard.json Co-authored-by: Joel Challis --- keyboards/mmd/km75/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mmd/km75/keyboard.json b/keyboards/mmd/km75/keyboard.json index 1d8ef659782..67404bf05cf 100644 --- a/keyboards/mmd/km75/keyboard.json +++ b/keyboards/mmd/km75/keyboard.json @@ -25,7 +25,6 @@ "processor": "STM32F103", "rgb_matrix": { "animations": { - "solid_color":true, "gradient_up_down": true, "gradient_left_right": true, "breathing": true, From baa16d82969aca89850bc56d546a311ff2300412 Mon Sep 17 00:00:00 2001 From: JackyJia73 <128167503+JackyJia73@users.noreply.github.com> Date: Tue, 16 Jul 2024 15:58:23 +0800 Subject: [PATCH 55/58] wireless code --- keyboards/mmd/common/smart_ble.c | 124 +++++++++++++++++++++++++++++++ keyboards/mmd/common/smart_ble.h | 32 ++++++++ 2 files changed, 156 insertions(+) create mode 100644 keyboards/mmd/common/smart_ble.c create mode 100644 keyboards/mmd/common/smart_ble.h diff --git a/keyboards/mmd/common/smart_ble.c b/keyboards/mmd/common/smart_ble.c new file mode 100644 index 00000000000..27946ca00f7 --- /dev/null +++ b/keyboards/mmd/common/smart_ble.c @@ -0,0 +1,124 @@ +// /* Copyright 2024 Jacky +// * +// * 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 "uart.h" +#include "ch.h" +#include "hal.h" +#include "host.h" +#include "host_driver.h" +#include "report.h" +#include "smart_ble.h" + +static uint8_t sc_ble_leds(void) { + return 0; // TODO: Get LED status BLE +} + +static void sc_ble_mouse(report_mouse_t *report) { + static uint8_t last_report[sizeof(report_mouse_t)]={0}; + + if (!has_mouse_report_changed((report_mouse_t *)last_report, report)) return; + memcpy(last_report,report,sizeof(report_mouse_t)); + uart_write(0x55); + uart_write(sizeof(report_mouse_t)); + uart_transmit(last_report,sizeof(report_mouse_t)); +} + + +static void sc_ble_extra(report_extra_t *report) { + uart_write(0x55); + uart_write(sizeof(report_extra_t)); + uart_transmit((uint8_t *)report,sizeof(report_extra_t)); +} + +static void sc_ble_keyboard(report_keyboard_t *report) { + uart_write(0x55); + uart_write(0x09); + uart_write(0x01); + uart_transmit((uint8_t *)report,KEYBOARD_REPORT_SIZE); +} + +static void sc_send_nkro(report_nkro_t *report) +{ + uart_write(0x55); + uart_write(0x12); + uart_transmit((uint8_t *)report,0x12); +} + +static host_driver_t *last_host_driver = NULL; +static host_driver_t sc_ble_driver = { + sc_ble_leds, sc_ble_keyboard,sc_send_nkro,sc_ble_mouse, sc_ble_extra +}; + + +void smart_ble_startup(void) { + if (host_get_driver() == &sc_ble_driver) { + return; + } + clear_keyboard(); + last_host_driver = host_get_driver(); + host_set_driver(&sc_ble_driver); +} + +void smart_ble_disconnect(void) { + if (host_get_driver() != &sc_ble_driver) { + return; + } + clear_keyboard(); + host_set_driver(last_host_driver); +} + + +void sc_ble_battary(uint8_t batt_level) { + uart_write(0x55); + uart_write(0x02); + uart_write(0x09); + uart_write(batt_level); +} + +void WIRELESS_START(uint32_t mode) +{ + uint8_t ble_command[24]; + smart_ble_startup(); + if(mode<1 || mode>4) + { + mode=1; + } + ble_command[0]=0x55; + ble_command[1]=20; + ble_command[2]=0; + ble_command[3]=mode; + strcpy((char * restrict)(ble_command+4),PRODUCT); + ble_command[strlen(PRODUCT)+4]='-'; + ble_command[strlen(PRODUCT)+5]='0' + mode; + ble_command[strlen(PRODUCT)+6]= 0; + uart_transmit(ble_command,sizeof(ble_command)); +} + +void WIRELESS_STOP(void) +{ + smart_ble_disconnect(); + uart_write(0x55); + uart_write(0x02); + uart_write(0x00); + uart_write(0x00); +} + + + + + + + diff --git a/keyboards/mmd/common/smart_ble.h b/keyboards/mmd/common/smart_ble.h new file mode 100644 index 00000000000..d5d16489d13 --- /dev/null +++ b/keyboards/mmd/common/smart_ble.h @@ -0,0 +1,32 @@ +// /* Copyright 2024 Jacky +// * +// * 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 "quantum.h" + +void sc_ble_battary(uint8_t batt_level); +void WIRELESS_START(uint32_t mode); +void WIRELESS_STOP(void); + + + + + + + + + + From 350f7ca28b1c9c09543f8dd405634429cbce298b Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Wed, 17 Jul 2024 18:13:44 +0800 Subject: [PATCH 56/58] Update readme.md Picture of MMD KM75 --- keyboards/mmd/km75/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mmd/km75/readme.md b/keyboards/mmd/km75/readme.md index 0a18acc5975..c567287ecaa 100644 --- a/keyboards/mmd/km75/readme.md +++ b/keyboards/mmd/km75/readme.md @@ -1,5 +1,5 @@ # MMD-KM75 - +![](https://raw.githubusercontent.com/JackyJia73/img/main/IMG_20240716_173524.jpg) * A customizable soldering 75% keyboard. From fa3d2624eb003760fb6d305d918775c22035cb4f Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:18:57 +0000 Subject: [PATCH 57/58] update readme.md --- keyboards/mmd/km75/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/mmd/km75/readme.md b/keyboards/mmd/km75/readme.md index c567287ecaa..1f0e138a71c 100644 --- a/keyboards/mmd/km75/readme.md +++ b/keyboards/mmd/km75/readme.md @@ -1,4 +1,5 @@ # MMD-KM75 + ![](https://raw.githubusercontent.com/JackyJia73/img/main/IMG_20240716_173524.jpg) * A customizable soldering 75% keyboard. From a108945225b26a59198cda1ed392a30f8e19bb0e Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:12:07 +0800 Subject: [PATCH 58/58] Delete keyboards/mmd/km75/keymaps/via directory --- keyboards/mmd/km75/keymaps/via/keymap.c | 38 ------------------------- keyboards/mmd/km75/keymaps/via/rules.mk | 2 -- 2 files changed, 40 deletions(-) delete mode 100644 keyboards/mmd/km75/keymaps/via/keymap.c delete mode 100644 keyboards/mmd/km75/keymaps/via/rules.mk diff --git a/keyboards/mmd/km75/keymaps/via/keymap.c b/keyboards/mmd/km75/keymaps/via/keymap.c deleted file mode 100644 index 985fb695673..00000000000 --- a/keyboards/mmd/km75/keymaps/via/keymap.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Jacky - * - * 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( - 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_DEL, _______, - 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT( - _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_MOD, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ) -}; - diff --git a/keyboards/mmd/km75/keymaps/via/rules.mk b/keyboards/mmd/km75/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc9..00000000000 --- a/keyboards/mmd/km75/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes