Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for latest QMK release #1

Closed
wants to merge 2 commits into from
Closed

Updates for latest QMK release #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a540fd0
Updates for latest QMK release
silvinor Dec 10, 2023
e1a0cba
move `RGB_MATRIX_LED_COUNT` to info.json
silvinor Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions keyboards/monsgeek/m2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@

#pragma once

/* LED Indicators */
#define LED_WIN_LOCK_PIN C11

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* SPI Config for spi flash*/
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN B3
Expand All @@ -32,20 +24,14 @@
#define SPI_MOSI_PAL_MODE 5

#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)

/* 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_OPMODE OPMODE_I2C
#define I2C1_CLOCK_SPEED 400000 /* 400000 */

#define DRIVER_1_LED_TOTAL 60
#define DRIVER_2_LED_TOTAL 38
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

#define RGB_TRIGGER_ON_KEYDOWN
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES

134 changes: 71 additions & 63 deletions keyboards/monsgeek/m2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,32 @@
"keyboard_name": "M2",
"maintainer": "jonylee@hfd",
"bootloader": "wb32-dfu",
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
"processor": "WB32FQ95",
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {
"driver": "spi_flash",
"backing_size": 8192,
"logical_size": 4096
}
},
"usb": {
"device_version": "1.0.4",
"force_nkro": true,
"pid": "0x0008",
"suspend_wakeup_delay": 400,
"vid": "0xFFFE"
},
"indicators": {
"num_lock": "A15",
"caps_lock": "C10",
"scroll_lock": "C11"
},
"matrix_pins": {
"cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"features": {
"bootmagic": true,
"command": false,
Expand All @@ -16,56 +38,51 @@
"nkro": true,
"rgb_matrix": true
},
"indicators": {
"caps_lock": "A15",
"num_lock": "C10"
},
"matrix_pins": {
"cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
},
"processor": "WB32FQ95",
"rgb_matrix": {
"driver": "snled27351",
"led_count": 98,
"max_brightness": 200,
"val_steps": 20,
"animations": {
"solid_color": true,
"breathing": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"rainbow_moving_chevron": 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,
"typing_heatmap": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_cross": true,
"solid_reactive_simple": true,
"typing_heatmap": true
"multisplash": true
},
"driver": "snled27351",
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 13, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 26, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 39, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 79, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 92, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 105, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 118, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 131, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 144, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 158, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 171, "y": 0, "flags": 4},
{"matrix": [0, 17], "x": 184, "y": 0, "flags": 4},
{"matrix": [0, 18], "x": 197, "y": 0, "flags": 4},
{"matrix": [0, 19], "x": 210, "y": 0, "flags": 4},
{"matrix": [0, 20], "x": 224, "y": 0, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 12, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 13, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 26, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 39, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 52, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 65, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 79, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 92, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 105, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 118, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 131, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 144, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 158, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 171, "y": 0, "flags": 1},
{"matrix": [0, 17], "x": 184, "y": 0, "flags": 1},
{"matrix": [0, 18], "x": 197, "y": 0, "flags": 1},
{"matrix": [0, 19], "x": 210, "y": 0, "flags": 1},
{"matrix": [0, 20], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 12, "flags": 1},
{"matrix": [1, 1], "x": 13, "y": 12, "flags": 4},
{"matrix": [1, 2], "x": 26, "y": 12, "flags": 4},
{"matrix": [1, 3], "x": 39, "y": 12, "flags": 4},
Expand All @@ -78,12 +95,12 @@
{"matrix": [1, 10], "x": 131, "y": 12, "flags": 4},
{"matrix": [1, 11], "x": 144, "y": 12, "flags": 4},
{"matrix": [1, 12], "x": 158, "y": 12, "flags": 4},
{"matrix": [1, 13], "x": 171, "y": 12, "flags": 4},
{"matrix": [1, 13], "x": 171, "y": 12, "flags": 9},
{"matrix": [1, 17], "x": 184, "y": 12, "flags": 4},
{"matrix": [1, 18], "x": 197, "y": 12, "flags": 4},
{"matrix": [1, 19], "x": 210, "y": 12, "flags": 4},
{"matrix": [2, 20], "x": 224, "y": 12, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 25, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 25, "flags": 1},
{"matrix": [2, 1], "x": 13, "y": 25, "flags": 4},
{"matrix": [2, 2], "x": 26, "y": 25, "flags": 4},
{"matrix": [2, 3], "x": 39, "y": 25, "flags": 4},
Expand All @@ -101,7 +118,7 @@
{"matrix": [2, 18], "x": 197, "y": 25, "flags": 4},
{"matrix": [2, 19], "x": 210, "y": 25, "flags": 4},
{"matrix": [2, 20], "x": 224, "y": 25, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 38, "flags": 9},
{"matrix": [3, 1], "x": 13, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 26, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 39, "y": 38, "flags": 4},
Expand All @@ -113,11 +130,11 @@
{"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 131, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 144, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 163, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 163, "y": 38, "flags": 1},
{"matrix": [3, 17], "x": 184, "y": 38, "flags": 4},
{"matrix": [3, 18], "x": 197, "y": 38, "flags": 4},
{"matrix": [3, 19], "x": 210, "y": 38, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
{"matrix": [4, 1], "x": 26, "y": 51, "flags": 4},
{"matrix": [4, 2], "x": 39, "y": 51, "flags": 4},
{"matrix": [4, 3], "x": 52, "y": 51, "flags": 4},
Expand All @@ -128,33 +145,24 @@
{"matrix": [4, 8], "x": 118, "y": 51, "flags": 4},
{"matrix": [4, 9], "x": 131, "y": 51, "flags": 4},
{"matrix": [4, 10], "x": 144, "y": 51, "flags": 4},
{"matrix": [4, 13], "x": 158, "y": 51, "flags": 4},
{"matrix": [4, 15], "x": 171, "y": 51, "flags": 4},
{"matrix": [4, 13], "x": 158, "y": 51, "flags": 1},
{"matrix": [4, 15], "x": 171, "y": 51, "flags": 1},
{"matrix": [4, 17], "x": 184, "y": 51, "flags": 4},
{"matrix": [4, 18], "x": 197, "y": 51, "flags": 4},
{"matrix": [4, 19], "x": 210, "y": 51, "flags": 4},
{"matrix": [4, 20], "x": 224, "y": 51, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [5, 1], "x": 18, "y": 64, "flags": 4},
{"matrix": [5, 2], "x": 37, "y": 64, "flags": 4},
{"matrix": [5, 5], "x": 92, "y": 64, "flags": 4},
{"matrix": [5, 9], "x": 130, "y": 64, "flags": 4},
{"matrix": [5, 10], "x": 145, "y": 64, "flags": 4},
{"matrix": [5, 11], "x": 158, "y": 64, "flags": 4},
{"matrix": [5, 15], "x": 171, "y": 64, "flags": 4},
{"matrix": [5, 16], "x": 184, "y": 64, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 64, "flags": 1},
{"matrix": [5, 1], "x": 18, "y": 64, "flags": 1},
{"matrix": [5, 2], "x": 37, "y": 64, "flags": 1},
{"matrix": [5, 5], "x": 92, "y": 64, "flags": 1},
{"matrix": [5, 9], "x": 130, "y": 64, "flags": 1},
{"matrix": [5, 10], "x": 145, "y": 64, "flags": 1},
{"matrix": [5, 11], "x": 158, "y": 64, "flags": 1},
{"matrix": [5, 15], "x": 171, "y": 64, "flags": 1},
{"matrix": [5, 16], "x": 184, "y": 64, "flags": 1},
{"matrix": [5, 18], "x": 197, "y": 64, "flags": 4},
{"matrix": [5, 19], "x": 210, "y": 64, "flags": 4}
],
"max_brightness": 200,
"val_steps": 20
},
"usb": {
"device_version": "1.0.4",
"force_nkro": true,
"pid": "0x0008",
"suspend_wakeup_delay": 400,
"vid": "0xFFFE"
]
},
"layouts": {
"LAYOUT": {
Expand Down
83 changes: 0 additions & 83 deletions keyboards/monsgeek/m2/keymaps/default/keymap.c
View file
Open in desktop

This file was deleted.

Loading
Loading