From 2670b84154777e3f5c5dcc753304ad89c5f53e2a Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Wed, 24 Jan 2024 16:00:20 +0800 Subject: [PATCH 01/20] add monsgeek/m7 keyboard! --- keyboards/monsgeek/m7/config.h | 23 ++ keyboards/monsgeek/m7/halconf.h | 11 + keyboards/monsgeek/m7/info.json | 233 ++++++++++++++++++ .../monsgeek/m7/keymaps/default/keymap.c | 44 ++++ keyboards/monsgeek/m7/keymaps/via/keymap.c | 107 ++++++++ keyboards/monsgeek/m7/keymaps/via/rules.mk | 1 + keyboards/monsgeek/m7/m7.c | 109 ++++++++ keyboards/monsgeek/m7/mcuconf.h | 12 + keyboards/monsgeek/m7/readme.md | 24 ++ keyboards/monsgeek/m7/rules.mk | 1 + 10 files changed, 565 insertions(+) create mode 100644 keyboards/monsgeek/m7/config.h create mode 100644 keyboards/monsgeek/m7/halconf.h create mode 100644 keyboards/monsgeek/m7/info.json create mode 100644 keyboards/monsgeek/m7/keymaps/default/keymap.c create mode 100644 keyboards/monsgeek/m7/keymaps/via/keymap.c create mode 100644 keyboards/monsgeek/m7/keymaps/via/rules.mk create mode 100644 keyboards/monsgeek/m7/m7.c create mode 100644 keyboards/monsgeek/m7/mcuconf.h create mode 100644 keyboards/monsgeek/m7/readme.md create mode 100644 keyboards/monsgeek/m7/rules.mk diff --git a/keyboards/monsgeek/m7/config.h b/keyboards/monsgeek/m7/config.h new file mode 100644 index 000000000000..394ec3f58354 --- /dev/null +++ b/keyboards/monsgeek/m7/config.h @@ -0,0 +1,23 @@ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* I2C Config for LED Driver */ +#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND +#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO +#define I2C1_CLOCK_SPEED 400000 +#define I2C1_OPMODE OPMODE_I2C + +/* SPI Config for spi flash*/ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 + +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 diff --git a/keyboards/monsgeek/m7/halconf.h b/keyboards/monsgeek/m7/halconf.h new file mode 100644 index 000000000000..93ff3a7af86b --- /dev/null +++ b/keyboards/monsgeek/m7/halconf.h @@ -0,0 +1,11 @@ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/monsgeek/m7/info.json b/keyboards/monsgeek/m7/info.json new file mode 100644 index 000000000000..3a260e546b16 --- /dev/null +++ b/keyboards/monsgeek/m7/info.json @@ -0,0 +1,233 @@ +{ + "manufacturer": "MonsGeek", + "keyboard_name": "m7", + "maintainer": "jonylee@hfd", + "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "backing_size": 8192, + "driver": "spi_flash" + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "rows": ["C6", "C7", "C8", "C9", "A8"] + }, + "processor": "WB32FQ95", + "rgb_matrix": { + "animations": { + "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, + "dual_beacon": true, + "multisplash": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "raindrops": true, + "solid_color": true, + "solid_reactive": true, + "solid_reactive_simple": true, + "typing_heatmap": true + }, + "driver": "snled27351", + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, + { "flags": 4, "matrix": [0, 1], "x": 13, "y": 0}, + { "flags": 4, "matrix": [0, 2], "x": 27, "y": 0}, + { "flags": 4, "matrix": [0, 3], "x": 41, "y": 0}, + { "flags": 4, "matrix": [0, 4], "x": 55, "y": 0}, + { "flags": 4, "matrix": [0, 5], "x": 68, "y": 0}, + { "flags": 4, "matrix": [0, 6], "x": 82, "y": 0}, + { "flags": 4, "matrix": [0, 7], "x": 96, "y": 0}, + { "flags": 4, "matrix": [0, 8], "x":110, "y": 0}, + { "flags": 4, "matrix": [0, 9], "x":124, "y": 0}, + { "flags": 4, "matrix": [0, 10], "x":137, "y": 0}, + { "flags": 4, "matrix": [0, 11], "x":151, "y": 0}, + { "flags": 4, "matrix": [0, 12], "x":165, "y": 0}, + { "flags": 4, "matrix": [0, 13], "x":179, "y": 0}, + { "flags": 4, "matrix": [0, 14], "x":210, "y": 0}, + { "flags": 4, "matrix": [0, 15], "x":224, "y": 0}, + + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16}, + { "flags": 4, "matrix": [1, 1], "x": 20, "y": 16}, + { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16}, + { "flags": 4, "matrix": [1, 3], "x": 48, "y": 16}, + { "flags": 4, "matrix": [1, 4], "x": 62, "y": 16}, + { "flags": 4, "matrix": [1, 5], "x": 75, "y": 16}, + { "flags": 4, "matrix": [1, 6], "x": 89, "y": 16}, + { "flags": 4, "matrix": [1, 7], "x":103, "y": 16}, + { "flags": 4, "matrix": [1, 8], "x":117, "y": 16}, + { "flags": 4, "matrix": [1, 9], "x":130, "y": 16}, + { "flags": 4, "matrix": [1, 10], "x":144, "y": 16}, + { "flags": 4, "matrix": [1, 11], "x":158, "y": 16}, + { "flags": 4, "matrix": [1, 12], "x":172, "y": 16}, + { "flags": 4, "matrix": [1, 13], "x":186, "y": 16}, + { "flags": 4, "matrix": [1, 14], "x":210, "y": 16}, + { "flags": 4, "matrix": [1, 15], "x":224, "y": 16}, + + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32}, + { "flags": 4, "matrix": [2, 1], "x": 24, "y": 32}, + { "flags": 4, "matrix": [2, 2], "x": 38, "y": 32}, + { "flags": 4, "matrix": [2, 3], "x": 51, "y": 32}, + { "flags": 4, "matrix": [2, 4], "x": 65, "y": 32}, + { "flags": 4, "matrix": [2, 5], "x": 79, "y": 32}, + { "flags": 4, "matrix": [2, 6], "x": 93, "y": 32}, + { "flags": 4, "matrix": [2, 7], "x":106, "y": 32}, + { "flags": 4, "matrix": [2, 8], "x":120, "y": 32}, + { "flags": 4, "matrix": [2, 9], "x":134, "y": 32}, + { "flags": 4, "matrix": [2, 10], "x":148, "y": 32}, + { "flags": 4, "matrix": [2, 11], "x":161, "y": 32}, + { "flags": 4, "matrix": [2, 13], "x":175, "y": 32}, + + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48}, + { "flags": 4, "matrix": [3, 1], "x": 31, "y": 48}, + { "flags": 4, "matrix": [3, 2], "x": 44, "y": 48}, + { "flags": 4, "matrix": [3, 3], "x": 58, "y": 48}, + { "flags": 4, "matrix": [3, 4], "x": 72, "y": 48}, + { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48}, + { "flags": 4, "matrix": [3, 6], "x":100, "y": 48}, + { "flags": 4, "matrix": [3, 7], "x":113, "y": 48}, + { "flags": 4, "matrix": [3, 8], "x":127, "y": 48}, + { "flags": 4, "matrix": [3, 9], "x":141, "y": 48}, + { "flags": 4, "matrix": [3, 10], "x":155, "y": 48}, + { "flags": 4, "matrix": [3, 13], "x":168, "y": 48}, + { "flags": 4, "matrix": [3, 14], "x":210, "y": 48}, + + { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64}, + { "flags": 4, "matrix": [4, 1], "x": 17, "y": 64}, + { "flags": 4, "matrix": [4, 2], "x": 34, "y": 64}, + { "flags": 4, "matrix": [4, 5], "x": 93, "y": 64}, + { "flags": 4, "matrix": [4, 9], "x":137, "y": 64}, + { "flags": 4, "matrix": [4, 10], "x":155, "y": 64}, + { "flags": 4, "matrix": [4, 11], "x":172, "y": 64}, + { "flags": 4, "matrix": [4, 13], "x":196, "y": 64}, + { "flags": 4, "matrix": [4, 14], "x":210, "y": 64}, + { "flags": 4, "matrix": [4, 15], "x":224, "y": 64}, + + { "flags": 2, "x": 0, "y": 0}, + { "flags": 2, "x": 0, "y": 6}, + { "flags": 2, "x": 0, "y":14}, + { "flags": 2, "x": 0, "y":21}, + { "flags": 2, "x": 0, "y":28}, + { "flags": 2, "x": 0, "y":35}, + { "flags": 2, "x": 0, "y":42}, + { "flags": 2, "x": 0, "y":49}, + { "flags": 2, "x": 0, "y":56}, + { "flags": 2, "x": 0, "y":64}, + + { "flags": 2, "x":224, "y": 0}, + { "flags": 2, "x":224, "y": 6}, + { "flags": 2, "x":224, "y":14}, + { "flags": 2, "x":224, "y":21}, + { "flags": 2, "x":224, "y":28}, + { "flags": 2, "x":224, "y":35}, + { "flags": 2, "x":224, "y":42}, + { "flags": 2, "x":224, "y":49}, + { "flags": 2, "x":224, "y":56}, + { "flags": 2, "x":224, "y":64} + ], + "max_brightness": 160 + }, + "url": "", + "usb": { + "device_version": "1.0.1", + "force_nkro": true, + "pid": "0x001E", + "suspend_wakeup_delay": 1000, + "vid": "0x0021" + }, + "layouts": { + "LAYOUT_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "Bksp","matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + { "label": "Ins", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "PgUp","matrix": [0, 15], "x": 16.25, "y": 0 }, + + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Del", "matrix": [1, 14], "x": 15.25, "y": 1 }, + { "label": "PgDn","matrix": [1, 15], "x": 16.25, "y": 1 }, + + { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "label": "Enter","matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + + { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 10], "x":11.25, "y": 3 }, + { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "label": "Up", "matrix": [3, 14], "x": 15.25, "y": 3 }, + + { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "Alt", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "Win", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space","matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "Alt", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 }, + { "label": "Fn", "matrix": [4, 10], "w":1.25, "x": 11.25, "y": 4 }, + { "label": "Ctrl", "matrix": [4, 11], "w":1.25,"x": 12.5, "y": 4 }, + { "label": "Left", "matrix": [4, 13], "x": 14.25, "y": 4 }, + { "label": "Down", "matrix": [4, 14], "x": 15.25, "y": 4 }, + { "label": "Right","matrix": [4, 15], "x": 16.25, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/monsgeek/m7/keymaps/default/keymap.c b/keyboards/monsgeek/m7/keymaps/default/keymap.c new file mode 100644 index 000000000000..f25b2933bff1 --- /dev/null +++ b/keyboards/monsgeek/m7/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +// clang-format off +enum __layers { + WIN_B, + WIN_FN, + MAC_B, + MAC_FN +}; +#define KC_SIRI LGUI(KC_SPC) +#define KC_TASK LGUI(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_FN] = LAYOUT_ansi( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + + [MAC_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_FN] = LAYOUT_ansi( /* FN */ + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), +}; diff --git a/keyboards/monsgeek/m7/keymaps/via/keymap.c b/keyboards/monsgeek/m7/keymaps/via/keymap.c new file mode 100644 index 000000000000..eb2e614f12bc --- /dev/null +++ b/keyboards/monsgeek/m7/keymaps/via/keymap.c @@ -0,0 +1,107 @@ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +// clang-format off +enum __layers { + WIN_B, + WIN_FN, + MAC_B, + MAC_FN +}; +#define KC_SIRI LGUI(KC_SPC) +#define KC_TASK LGUI(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_FN] = LAYOUT_ansi( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + + [MAC_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_FN] = LAYOUT_ansi( /* FN */ + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), +}; +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) +{ + switch (keycode) + { + case RGB_TOG: + if (record->event.pressed) + { + switch (rgb_matrix_get_flags()) + { + case LED_FLAG_ALL: + { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + default: + { + rgb_matrix_set_flags(LED_FLAG_ALL); + } + break; + } + } + if (!rgb_matrix_is_enabled()) + { + rgb_matrix_set_flags(LED_FLAG_ALL); + rgb_matrix_enable(); + } + return false; + default: + return true; + } +} +#ifdef RGB_MATRIX_ENABLE +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) +{ + + if (host_keyboard_led_state().caps_lock) + { + RGB_MATRIX_INDICATOR_SET_COLOR(32, 125, 125, 125); + } + else + { + if (!rgb_matrix_get_flags()) + { + RGB_MATRIX_INDICATOR_SET_COLOR(32, 0, 0, 0); + } + } + if (keymap_config.no_gui) + { + RGB_MATRIX_INDICATOR_SET_COLOR(59, 125, 125, 125); + } + else + { + if (!rgb_matrix_get_flags()) + { + RGB_MATRIX_INDICATOR_SET_COLOR(59, 0, 0, 0); + } + } + + return true; +} +#endif diff --git a/keyboards/monsgeek/m7/keymaps/via/rules.mk b/keyboards/monsgeek/m7/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/monsgeek/m7/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/monsgeek/m7/m7.c b/keyboards/monsgeek/m7/m7.c new file mode 100644 index 000000000000..e270de02d10b --- /dev/null +++ b/keyboards/monsgeek/m7/m7.c @@ -0,0 +1,109 @@ +// Copyright 2023 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H +// clang-format off + +#ifdef RGB_MATRIX_ENABLE +const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { +/* Refer to snled27351 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, A_1, B_1, C_1}, + {0, A_2, B_2, C_2}, + {0, A_3, B_3, C_3}, + {0, A_4, B_4, C_4}, + {0, A_5, B_5, C_5}, + {0, A_6, B_6, C_6}, + {0, A_7, B_7, C_7}, + {0, A_8, B_8, C_8}, + {0, A_9, B_9, C_9}, + {0, A_10, B_10, C_10}, + {0, A_11, B_11, C_11}, + {0, A_12, B_12, C_12}, + {0, A_13, B_13, C_13}, + {0, A_14, B_14, C_14}, + {1, D_3, E_3, F_3}, + {1, D_1, E_1, F_1}, + + {0, D_1, E_1, F_1}, + {0, D_2, E_2, F_2}, + {0, D_3, E_3, F_3}, + {0, D_4, E_4, F_4}, + {0, D_5, E_5, F_5}, + {0, D_6, E_6, F_6}, + {0, D_7, E_7, F_7}, + {0, D_8, E_8, F_8}, + {0, D_9, E_9, F_9}, + {0, D_10, E_10, F_10}, + {0, D_11, E_11, F_11}, + {0, D_12, E_12, F_12}, + {0, D_13, E_13, F_13}, + {0, D_14, E_14, F_14}, + {1, D_4, E_4, F_4}, + {1, D_2, E_2, F_2}, + + {0, G_1, H_1, I_1}, + {0, G_2, H_2, I_2}, + {0, G_3, H_3, I_3}, + {0, G_4, H_4, I_4}, + {0, G_5, H_5, I_5}, + {0, G_6, H_6, I_6}, + {0, G_7, H_7, I_7}, + {0, G_8, H_8, I_8}, + {0, G_9, H_9, I_9}, + {0, G_10, H_10, I_10}, + {0, G_11, H_11, I_11}, + {0, G_12, H_12, I_12}, + {0, G_13, H_13, I_13}, + + {0, J_1, K_1, L_1}, + {0, J_2, K_2, L_2}, + {0, J_3, K_3, L_3}, + {0, J_4, K_4, L_4}, + {0, J_5, K_5, L_5}, + {0, J_6, K_6, L_6}, + {0, J_7, K_7, L_7}, + {0, J_8, K_8, L_8}, + {0, J_9, K_9, L_9}, + {0, J_10, K_10, L_10}, + {0, J_11, K_11, L_11}, + {0, J_12, K_12, L_12}, + {1, D_7, E_7, F_7}, + + {0, J_13, K_13, L_13}, + {0, J_14, K_14, L_14}, + {0, J_15, K_15, L_15}, + {0, J_16, K_16, L_16}, + {0, G_14, H_14, I_14}, + {0, G_15, H_15, I_15}, + {0, G_16, H_16, I_16}, + {0, D_15, E_15, F_15}, + {1, D_6, E_6, F_6}, + {1, D_5, E_5, F_5}, + + {1, G_1, H_1, I_1}, + {1, G_2, H_2, I_2}, + {1, G_3, H_3, I_3}, + {1, G_4, H_4, I_4}, + {1, G_5, H_5, I_5}, + {1, G_6, H_6, I_6}, + {1, G_7, H_7, I_7}, + {1, G_8, H_8, I_8}, + {1, G_9, H_9, I_9}, + {1, G_10, H_10, I_10}, + + {1, J_1, K_1, L_1}, + {1, J_2, K_2, L_2}, + {1, J_3, K_3, L_3}, + {1, J_4, K_4, L_4}, + {1, J_5, K_5, L_5}, + {1, J_6, K_6, L_6}, + {1, J_7, K_7, L_7}, + {1, J_8, K_8, L_8}, + {1, J_9, K_9, L_9}, + {1, J_10, K_10, L_10}, +}; +#endif diff --git a/keyboards/monsgeek/m7/mcuconf.h b/keyboards/monsgeek/m7/mcuconf.h new file mode 100644 index 000000000000..89f5b19d089a --- /dev/null +++ b/keyboards/monsgeek/m7/mcuconf.h @@ -0,0 +1,12 @@ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE + +#undef WB32_I2C_USE_I2C1 +#define WB32_I2C_USE_I2C1 TRUE diff --git a/keyboards/monsgeek/m7/readme.md b/keyboards/monsgeek/m7/readme.md new file mode 100644 index 000000000000..b0e23dd9eadc --- /dev/null +++ b/keyboards/monsgeek/m7/readme.md @@ -0,0 +1,24 @@ +# M7 +![M7](image-1.png) +A customizable 65% keyboard. + +* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) +* Hardware Supported: MonsGeek M7 +* Hardware Availability: [STEED](https://steed.sg/products/smk82) + +Make example for this keyboard (after setting up your build environment): + + make monsgeek/m7:default + +Flashing example for this keyboard: + + make monsgeek/m7:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Bootmagic reset**: Hold down the Hold down the top left key (commonly programmed as *Esc*) and plug in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/monsgeek/m7/rules.mk b/keyboards/monsgeek/m7/rules.mk new file mode 100644 index 000000000000..7ff128fa692e --- /dev/null +++ b/keyboards/monsgeek/m7/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From edd9a3649052c00cefdeecdcc38e06c2db4c3862 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Wed, 24 Jan 2024 16:03:33 +0800 Subject: [PATCH 02/20] format-json --- keyboards/monsgeek/m7/info.json | 326 ++++++++++++++++---------------- 1 file changed, 158 insertions(+), 168 deletions(-) diff --git a/keyboards/monsgeek/m7/info.json b/keyboards/monsgeek/m7/info.json index 3a260e546b16..9622d00c8042 100644 --- a/keyboards/monsgeek/m7/info.json +++ b/keyboards/monsgeek/m7/info.json @@ -21,7 +21,7 @@ "rgb_matrix": true }, "matrix_pins": { - "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["C6", "C7", "C8", "C9", "A8"] }, "processor": "WB32FQ95", @@ -40,107 +40,101 @@ "rainbow_beacon": true, "rainbow_moving_chevron": true, "raindrops": true, - "solid_color": true, "solid_reactive": true, + "solid_reactive_cross": true, "solid_reactive_simple": true, "typing_heatmap": true }, "driver": "snled27351", "layout": [ - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, - { "flags": 4, "matrix": [0, 1], "x": 13, "y": 0}, - { "flags": 4, "matrix": [0, 2], "x": 27, "y": 0}, - { "flags": 4, "matrix": [0, 3], "x": 41, "y": 0}, - { "flags": 4, "matrix": [0, 4], "x": 55, "y": 0}, - { "flags": 4, "matrix": [0, 5], "x": 68, "y": 0}, - { "flags": 4, "matrix": [0, 6], "x": 82, "y": 0}, - { "flags": 4, "matrix": [0, 7], "x": 96, "y": 0}, - { "flags": 4, "matrix": [0, 8], "x":110, "y": 0}, - { "flags": 4, "matrix": [0, 9], "x":124, "y": 0}, - { "flags": 4, "matrix": [0, 10], "x":137, "y": 0}, - { "flags": 4, "matrix": [0, 11], "x":151, "y": 0}, - { "flags": 4, "matrix": [0, 12], "x":165, "y": 0}, - { "flags": 4, "matrix": [0, 13], "x":179, "y": 0}, - { "flags": 4, "matrix": [0, 14], "x":210, "y": 0}, - { "flags": 4, "matrix": [0, 15], "x":224, "y": 0}, - - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16}, - { "flags": 4, "matrix": [1, 1], "x": 20, "y": 16}, - { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16}, - { "flags": 4, "matrix": [1, 3], "x": 48, "y": 16}, - { "flags": 4, "matrix": [1, 4], "x": 62, "y": 16}, - { "flags": 4, "matrix": [1, 5], "x": 75, "y": 16}, - { "flags": 4, "matrix": [1, 6], "x": 89, "y": 16}, - { "flags": 4, "matrix": [1, 7], "x":103, "y": 16}, - { "flags": 4, "matrix": [1, 8], "x":117, "y": 16}, - { "flags": 4, "matrix": [1, 9], "x":130, "y": 16}, - { "flags": 4, "matrix": [1, 10], "x":144, "y": 16}, - { "flags": 4, "matrix": [1, 11], "x":158, "y": 16}, - { "flags": 4, "matrix": [1, 12], "x":172, "y": 16}, - { "flags": 4, "matrix": [1, 13], "x":186, "y": 16}, - { "flags": 4, "matrix": [1, 14], "x":210, "y": 16}, - { "flags": 4, "matrix": [1, 15], "x":224, "y": 16}, - - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32}, - { "flags": 4, "matrix": [2, 1], "x": 24, "y": 32}, - { "flags": 4, "matrix": [2, 2], "x": 38, "y": 32}, - { "flags": 4, "matrix": [2, 3], "x": 51, "y": 32}, - { "flags": 4, "matrix": [2, 4], "x": 65, "y": 32}, - { "flags": 4, "matrix": [2, 5], "x": 79, "y": 32}, - { "flags": 4, "matrix": [2, 6], "x": 93, "y": 32}, - { "flags": 4, "matrix": [2, 7], "x":106, "y": 32}, - { "flags": 4, "matrix": [2, 8], "x":120, "y": 32}, - { "flags": 4, "matrix": [2, 9], "x":134, "y": 32}, - { "flags": 4, "matrix": [2, 10], "x":148, "y": 32}, - { "flags": 4, "matrix": [2, 11], "x":161, "y": 32}, - { "flags": 4, "matrix": [2, 13], "x":175, "y": 32}, - - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48}, - { "flags": 4, "matrix": [3, 1], "x": 31, "y": 48}, - { "flags": 4, "matrix": [3, 2], "x": 44, "y": 48}, - { "flags": 4, "matrix": [3, 3], "x": 58, "y": 48}, - { "flags": 4, "matrix": [3, 4], "x": 72, "y": 48}, - { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48}, - { "flags": 4, "matrix": [3, 6], "x":100, "y": 48}, - { "flags": 4, "matrix": [3, 7], "x":113, "y": 48}, - { "flags": 4, "matrix": [3, 8], "x":127, "y": 48}, - { "flags": 4, "matrix": [3, 9], "x":141, "y": 48}, - { "flags": 4, "matrix": [3, 10], "x":155, "y": 48}, - { "flags": 4, "matrix": [3, 13], "x":168, "y": 48}, - { "flags": 4, "matrix": [3, 14], "x":210, "y": 48}, - - { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64}, - { "flags": 4, "matrix": [4, 1], "x": 17, "y": 64}, - { "flags": 4, "matrix": [4, 2], "x": 34, "y": 64}, - { "flags": 4, "matrix": [4, 5], "x": 93, "y": 64}, - { "flags": 4, "matrix": [4, 9], "x":137, "y": 64}, - { "flags": 4, "matrix": [4, 10], "x":155, "y": 64}, - { "flags": 4, "matrix": [4, 11], "x":172, "y": 64}, - { "flags": 4, "matrix": [4, 13], "x":196, "y": 64}, - { "flags": 4, "matrix": [4, 14], "x":210, "y": 64}, - { "flags": 4, "matrix": [4, 15], "x":224, "y": 64}, - - { "flags": 2, "x": 0, "y": 0}, - { "flags": 2, "x": 0, "y": 6}, - { "flags": 2, "x": 0, "y":14}, - { "flags": 2, "x": 0, "y":21}, - { "flags": 2, "x": 0, "y":28}, - { "flags": 2, "x": 0, "y":35}, - { "flags": 2, "x": 0, "y":42}, - { "flags": 2, "x": 0, "y":49}, - { "flags": 2, "x": 0, "y":56}, - { "flags": 2, "x": 0, "y":64}, - - { "flags": 2, "x":224, "y": 0}, - { "flags": 2, "x":224, "y": 6}, - { "flags": 2, "x":224, "y":14}, - { "flags": 2, "x":224, "y":21}, - { "flags": 2, "x":224, "y":28}, - { "flags": 2, "x":224, "y":35}, - { "flags": 2, "x":224, "y":42}, - { "flags": 2, "x":224, "y":49}, - { "flags": 2, "x":224, "y":56}, - { "flags": 2, "x":224, "y":64} + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 13, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 27, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 41, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 55, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 68, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 82, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 124, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 137, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 151, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 165, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 179, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 210, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 20, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 62, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 75, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 89, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 103, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 117, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 130, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 144, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 158, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 172, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 186, "y": 16, "flags": 4}, + {"matrix": [1, 14], "x": 210, "y": 16, "flags": 4}, + {"matrix": [1, 15], "x": 224, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 24, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 38, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 51, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 65, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 79, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 93, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 106, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 120, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 134, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 148, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 161, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 175, "y": 32, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 31, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 44, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 58, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 72, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 86, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 100, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 113, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 127, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 141, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 155, "y": 48, "flags": 4}, + {"matrix": [3, 13], "x": 168, "y": 48, "flags": 4}, + {"matrix": [3, 14], "x": 210, "y": 48, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 17, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 34, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 93, "y": 64, "flags": 4}, + {"matrix": [4, 9], "x": 137, "y": 64, "flags": 4}, + {"matrix": [4, 10], "x": 155, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 172, "y": 64, "flags": 4}, + {"matrix": [4, 13], "x": 196, "y": 64, "flags": 4}, + {"matrix": [4, 14], "x": 210, "y": 64, "flags": 4}, + {"matrix": [4, 15], "x": 224, "y": 64, "flags": 4}, + {"x": 0, "y": 0, "flags": 2}, + {"x": 0, "y": 6, "flags": 2}, + {"x": 0, "y": 14, "flags": 2}, + {"x": 0, "y": 21, "flags": 2}, + {"x": 0, "y": 28, "flags": 2}, + {"x": 0, "y": 35, "flags": 2}, + {"x": 0, "y": 42, "flags": 2}, + {"x": 0, "y": 49, "flags": 2}, + {"x": 0, "y": 56, "flags": 2}, + {"x": 0, "y": 64, "flags": 2}, + {"x": 224, "y": 0, "flags": 2}, + {"x": 224, "y": 6, "flags": 2}, + {"x": 224, "y": 14, "flags": 2}, + {"x": 224, "y": 21, "flags": 2}, + {"x": 224, "y": 28, "flags": 2}, + {"x": 224, "y": 35, "flags": 2}, + {"x": 224, "y": 42, "flags": 2}, + {"x": 224, "y": 49, "flags": 2}, + {"x": 224, "y": 56, "flags": 2}, + {"x": 224, "y": 64, "flags": 2} ], "max_brightness": 160 }, @@ -155,78 +149,74 @@ "layouts": { "LAYOUT_ansi": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Bksp","matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "label": "Ins", "matrix": [0, 14], "x": 15.25, "y": 0 }, - { "label": "PgUp","matrix": [0, 15], "x": 16.25, "y": 0 }, - - { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Del", "matrix": [1, 14], "x": 15.25, "y": 1 }, - { "label": "PgDn","matrix": [1, 15], "x": 16.25, "y": 1 }, - - { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter","matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, - - { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 10], "x":11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, - { "label": "Up", "matrix": [3, 14], "x": 15.25, "y": 3 }, - - { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "Alt", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "Win", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "Space","matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, - { "label": "Alt", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 }, - { "label": "Fn", "matrix": [4, 10], "w":1.25, "x": 11.25, "y": 4 }, - { "label": "Ctrl", "matrix": [4, 11], "w":1.25,"x": 12.5, "y": 4 }, - { "label": "Left", "matrix": [4, 13], "x": 14.25, "y": 4 }, - { "label": "Down", "matrix": [4, 14], "x": 15.25, "y": 4 }, - { "label": "Right","matrix": [4, 15], "x": 16.25, "y": 4 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Ins", "matrix": [0, 14], "x": 15.25, "y": 0}, + {"label": "PgUp", "matrix": [0, 15], "x": 16.25, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Del", "matrix": [1, 14], "x": 15.25, "y": 1}, + {"label": "PgDn", "matrix": [1, 15], "x": 16.25, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"label": "Up", "matrix": [3, 14], "x": 15.25, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 13], "x": 14.25, "y": 4}, + {"label": "Down", "matrix": [4, 14], "x": 15.25, "y": 4}, + {"label": "Right", "matrix": [4, 15], "x": 16.25, "y": 4} ] } } From 65c587e8ad5ddd22ee1333559cfddf09fbd3c430 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:13:54 +0800 Subject: [PATCH 03/20] Update readme.md --- keyboards/monsgeek/m7/readme.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/monsgeek/m7/readme.md b/keyboards/monsgeek/m7/readme.md index b0e23dd9eadc..1f6fb72388e1 100644 --- a/keyboards/monsgeek/m7/readme.md +++ b/keyboards/monsgeek/m7/readme.md @@ -1,10 +1,11 @@ # M7 -![M7](image-1.png) +![M7](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/b9d54e20-7691-489b-903b-c3e40744e583) + A customizable 65% keyboard. * Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) -* Hardware Supported: MonsGeek M7 -* Hardware Availability: [STEED](https://steed.sg/products/smk82) +* Hardware Supported: monsgeek M7 +* Hardware Availability: [monsgeek](https://www.monsgeek.com) Make example for this keyboard (after setting up your build environment): From 1771bf7608fd0f1c6b1e1dd2ee0bfbc0e38be614 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:46:12 +0800 Subject: [PATCH 04/20] Update keyboards/monsgeek/m7/info.json Co-authored-by: Duncan Sutherland --- keyboards/monsgeek/m7/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/info.json b/keyboards/monsgeek/m7/info.json index 9622d00c8042..77ff2da5382d 100644 --- a/keyboards/monsgeek/m7/info.json +++ b/keyboards/monsgeek/m7/info.json @@ -146,8 +146,9 @@ "suspend_wakeup_delay": 1000, "vid": "0x0021" }, + "community_layouts": ["68_ansi"], "layouts": { - "LAYOUT_ansi": { + "LAYOUT_68_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, From 48c652a70cfa11b56348719dd8026d4348658078 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:46:18 +0800 Subject: [PATCH 05/20] Update keyboards/monsgeek/m7/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/monsgeek/m7/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/monsgeek/m7/keymaps/default/keymap.c b/keyboards/monsgeek/m7/keymaps/default/keymap.c index f25b2933bff1..fb2445b20e2e 100644 --- a/keyboards/monsgeek/m7/keymaps/default/keymap.c +++ b/keyboards/monsgeek/m7/keymaps/default/keymap.c @@ -14,28 +14,28 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [WIN_B] = LAYOUT_ansi( /* Base */ + [WIN_B] = LAYOUT_68_ansi( /* Base */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [WIN_FN] = LAYOUT_ansi( /* FN */ + [WIN_FN] = LAYOUT_68_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), - [MAC_B] = LAYOUT_ansi( /* Base */ + [MAC_B] = LAYOUT_68_ansi( /* Base */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [MAC_FN] = LAYOUT_ansi( /* FN */ + [MAC_FN] = LAYOUT_68_ansi( /* FN */ KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, From 4dc3a0513c4c9debd2fa8d0a5f231b2d47153cd2 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:46:28 +0800 Subject: [PATCH 06/20] Update keyboards/monsgeek/m7/readme.md Co-authored-by: Duncan Sutherland --- keyboards/monsgeek/m7/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/readme.md b/keyboards/monsgeek/m7/readme.md index 1f6fb72388e1..f28830158e7a 100644 --- a/keyboards/monsgeek/m7/readme.md +++ b/keyboards/monsgeek/m7/readme.md @@ -1,7 +1,7 @@ # M7 ![M7](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/b9d54e20-7691-489b-903b-c3e40744e583) -A customizable 65% keyboard. +A customizable 65% (68 key) keyboard. * Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) * Hardware Supported: monsgeek M7 From 374732c8788bc29b61bc7e663a3ce4becbce6936 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:46:33 +0800 Subject: [PATCH 07/20] Update keyboards/monsgeek/m7/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/monsgeek/m7/keymaps/via/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/monsgeek/m7/keymaps/via/keymap.c b/keyboards/monsgeek/m7/keymaps/via/keymap.c index eb2e614f12bc..defb216b3d4e 100644 --- a/keyboards/monsgeek/m7/keymaps/via/keymap.c +++ b/keyboards/monsgeek/m7/keymaps/via/keymap.c @@ -14,28 +14,28 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [WIN_B] = LAYOUT_ansi( /* Base */ + [WIN_B] = LAYOUT_68_ansi( /* Base */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [WIN_FN] = LAYOUT_ansi( /* FN */ + [WIN_FN] = LAYOUT_68_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), - [MAC_B] = LAYOUT_ansi( /* Base */ + [MAC_B] = LAYOUT_68_ansi( /* Base */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [MAC_FN] = LAYOUT_ansi( /* FN */ + [MAC_FN] = LAYOUT_68_ansi( /* FN */ KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, From b551c8b2d57f080746d8af701cdcf9c50b24b27a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:46:39 +0800 Subject: [PATCH 08/20] Update keyboards/monsgeek/m7/info.json Co-authored-by: Duncan Sutherland --- keyboards/monsgeek/m7/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/info.json b/keyboards/monsgeek/m7/info.json index 77ff2da5382d..92bb70d84c7d 100644 --- a/keyboards/monsgeek/m7/info.json +++ b/keyboards/monsgeek/m7/info.json @@ -221,4 +221,4 @@ ] } } -} \ No newline at end of file +} From f87d10a6a96bb8fd9a551579d6131ef9983cd7a8 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:46:55 +0800 Subject: [PATCH 09/20] Update keyboards/monsgeek/m7/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/monsgeek/m7/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/rules.mk b/keyboards/monsgeek/m7/rules.mk index 7ff128fa692e..6e7633bfe015 100644 --- a/keyboards/monsgeek/m7/rules.mk +++ b/keyboards/monsgeek/m7/rules.mk @@ -1 +1 @@ -# This file intentionally left blank \ No newline at end of file +# This file intentionally left blank From 3a76466ba4d35833b5230936ca1a2f3523d3b132 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:03:30 +0800 Subject: [PATCH 10/20] Update readme.md --- keyboards/monsgeek/m7/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/readme.md b/keyboards/monsgeek/m7/readme.md index f28830158e7a..e07bd9185e33 100644 --- a/keyboards/monsgeek/m7/readme.md +++ b/keyboards/monsgeek/m7/readme.md @@ -1,5 +1,5 @@ # M7 -![M7](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/b9d54e20-7691-489b-903b-c3e40744e583) +![M7](https://www.monsgeek.com/wp-content/uploads/2023/12/M7-VIA-Main-1.png) A customizable 65% (68 key) keyboard. From 21decafb68b89e97e2753b03456a4433aeab24fd Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:55:01 +0800 Subject: [PATCH 11/20] Update keymap.c --- keyboards/monsgeek/m7/keymaps/via/keymap.c | 32 ---------------------- 1 file changed, 32 deletions(-) diff --git a/keyboards/monsgeek/m7/keymaps/via/keymap.c b/keyboards/monsgeek/m7/keymaps/via/keymap.c index defb216b3d4e..77b4aedd70bc 100644 --- a/keyboards/monsgeek/m7/keymaps/via/keymap.c +++ b/keyboards/monsgeek/m7/keymaps/via/keymap.c @@ -43,38 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; // clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) -{ - switch (keycode) - { - case RGB_TOG: - if (record->event.pressed) - { - switch (rgb_matrix_get_flags()) - { - case LED_FLAG_ALL: - { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - default: - { - rgb_matrix_set_flags(LED_FLAG_ALL); - } - break; - } - } - if (!rgb_matrix_is_enabled()) - { - rgb_matrix_set_flags(LED_FLAG_ALL); - rgb_matrix_enable(); - } - return false; - default: - return true; - } -} #ifdef RGB_MATRIX_ENABLE bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { From e6d4a209299c40763b2a4670b4b839f70d5c6600 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:55:57 +0800 Subject: [PATCH 12/20] Update m7.c --- keyboards/monsgeek/m7/m7.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/keyboards/monsgeek/m7/m7.c b/keyboards/monsgeek/m7/m7.c index e270de02d10b..bf2ab68e22f9 100644 --- a/keyboards/monsgeek/m7/m7.c +++ b/keyboards/monsgeek/m7/m7.c @@ -107,3 +107,38 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { {1, J_10, K_10, L_10}, }; #endif +bool process_record_kb(uint16_t keycode, keyrecord_t *record) +{ + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) + { + case RGB_TOG: + if (record->event.pressed) + { + switch (rgb_matrix_get_flags()) + { + case LED_FLAG_ALL: + { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + default: + { + rgb_matrix_set_flags(LED_FLAG_ALL); + } + break; + } + } + if (!rgb_matrix_is_enabled()) + { + rgb_matrix_set_flags(LED_FLAG_ALL); + rgb_matrix_enable(); + } + return false; + default: + return true; + } +} From 624f1a8b3781e3e5fb80e041c40bf907b85a4149 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Mar 2024 09:25:58 +0800 Subject: [PATCH 13/20] Update readme.md --- keyboards/monsgeek/m7/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/readme.md b/keyboards/monsgeek/m7/readme.md index e07bd9185e33..a243df96b9eb 100644 --- a/keyboards/monsgeek/m7/readme.md +++ b/keyboards/monsgeek/m7/readme.md @@ -1,5 +1,5 @@ # M7 -![M7](https://www.monsgeek.com/wp-content/uploads/2023/12/M7-VIA-Main-1.png) +[![M7](https://s21.ax1x.com/2024/03/19/pFRg3cT.png)](https://imgse.com/i/pFRg3cT) A customizable 65% (68 key) keyboard. From 37e32cf905f29f2931264237edb981db82514f7f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 11:19:09 +0800 Subject: [PATCH 14/20] Update m7.c --- keyboards/monsgeek/m7/m7.c | 176 ++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/keyboards/monsgeek/m7/m7.c b/keyboards/monsgeek/m7/m7.c index bf2ab68e22f9..5dc988ce72b0 100644 --- a/keyboards/monsgeek/m7/m7.c +++ b/keyboards/monsgeek/m7/m7.c @@ -11,100 +11,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, A_1, B_1, C_1}, - {0, A_2, B_2, C_2}, - {0, A_3, B_3, C_3}, - {0, A_4, B_4, C_4}, - {0, A_5, B_5, C_5}, - {0, A_6, B_6, C_6}, - {0, A_7, B_7, C_7}, - {0, A_8, B_8, C_8}, - {0, A_9, B_9, C_9}, - {0, A_10, B_10, C_10}, - {0, A_11, B_11, C_11}, - {0, A_12, B_12, C_12}, - {0, A_13, B_13, C_13}, - {0, A_14, B_14, C_14}, - {1, D_3, E_3, F_3}, - {1, D_1, E_1, F_1}, + {0, CB1_CA1, CB2_CA1, CB3_CA1}, + {0, CB1_CA2, CB2_CA2, CB3_CA2}, + {0, CB1_CA3, CB2_CA3, CB3_CA3}, + {0, CB1_CA4, CB2_CA4, CB3_CA4}, + {0, CB1_CA5, CB2_CA5, CB3_CA5}, + {0, CB1_CA6, CB2_CA6, CB3_CA6}, + {0, CB1_CA7, CB2_CA7, CB3_CA7}, + {0, CB1_CA8, CB2_CA8, CB3_CA8}, + {0, CB1_CA9, CB2_CA9, CB3_CA9}, + {0, CB1_CA10, CB2_CA10, CB3_CA10}, + {0, CB1_CA11, CB2_CA11, CB3_CA11}, + {0, CB1_CA12, CB2_CA12, CB3_CA12}, + {0, CB1_CA13, CB2_CA13, CB3_CA13}, + {0, CB1_CA14, CB2_CA14, CB3_CA14}, + {1, CB4_CA3, CB5_CA3, F_CA3}, + {1, CB4_CA1, CB5_CA1, F_CA1}, - {0, D_1, E_1, F_1}, - {0, D_2, E_2, F_2}, - {0, D_3, E_3, F_3}, - {0, D_4, E_4, F_4}, - {0, D_5, E_5, F_5}, - {0, D_6, E_6, F_6}, - {0, D_7, E_7, F_7}, - {0, D_8, E_8, F_8}, - {0, D_9, E_9, F_9}, - {0, D_10, E_10, F_10}, - {0, D_11, E_11, F_11}, - {0, D_12, E_12, F_12}, - {0, D_13, E_13, F_13}, - {0, D_14, E_14, F_14}, - {1, D_4, E_4, F_4}, - {1, D_2, E_2, F_2}, + {0, CB4_CA1, CB5_CA1, F_CA1}, + {0, CB4_CA2, CB5_CA2, F_CA2}, + {0, CB4_CA3, CB5_CA3, F_CA3}, + {0, CB4_CA4, CB5_CA4, F_CA4}, + {0, CB4_CA5, CB5_CA5, F_CA5}, + {0, CB4_CA6, CB5_CA6, F_CA6}, + {0, CB4_CA7, CB5_CA7, F_CA7}, + {0, CB4_CA8, CB5_CA8, F_CA8}, + {0, CB4_CA9, CB5_CA9, F_CA9}, + {0, CB4_CA10, CB5_CA10, F_CA10}, + {0, CB4_CA11, CB5_CA11, F_CA11}, + {0, CB4_CA12, CB5_CA12, F_CA12}, + {0, CB4_CA13, CB5_CA13, F_CA13}, + {0, CB4_CA14, CB5_CA14, F_CA14}, + {1, CB4_CA4, CB5_CA4, F_CA4}, + {1, CB4_CA2, CB5_CA2, F_CA2}, - {0, G_1, H_1, I_1}, - {0, G_2, H_2, I_2}, - {0, G_3, H_3, I_3}, - {0, G_4, H_4, I_4}, - {0, G_5, H_5, I_5}, - {0, G_6, H_6, I_6}, - {0, G_7, H_7, I_7}, - {0, G_8, H_8, I_8}, - {0, G_9, H_9, I_9}, - {0, G_10, H_10, I_10}, - {0, G_11, H_11, I_11}, - {0, G_12, H_12, I_12}, - {0, G_13, H_13, I_13}, + {0, CB7_CA1, CB8_CA1, CB9_CA1}, + {0, CB7_CA2, CB8_CA2, CB9_CA2}, + {0, CB7_CA3, CB8_CA3, CB9_CA3}, + {0, CB7_CA4, CB8_CA4, CB9_CA4}, + {0, CB7_CA5, CB8_CA5, CB9_CA5}, + {0, CB7_CA6, CB8_CA6, CB9_CA6}, + {0, CB7_CA7, CB8_CA7, CB9_CA7}, + {0, CB7_CA8, CB8_CA8, CB9_CA8}, + {0, CB7_CA9, CB8_CA9, CB9_CA9}, + {0, CB7_CA10, CB8_CA10, CB9_CA10}, + {0, CB7_CA11, CB8_CA11, CB9_CA11}, + {0, CB7_CA12, CB8_CA12, CB9_CA12}, + {0, CB7_CA13, CB8_CA13, CB9_CA13}, - {0, J_1, K_1, L_1}, - {0, J_2, K_2, L_2}, - {0, J_3, K_3, L_3}, - {0, J_4, K_4, L_4}, - {0, J_5, K_5, L_5}, - {0, J_6, K_6, L_6}, - {0, J_7, K_7, L_7}, - {0, J_8, K_8, L_8}, - {0, J_9, K_9, L_9}, - {0, J_10, K_10, L_10}, - {0, J_11, K_11, L_11}, - {0, J_12, K_12, L_12}, - {1, D_7, E_7, F_7}, + {0, CB10_CA1, CB11_CA1, CB12_CA1}, + {0, CB10_CA2, CB11_CA2, CB12_CA2}, + {0, CB10_CA3, CB11_CA3, CB12_CA3}, + {0, CB10_CA4, CB11_CA4, CB12_CA4}, + {0, CB10_CA5, CB11_CA5, CB12_CA5}, + {0, CB10_CA6, CB11_CA6, CB12_CA6}, + {0, CB10_CA7, CB11_CA7, CB12_CA7}, + {0, CB10_CA8, CB11_CA8, CB12_CA8}, + {0, CB10_CA9, CB11_CA9, CB12_CA9}, + {0, CB10_CA10, CB11_CA10, CB12_CA10}, + {0, CB10_CA11, CB11_CA11, CB12_CA11}, + {0, CB10_CA12, CB11_CA12, CB12_CA12}, + {1, CB4_CA7, CB5_CA7, F_CA7}, - {0, J_13, K_13, L_13}, - {0, J_14, K_14, L_14}, - {0, J_15, K_15, L_15}, - {0, J_16, K_16, L_16}, - {0, G_14, H_14, I_14}, - {0, G_15, H_15, I_15}, - {0, G_16, H_16, I_16}, - {0, D_15, E_15, F_15}, - {1, D_6, E_6, F_6}, - {1, D_5, E_5, F_5}, + {0, CB10_CA13, CB11_CA13, CB12_CA13}, + {0, CB10_CA14, CB11_CA14, CB12_CA14}, + {0, CB10_CA15, CB11_CA15, CB12_CA15}, + {0, CB10_CA16, CB11_CA16, CB12_CA16}, + {0, CB7_CA14, CB8_CA14, CB9_CA14}, + {0, CB7_CA15, CB8_CA15, CB9_CA15}, + {0, CB7_CA16, CB8_CA16, CB9_CA16}, + {0, CB4_CA15, CB5_CA15, F_CA15}, + {1, CB4_CA6, CB5_CA6, F_CA6}, + {1, CB4_CA5, CB5_CA5, F_CA5}, - {1, G_1, H_1, I_1}, - {1, G_2, H_2, I_2}, - {1, G_3, H_3, I_3}, - {1, G_4, H_4, I_4}, - {1, G_5, H_5, I_5}, - {1, G_6, H_6, I_6}, - {1, G_7, H_7, I_7}, - {1, G_8, H_8, I_8}, - {1, G_9, H_9, I_9}, - {1, G_10, H_10, I_10}, + {1, CB7_CA1, CB8_CA1, CB9_CA1}, + {1, CB7_CA2, CB8_CA2, CB9_CA2}, + {1, CB7_CA3, CB8_CA3, CB9_CA3}, + {1, CB7_CA4, CB8_CA4, CB9_CA4}, + {1, CB7_CA5, CB8_CA5, CB9_CA5}, + {1, CB7_CA6, CB8_CA6, CB9_CA6}, + {1, CB7_CA7, CB8_CA7, CB9_CA7}, + {1, CB7_CA8, CB8_CA8, CB9_CA8}, + {1, CB7_CA9, CB8_CA9, CB9_CA9}, + {1, CB7_CA10, CB8_CA10, CB9_CA10}, - {1, J_1, K_1, L_1}, - {1, J_2, K_2, L_2}, - {1, J_3, K_3, L_3}, - {1, J_4, K_4, L_4}, - {1, J_5, K_5, L_5}, - {1, J_6, K_6, L_6}, - {1, J_7, K_7, L_7}, - {1, J_8, K_8, L_8}, - {1, J_9, K_9, L_9}, - {1, J_10, K_10, L_10}, + {1, CB10_CA1, CB11_CA1, CB12_CA1}, + {1, CB10_CA2, CB11_CA2, CB12_CA2}, + {1, CB10_CA3, CB11_CA3, CB12_CA3}, + {1, CB10_CA4, CB11_CA4, CB12_CA4}, + {1, CB10_CA5, CB11_CA5, CB12_CA5}, + {1, CB10_CA6, CB11_CA6, CB12_CA6}, + {1, CB10_CA7, CB11_CA7, CB12_CA7}, + {1, CB10_CA8, CB11_CA8, CB12_CA8}, + {1, CB10_CA9, CB11_CA9, CB12_CA9}, + {1, CB10_CA10, CB11_CA10, CB12_CA10}, }; #endif bool process_record_kb(uint16_t keycode, keyrecord_t *record) From a8506d540c16af9de6145539224f2cb564d56e36 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 11:22:06 +0800 Subject: [PATCH 15/20] Update m7.c --- keyboards/monsgeek/m7/m7.c | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/keyboards/monsgeek/m7/m7.c b/keyboards/monsgeek/m7/m7.c index 5dc988ce72b0..ebf9f4d3f7dd 100644 --- a/keyboards/monsgeek/m7/m7.c +++ b/keyboards/monsgeek/m7/m7.c @@ -25,25 +25,25 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { {0, CB1_CA12, CB2_CA12, CB3_CA12}, {0, CB1_CA13, CB2_CA13, CB3_CA13}, {0, CB1_CA14, CB2_CA14, CB3_CA14}, - {1, CB4_CA3, CB5_CA3, F_CA3}, - {1, CB4_CA1, CB5_CA1, F_CA1}, + {1, CB4_CA3, CB5_CA3, CB6_CA3}, + {1, CB4_CA1, CB5_CA1, CB6_CA1}, - {0, CB4_CA1, CB5_CA1, F_CA1}, - {0, CB4_CA2, CB5_CA2, F_CA2}, - {0, CB4_CA3, CB5_CA3, F_CA3}, - {0, CB4_CA4, CB5_CA4, F_CA4}, - {0, CB4_CA5, CB5_CA5, F_CA5}, - {0, CB4_CA6, CB5_CA6, F_CA6}, - {0, CB4_CA7, CB5_CA7, F_CA7}, - {0, CB4_CA8, CB5_CA8, F_CA8}, - {0, CB4_CA9, CB5_CA9, F_CA9}, - {0, CB4_CA10, CB5_CA10, F_CA10}, - {0, CB4_CA11, CB5_CA11, F_CA11}, - {0, CB4_CA12, CB5_CA12, F_CA12}, - {0, CB4_CA13, CB5_CA13, F_CA13}, - {0, CB4_CA14, CB5_CA14, F_CA14}, - {1, CB4_CA4, CB5_CA4, F_CA4}, - {1, CB4_CA2, CB5_CA2, F_CA2}, + {0, CB4_CA1, CB5_CA1, CB6_CA1}, + {0, CB4_CA2, CB5_CA2, CB6_CA2}, + {0, CB4_CA3, CB5_CA3, CB6_CA3}, + {0, CB4_CA4, CB5_CA4, CB6_CA4}, + {0, CB4_CA5, CB5_CA5, CB6_CA5}, + {0, CB4_CA6, CB5_CA6, CB6_CA6}, + {0, CB4_CA7, CB5_CA7, CB6_CA7}, + {0, CB4_CA8, CB5_CA8, CB6_CA8}, + {0, CB4_CA9, CB5_CA9, CB6_CA9}, + {0, CB4_CA10, CB5_CA10, CB6_CA10}, + {0, CB4_CA11, CB5_CA11, CB6_CA11}, + {0, CB4_CA12, CB5_CA12, CB6_CA12}, + {0, CB4_CA13, CB5_CA13, CB6_CA13}, + {0, CB4_CA14, CB5_CA14, CB6_CA14}, + {1, CB4_CA4, CB5_CA4, CB6_CA4}, + {1, CB4_CA2, CB5_CA2, CB6_CA2}, {0, CB7_CA1, CB8_CA1, CB9_CA1}, {0, CB7_CA2, CB8_CA2, CB9_CA2}, @@ -71,7 +71,7 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { {0, CB10_CA10, CB11_CA10, CB12_CA10}, {0, CB10_CA11, CB11_CA11, CB12_CA11}, {0, CB10_CA12, CB11_CA12, CB12_CA12}, - {1, CB4_CA7, CB5_CA7, F_CA7}, + {1, CB4_CA7, CB5_CA7, CB6_CA7}, {0, CB10_CA13, CB11_CA13, CB12_CA13}, {0, CB10_CA14, CB11_CA14, CB12_CA14}, @@ -80,9 +80,9 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { {0, CB7_CA14, CB8_CA14, CB9_CA14}, {0, CB7_CA15, CB8_CA15, CB9_CA15}, {0, CB7_CA16, CB8_CA16, CB9_CA16}, - {0, CB4_CA15, CB5_CA15, F_CA15}, - {1, CB4_CA6, CB5_CA6, F_CA6}, - {1, CB4_CA5, CB5_CA5, F_CA5}, + {0, CB4_CA15, CB5_CA15, CB6_CA15}, + {1, CB4_CA6, CB5_CA6, CB6_CA6}, + {1, CB4_CA5, CB5_CA5, CB6_CA5}, {1, CB7_CA1, CB8_CA1, CB9_CA1}, {1, CB7_CA2, CB8_CA2, CB9_CA2}, From 7df6f24d32f663131516f20d6a5aebfb8c1e5b7b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 3 Jun 2024 11:28:13 +0800 Subject: [PATCH 16/20] Update keyboards/monsgeek/m7/config.h Co-authored-by: Ryan --- keyboards/monsgeek/m7/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/monsgeek/m7/config.h b/keyboards/monsgeek/m7/config.h index 394ec3f58354..c7794458cd9d 100644 --- a/keyboards/monsgeek/m7/config.h +++ b/keyboards/monsgeek/m7/config.h @@ -3,11 +3,6 @@ #pragma once -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - /* I2C Config for LED Driver */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO From 83e5327c9ee97e52d888bf383258ce318c4ad1c7 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:10:56 +0800 Subject: [PATCH 17/20] Rename info.json to keyboard.json --- keyboards/monsgeek/m7/{info.json => keyboard.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/monsgeek/m7/{info.json => keyboard.json} (100%) diff --git a/keyboards/monsgeek/m7/info.json b/keyboards/monsgeek/m7/keyboard.json similarity index 100% rename from keyboards/monsgeek/m7/info.json rename to keyboards/monsgeek/m7/keyboard.json From 7e3fed6cff27232ac251f663f9139d6bf08d2f88 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:11:17 +0800 Subject: [PATCH 18/20] Delete keyboards/monsgeek/m7/rules.mk --- keyboards/monsgeek/m7/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/monsgeek/m7/rules.mk diff --git a/keyboards/monsgeek/m7/rules.mk b/keyboards/monsgeek/m7/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/monsgeek/m7/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From d6e09ac917048f24d327992e53daff1138814441 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Fri, 20 Sep 2024 15:45:32 +0800 Subject: [PATCH 19/20] delete via keymap. --- keyboards/monsgeek/m7/keymaps/via/keymap.c | 75 ---------------------- keyboards/monsgeek/m7/keymaps/via/rules.mk | 1 - 2 files changed, 76 deletions(-) delete mode 100644 keyboards/monsgeek/m7/keymaps/via/keymap.c delete mode 100644 keyboards/monsgeek/m7/keymaps/via/rules.mk diff --git a/keyboards/monsgeek/m7/keymaps/via/keymap.c b/keyboards/monsgeek/m7/keymaps/via/keymap.c deleted file mode 100644 index 77b4aedd70bc..000000000000 --- a/keyboards/monsgeek/m7/keymaps/via/keymap.c +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2024 jonylee@hfd (@jonylee1986) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -// clang-format off -enum __layers { - WIN_B, - WIN_FN, - MAC_B, - MAC_FN -}; -#define KC_SIRI LGUI(KC_SPC) -#define KC_TASK LGUI(KC_TAB) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [WIN_B] = LAYOUT_68_ansi( /* Base */ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_FN] = LAYOUT_68_ansi( /* FN */ - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), - - [MAC_B] = LAYOUT_68_ansi( /* Base */ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN] = LAYOUT_68_ansi( /* FN */ - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,RGB_SPD, RGB_SPI, _______, RGB_MOD, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), -}; -// clang-format on -#ifdef RGB_MATRIX_ENABLE -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) -{ - - if (host_keyboard_led_state().caps_lock) - { - RGB_MATRIX_INDICATOR_SET_COLOR(32, 125, 125, 125); - } - else - { - if (!rgb_matrix_get_flags()) - { - RGB_MATRIX_INDICATOR_SET_COLOR(32, 0, 0, 0); - } - } - if (keymap_config.no_gui) - { - RGB_MATRIX_INDICATOR_SET_COLOR(59, 125, 125, 125); - } - else - { - if (!rgb_matrix_get_flags()) - { - RGB_MATRIX_INDICATOR_SET_COLOR(59, 0, 0, 0); - } - } - - return true; -} -#endif diff --git a/keyboards/monsgeek/m7/keymaps/via/rules.mk b/keyboards/monsgeek/m7/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/monsgeek/m7/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes From 397ecc5aa474a6f4cff75ea1877bec62d8f5d5c0 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:55:16 +0800 Subject: [PATCH 20/20] Update keyboards/monsgeek/m7/readme.md Co-authored-by: Ryan --- keyboards/monsgeek/m7/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/monsgeek/m7/readme.md b/keyboards/monsgeek/m7/readme.md index a243df96b9eb..c64a476624b0 100644 --- a/keyboards/monsgeek/m7/readme.md +++ b/keyboards/monsgeek/m7/readme.md @@ -1,5 +1,5 @@ # M7 -[![M7](https://s21.ax1x.com/2024/03/19/pFRg3cT.png)](https://imgse.com/i/pFRg3cT) +![M7](https://s21.ax1x.com/2024/03/19/pFRg3cT.png) A customizable 65% (68 key) keyboard.