mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-09-07 10:53:17 +02:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
Executable
+10
@@ -0,0 +1,10 @@
|
||||
// Copyright 2026 Yiancar
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#define WS2812_PWM_DRIVER PWMD3
|
||||
#define WS2812_PWM_CHANNEL 3
|
||||
#define WS2812_PWM_PAL_MODE 1
|
||||
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
|
||||
#define WS2812_PWM_DMA_CHANNEL 3
|
||||
@@ -0,0 +1,8 @@
|
||||
// Copyright 2026 Yiancar
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#define HAL_USE_PWM TRUE
|
||||
|
||||
#include_next <halconf.h>
|
||||
Executable
+228
@@ -0,0 +1,228 @@
|
||||
{
|
||||
"keyboard_name": "NK65 Gen2",
|
||||
"manufacturer": "Yiancar-Designs",
|
||||
"url": "www.yiancar-designs.com",
|
||||
"maintainer": "Yiancar",
|
||||
"usb": {
|
||||
"vid": "0x8968",
|
||||
"pid": "0x4E56",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "B0",
|
||||
"driver": "pwm"
|
||||
},
|
||||
"rgb_matrix": {
|
||||
"animations": {
|
||||
"alphas_mods": 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_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,
|
||||
"jellybean_raindrops": true,
|
||||
"multisplash": true,
|
||||
"pixel_flow": true,
|
||||
"pixel_fractal": true,
|
||||
"pixel_rain": true,
|
||||
"rainbow_beacon": true,
|
||||
"rainbow_moving_chevron": true,
|
||||
"rainbow_pinwheels": true,
|
||||
"raindrops": 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": [0,14], "flags":1, "x":224, "y":0},
|
||||
{"matrix": [0,13], "flags":1, "x":202, "y":0},
|
||||
{"matrix": [0,12], "flags":4, "x":179, "y":0},
|
||||
{"matrix": [0,11], "flags":4, "x":164, "y":0},
|
||||
{"matrix": [0,10], "flags":4, "x":149, "y":0},
|
||||
{"matrix": [0,9], "flags":4, "x":134, "y":0},
|
||||
{"matrix": [0,8], "flags":4, "x":119, "y":0},
|
||||
{"matrix": [0,7], "flags":4, "x":105, "y":0},
|
||||
{"matrix": [0,6], "flags":4, "x":90, "y":0},
|
||||
{"matrix": [0,5], "flags":4, "x":75, "y":0},
|
||||
{"matrix": [0,4], "flags":4, "x":60, "y":0},
|
||||
{"matrix": [0,3], "flags":4, "x":45, "y":0},
|
||||
{"matrix": [0,2], "flags":4, "x":30, "y":0},
|
||||
{"matrix": [0,1], "flags":4, "x":15, "y":0},
|
||||
{"matrix": [0,0], "flags":1, "x":0, "y":0},
|
||||
{"matrix": [1,0], "flags":1, "x":4, "y":16},
|
||||
{"matrix": [1,1], "flags":4, "x":22, "y":16},
|
||||
{"matrix": [1,2], "flags":4, "x":37, "y":16},
|
||||
{"matrix": [1,3], "flags":4, "x":52, "y":16},
|
||||
{"matrix": [1,4], "flags":4, "x":67, "y":16},
|
||||
{"matrix": [1,5], "flags":4, "x":82, "y":16},
|
||||
{"matrix": [1,6], "flags":4, "x":97, "y":16},
|
||||
{"matrix": [1,7], "flags":4, "x":112, "y":16},
|
||||
{"matrix": [1,8], "flags":4, "x":127, "y":16},
|
||||
{"matrix": [1,9], "flags":4, "x":142, "y":16},
|
||||
{"matrix": [1,10], "flags":4, "x":157, "y":16},
|
||||
{"matrix": [1,11], "flags":4, "x":172, "y":16},
|
||||
{"matrix": [1,12], "flags":4, "x":187, "y":16},
|
||||
{"matrix": [2,12], "flags":4, "x":205, "y":16},
|
||||
{"matrix": [1,14], "flags":1, "x":224, "y":16},
|
||||
{"matrix": [2,14], "flags":1, "x":224, "y":32},
|
||||
{"matrix": [2,13], "flags":1, "x":200, "y":32},
|
||||
{"matrix": [2,11], "flags":4, "x":175, "y":32},
|
||||
{"matrix": [2,10], "flags":4, "x":161, "y":32},
|
||||
{"matrix": [2,9], "flags":4, "x":146, "y":32},
|
||||
{"matrix": [2,8], "flags":4, "x":131, "y":32},
|
||||
{"matrix": [2,7], "flags":4, "x":116, "y":32},
|
||||
{"matrix": [2,6], "flags":4, "x":101, "y":32},
|
||||
{"matrix": [2,5], "flags":4, "x":86, "y":32},
|
||||
{"matrix": [2,4], "flags":4, "x":71, "y":32},
|
||||
{"matrix": [2,3], "flags":4, "x":56, "y":32},
|
||||
{"matrix": [2,2], "flags":4, "x":41, "y":32},
|
||||
{"matrix": [2,1], "flags":4, "x":26, "y":32},
|
||||
{"matrix": [2,0], "flags":1, "x":11, "y":24},
|
||||
{"matrix": [3,0], "flags":1, "x":9, "y":48},
|
||||
{"matrix": [3,2], "flags":4, "x":34, "y":48},
|
||||
{"matrix": [3,3], "flags":4, "x":49, "y":48},
|
||||
{"matrix": [3,4], "flags":4, "x":63, "y":48},
|
||||
{"matrix": [3,5], "flags":4, "x":78, "y":48},
|
||||
{"matrix": [3,6], "flags":4, "x":93, "y":48},
|
||||
{"matrix": [3,7], "flags":4, "x":108, "y":48},
|
||||
{"matrix": [3,8], "flags":4, "x":123, "y":48},
|
||||
{"matrix": [3,9], "flags":4, "x":138, "y":48},
|
||||
{"matrix": [3,10], "flags":4, "x":153, "y":48},
|
||||
{"matrix": [3,11], "flags":4, "x":168, "y":48},
|
||||
{"matrix": [3,12], "flags":1, "x":189, "y":48},
|
||||
{"matrix": [3,13], "flags":1, "x":209, "y":48},
|
||||
{"matrix": [3,14], "flags":1, "x":224, "y":48},
|
||||
{"matrix": [4,14], "flags":1, "x":224, "y":64},
|
||||
{"matrix": [4,13], "flags":1, "x":209, "y":64},
|
||||
{"matrix": [4,12], "flags":1, "x":194, "y":64},
|
||||
{"matrix": [4,11], "flags":1, "x":168, "y":64},
|
||||
{"matrix": [4,6], "flags":4, "x":105, "y":64},
|
||||
{"matrix": [4,2], "flags":1, "x":41, "y":64},
|
||||
{"matrix": [4,1], "flags":1, "x":22, "y":64},
|
||||
{"matrix": [4,0], "flags":1, "x":4, "y":64},
|
||||
{"matrix": [4,0], "flags":8, "x":0, "y":0},
|
||||
{"matrix": [4,0], "flags":8, "x":0, "y":0}
|
||||
],
|
||||
"max_brightness": 130,
|
||||
"sleep": true
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
|
||||
"rows": ["B10", "B2", "B1", "A9", "A5"]
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"processor": "STM32F072",
|
||||
"bootloader": "stm32-dfu",
|
||||
"layout_aliases": {
|
||||
"LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_65_ansi_blocker_tsangan": {
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3, "y": 0},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0},
|
||||
{"matrix": [0, 5], "x": 5, "y": 0},
|
||||
{"matrix": [0, 6], "x": 6, "y": 0},
|
||||
{"matrix": [0, 7], "x": 7, "y": 0},
|
||||
{"matrix": [0, 8], "x": 8, "y": 0},
|
||||
{"matrix": [0, 9], "x": 9, "y": 0},
|
||||
{"matrix": [0, 10], "x": 10, "y": 0},
|
||||
{"matrix": [0, 11], "x": 11, "y": 0},
|
||||
{"matrix": [0, 12], "x": 12, "y": 0},
|
||||
{"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
|
||||
{"matrix": [0, 14], "x": 15, "y": 0},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
|
||||
{"matrix": [1, 1], "x": 1.5, "y": 1},
|
||||
{"matrix": [1, 2], "x": 2.5, "y": 1},
|
||||
{"matrix": [1, 3], "x": 3.5, "y": 1},
|
||||
{"matrix": [1, 4], "x": 4.5, "y": 1},
|
||||
{"matrix": [1, 5], "x": 5.5, "y": 1},
|
||||
{"matrix": [1, 6], "x": 6.5, "y": 1},
|
||||
{"matrix": [1, 7], "x": 7.5, "y": 1},
|
||||
{"matrix": [1, 8], "x": 8.5, "y": 1},
|
||||
{"matrix": [1, 9], "x": 9.5, "y": 1},
|
||||
{"matrix": [1, 10], "x": 10.5, "y": 1},
|
||||
{"matrix": [1, 11], "x": 11.5, "y": 1},
|
||||
{"matrix": [1, 12], "x": 12.5, "y": 1},
|
||||
{"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
|
||||
{"matrix": [1, 14], "x": 15, "y": 1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
|
||||
{"matrix": [2, 1], "x": 1.75, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2.75, "y": 2},
|
||||
{"matrix": [2, 3], "x": 3.75, "y": 2},
|
||||
{"matrix": [2, 4], "x": 4.75, "y": 2},
|
||||
{"matrix": [2, 5], "x": 5.75, "y": 2},
|
||||
{"matrix": [2, 6], "x": 6.75, "y": 2},
|
||||
{"matrix": [2, 7], "x": 7.75, "y": 2},
|
||||
{"matrix": [2, 8], "x": 8.75, "y": 2},
|
||||
{"matrix": [2, 9], "x": 9.75, "y": 2},
|
||||
{"matrix": [2, 10], "x": 10.75, "y": 2},
|
||||
{"matrix": [2, 11], "x": 11.75, "y": 2},
|
||||
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
|
||||
{"matrix": [2, 14], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
|
||||
{"matrix": [3, 2], "x": 2.25, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3.25, "y": 3},
|
||||
{"matrix": [3, 4], "x": 4.25, "y": 3},
|
||||
{"matrix": [3, 5], "x": 5.25, "y": 3},
|
||||
{"matrix": [3, 6], "x": 6.25, "y": 3},
|
||||
{"matrix": [3, 7], "x": 7.25, "y": 3},
|
||||
{"matrix": [3, 8], "x": 8.25, "y": 3},
|
||||
{"matrix": [3, 9], "x": 9.25, "y": 3},
|
||||
{"matrix": [3, 10], "x": 10.25, "y": 3},
|
||||
{"matrix": [3, 11], "x": 11.25, "y": 3},
|
||||
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
|
||||
{"matrix": [3, 13], "x": 14, "y": 3},
|
||||
{"matrix": [3, 14], "x": 15, "y": 3},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1},
|
||||
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
|
||||
{"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 12], "x": 13, "y": 4},
|
||||
{"matrix": [4, 13], "x": 14, "y": 4},
|
||||
{"matrix": [4, 14], "x": 15, "y": 4}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
// Copyright 2026 Yiancar
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT_65_ansi_blocker_tsangan( /* Base */
|
||||
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_LEFT, KC_DOWN, KC_RGHT),
|
||||
|
||||
[1] = LAYOUT_65_ansi_blocker_tsangan( /* 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_DEL, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, RM_TOGG, RM_NEXT, RM_HUED, RM_HUEU, RM_SATD, RM_SATU, RM_VALD, RM_VALU, RM_SPDD, RM_SPDU, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
|
||||
};
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(66, 5, 2, 1);
|
||||
} else {
|
||||
rgb_matrix_set_color(66, 0, 0, 0);
|
||||
}
|
||||
|
||||
if (get_highest_layer(layer_state|default_layer_state) == 1) {
|
||||
rgb_matrix_set_color(67, 3, 1, 5);
|
||||
} else {
|
||||
rgb_matrix_set_color(67, 0, 0, 0);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
// Copyright 2026 Yiancar
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next <mcuconf.h>
|
||||
|
||||
#undef STM32_PWM_USE_TIM3
|
||||
#define STM32_PWM_USE_TIM3 TRUE
|
||||
Executable
+32
@@ -0,0 +1,32 @@
|
||||
# NK66 Gen2
|
||||
|
||||
This is a tsangan fixed layout 65% PCB. It supports full per-key RGB.
|
||||
|
||||
* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
|
||||
* Hardware Supported: A 65% keyboard with STM32F072CB
|
||||
* Hardware Availability: https://novelkeys.com/
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make novelkeys/nk65_gen2:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make novelkeys/nk65_gen2: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).
|
||||
|
||||
### Reset
|
||||
|
||||
- Unplug
|
||||
- Hold Escape
|
||||
- Plug In
|
||||
- Unplug
|
||||
- Release Escape
|
||||
|
||||
### Flash
|
||||
|
||||
- Unplug
|
||||
- Hold Escape
|
||||
- Plug In
|
||||
- Flash using QMK Toolbox or CLI (`make novelkeys/nk65_gen2:<keymap>:flash`)
|
||||
Reference in New Issue
Block a user