Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2025-06-07 00:31:45 +00:00
commit 8455dd093d
29 changed files with 44 additions and 54 deletions

View File

@ -8,7 +8,8 @@
"bootmagic": true, "bootmagic": true,
"extrakey": true, "extrakey": true,
"mousekey": true, "mousekey": true,
"nkro": true "nkro": true,
"encoder" : true
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"], "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"],
@ -20,6 +21,13 @@
"pid": "0x0004", "pid": "0x0004",
"vid": "0x5757" "vid": "0x5757"
}, },
"encoder": {
"rotary": [
{"pin_a": "GP16", "pin_b": "GP17"},
{"pin_a": "GP18", "pin_b": "GP19"},
{"pin_a": "GP20", "pin_b": "GP21"}
]
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -3,11 +3,17 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( [0] = LAYOUT(
KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,
KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24 KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24
) )
}; };
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
};
#endif

View File

@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes

View File

@ -2,7 +2,7 @@
![soyuz](https://i.imgur.com/KwwORGSh.jpeg) ![soyuz](https://i.imgur.com/KwwORGSh.jpeg)
21 Key and 3 MIDI Potentiometers Macro Keyboard 21 Key, 3 Encoder
* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover) * Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
* Hardware Supported: RP2040 Handwired * Hardware Supported: RP2040 Handwired

View File

@ -35,8 +35,7 @@
"pin": "D3" "pin": "D3"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -35,8 +35,7 @@
"pin": "D3" "pin": "D3"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -36,8 +36,7 @@
"pin": "D3" "pin": "D3"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -42,8 +42,7 @@
"ws2812": { "ws2812": {
"pin": "B1" "pin": "B1"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4"] "rows": ["D3", "D2", "D1", "D0", "D4"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -39,8 +39,7 @@
"ws2812": { "ws2812": {
"pin": "F6" "pin": "F6"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_4x10"], "community_layouts": ["ortho_4x10"],
"layouts": { "layouts": {
"LAYOUT_ortho_4x10": { "LAYOUT_ortho_4x10": {

View File

@ -46,8 +46,7 @@
"ws2812": { "ws2812": {
"pin": "F5" "pin": "F5"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
{"pin_a": "F4", "pin_b": "F5"} {"pin_a": "F4", "pin_b": "F5"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -33,8 +33,7 @@
"led_count": 6, "led_count": 6,
"max_brightness": 200 "max_brightness": 200
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -34,8 +34,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["split_3x5_3"], "community_layouts": ["split_3x5_3"],
"layouts": { "layouts": {
"LAYOUT_split_3x5_3": { "LAYOUT_split_3x5_3": {

View File

@ -8,8 +8,7 @@
"pid": "0x50AD", "pid": "0x50AD",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"extrakey": true, "extrakey": true,

View File

@ -19,8 +19,7 @@
"rows": ["C6", "D7", "E6", "B4", "B5"] "rows": ["C6", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -18,8 +18,7 @@
"rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -18,8 +18,7 @@
"rows": ["D2", "D1", "D0", "D4"] "rows": ["D2", "D1", "D0", "D4"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -18,8 +18,7 @@
"rows": ["D1"] "rows": ["D1"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -19,8 +19,7 @@
"rows": ["B5", "B4", "E6", "D7"] "rows": ["B5", "B4", "E6", "D7"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ortho_4x3": { "LAYOUT_ortho_4x3": {
"layout": [ "layout": [

View File

@ -18,8 +18,7 @@
"rows": ["F4", "F5", "F6", "F7"] "rows": ["F4", "F5", "F6", "F7"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT": "LAYOUT_all" "LAYOUT": "LAYOUT_all"
}, },

View File

@ -18,8 +18,7 @@
"rows": ["F4", "F5", "F6", "F7"] "rows": ["F4", "F5", "F6", "F7"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -19,8 +19,7 @@
"rows": ["F4", "F5", "F6", "F7"] "rows": ["F4", "F5", "F6", "F7"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -49,8 +49,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -1,6 +1,5 @@
{ {
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"split": { "split": {
"enabled": true "enabled": true
} }

View File

@ -1,6 +1,5 @@
{ {
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"extrakey": false, "extrakey": false,

View File

@ -17,8 +17,7 @@
"pin": "D0" "pin": "D0"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -17,8 +17,7 @@
"pin": "D0" "pin": "D0"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [