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

This commit is contained in:
QMK Bot 2024-03-30 17:49:35 +00:00
commit c9f15cf081
8 changed files with 406 additions and 0 deletions

View file

@ -0,0 +1,11 @@
// Copyright 2024 Filip Strzałka (@philvec)
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#define SERIAL_USART_FULL_DUPLEX
#define AUDIO_PIN GP4
#define AUDIO_PWM_DRIVER PWMD2
#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
#define AUDIO_INIT_DELAY

View file

@ -0,0 +1,9 @@
// Copyright 2024 Filip Strzałka (@philvec)
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include_next <halconf.h>
#undef HAL_USE_PWM
#define HAL_USE_PWM TRUE

View file

@ -0,0 +1,320 @@
{
"manufacturer": "Arrow Mechanics",
"keyboard_name": "WINGS Mark 1",
"maintainer": "arrowmechanics",
"bootloader": "rp2040",
"diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "GP6", "pin_b": "GP7", "resolution": 2}
]
},
"features": {
"audio": true,
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
"rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]
},
"processor": "RP2040",
"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
},
"default": {
"animation": "breathing",
"hue": 192
},
"driver": "ws2812",
"layout": [
{"matrix": [0, 7], "x": 93, "y": 2, "flags": 4},
{"matrix": [0, 6], "x": 80, "y": 1, "flags": 4},
{"matrix": [0, 5], "x": 67, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 54, "y": 1, "flags": 4},
{"matrix": [0, 3], "x": 42, "y": 3, "flags": 4},
{"matrix": [0, 2], "x": 29, "y": 5, "flags": 4},
{"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
{"matrix": [0, 0], "x": 3, "y": 5, "flags": 4},
{"matrix": [1, 0], "x": 3, "y": 17, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 17, "flags": 4},
{"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
{"matrix": [1, 3], "x": 42, "y": 15, "flags": 4},
{"matrix": [1, 4], "x": 54, "y": 13, "flags": 4},
{"matrix": [1, 5], "x": 67, "y": 12, "flags": 4},
{"matrix": [1, 6], "x": 80, "y": 13, "flags": 4},
{"matrix": [1, 7], "x": 93, "y": 14, "flags": 4},
{"matrix": [2, 8], "x": 106, "y": 25, "flags": 4},
{"matrix": [2, 7], "x": 93, "y": 25, "flags": 4},
{"matrix": [2, 6], "x": 80, "y": 25, "flags": 4},
{"matrix": [2, 5], "x": 67, "y": 24, "flags": 4},
{"matrix": [2, 4], "x": 54, "y": 25, "flags": 4},
{"matrix": [2, 3], "x": 42, "y": 27, "flags": 4},
{"matrix": [2, 2], "x": 26, "y": 29, "flags": 4},
{"matrix": [2, 0], "x": 6, "y": 29, "flags": 4},
{"matrix": [3, 0], "x": 3, "y": 40, "flags": 4},
{"matrix": [3, 2], "x": 22, "y": 40, "flags": 4},
{"matrix": [3, 3], "x": 42, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 54, "y": 36, "flags": 4},
{"matrix": [3, 5], "x": 67, "y": 35, "flags": 4},
{"matrix": [3, 6], "x": 80, "y": 36, "flags": 4},
{"matrix": [3, 7], "x": 93, "y": 37, "flags": 4},
{"matrix": [3, 8], "x": 106, "y": 37, "flags": 4},
{"matrix": [4, 8], "x": 106, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 93, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 80, "y": 48, "flags": 4},
{"matrix": [4, 5], "x": 67, "y": 47, "flags": 4},
{"matrix": [4, 4], "x": 54, "y": 48, "flags": 4},
{"matrix": [4, 3], "x": 42, "y": 50, "flags": 4},
{"matrix": [4, 1], "x": 21, "y": 52, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 52, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [5, 1], "x": 13, "y": 64, "flags": 4},
{"matrix": [5, 2], "x": 26, "y": 64, "flags": 4},
{"matrix": [5, 3], "x": 43, "y": 62, "flags": 4},
{"matrix": [5, 4], "x": 59, "y": 60, "flags": 4},
{"matrix": [5, 6], "x": 75, "y": 60, "flags": 4},
{"matrix": [5, 7], "x": 98, "y": 61, "flags": 4},
{"matrix": [6, 1], "x": 131, "y": 2, "flags": 4},
{"matrix": [6, 2], "x": 144, "y": 1, "flags": 4},
{"matrix": [6, 3], "x": 157, "y": 0, "flags": 4},
{"matrix": [6, 4], "x": 170, "y": 1, "flags": 4},
{"matrix": [6, 5], "x": 182, "y": 3, "flags": 4},
{"matrix": [6, 6], "x": 195, "y": 5, "flags": 4},
{"matrix": [6, 7], "x": 208, "y": 5, "flags": 4},
{"matrix": [6, 8], "x": 221, "y": 5, "flags": 4},
{"matrix": [7, 8], "x": 214, "y": 17, "flags": 4},
{"matrix": [7, 6], "x": 195, "y": 17, "flags": 4},
{"matrix": [7, 5], "x": 182, "y": 15, "flags": 4},
{"matrix": [7, 4], "x": 170, "y": 13, "flags": 4},
{"matrix": [7, 3], "x": 157, "y": 12, "flags": 4},
{"matrix": [7, 2], "x": 144, "y": 13, "flags": 4},
{"matrix": [7, 1], "x": 131, "y": 14, "flags": 4},
{"matrix": [8, 0], "x": 118, "y": 25, "flags": 4},
{"matrix": [8, 1], "x": 131, "y": 25, "flags": 4},
{"matrix": [8, 2], "x": 144, "y": 25, "flags": 4},
{"matrix": [8, 3], "x": 157, "y": 24, "flags": 4},
{"matrix": [8, 4], "x": 170, "y": 25, "flags": 4},
{"matrix": [8, 5], "x": 182, "y": 27, "flags": 4},
{"matrix": [8, 6], "x": 195, "y": 29, "flags": 4},
{"matrix": [8, 7], "x": 208, "y": 29, "flags": 4},
{"matrix": [8, 8], "x": 221, "y": 29, "flags": 4},
{"matrix": [9, 8], "x": 216, "y": 40, "flags": 4},
{"matrix": [9, 6], "x": 195, "y": 40, "flags": 4},
{"matrix": [9, 5], "x": 182, "y": 38, "flags": 4},
{"matrix": [9, 4], "x": 170, "y": 36, "flags": 4},
{"matrix": [9, 3], "x": 157, "y": 35, "flags": 4},
{"matrix": [9, 2], "x": 144, "y": 36, "flags": 4},
{"matrix": [9, 1], "x": 131, "y": 37, "flags": 4},
{"matrix": [9, 0], "x": 118, "y": 37, "flags": 4},
{"matrix": [10, 0], "x": 118, "y": 49, "flags": 4},
{"matrix": [10, 1], "x": 131, "y": 49, "flags": 4},
{"matrix": [10, 2], "x": 144, "y": 48, "flags": 4},
{"matrix": [10, 3], "x": 157, "y": 47, "flags": 4},
{"matrix": [10, 4], "x": 170, "y": 48, "flags": 4},
{"matrix": [10, 5], "x": 182, "y": 50, "flags": 4},
{"matrix": [10, 6], "x": 197, "y": 52, "flags": 4},
{"matrix": [10, 7], "x": 211, "y": 52, "flags": 4},
{"matrix": [10, 8], "x": 224, "y": 52, "flags": 4},
{"matrix": [11, 8], "x": 224, "y": 64, "flags": 4},
{"matrix": [11, 7], "x": 211, "y": 64, "flags": 4},
{"matrix": [11, 6], "x": 198, "y": 64, "flags": 4},
{"matrix": [11, 5], "x": 181, "y": 62, "flags": 4},
{"matrix": [11, 4], "x": 165, "y": 60, "flags": 4},
{"matrix": [11, 2], "x": 149, "y": 60, "flags": 4},
{"matrix": [11, 1], "x": 126, "y": 61, "flags": 4}
],
"split_count": [47, 48]
},
"split": {
"enabled": true,
"transport": {
"sync": {
"layer_state": true,
"matrix_state": true
}
}
},
"tags": ["columnar", "split", "rgb", "hotswap", "encoder"],
"url": "https://arrowmechanics.com",
"usb": {
"device_version": "1.0.0",
"pid": "0x3134",
"vid": "0xA880"
},
"ws2812": {
"driver": "vendor",
"pin": "GP26"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0.25, "y": 0.43},
{"matrix": [0, 1], "x": 1.25, "y": 0.43},
{"matrix": [0, 2], "x": 2.25, "y": 0.43},
{"matrix": [0, 3], "x": 3.25, "y": 0.25},
{"matrix": [0, 4], "x": 4.25, "y": 0.08},
{"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 6], "x": 6.25, "y": 0.08},
{"matrix": [0, 7], "x": 7.25, "y": 0.15},
{"matrix": [6, 1], "x": 10.45, "y": 0.15},
{"matrix": [6, 2], "x": 11.45, "y": 0.08},
{"matrix": [6, 3], "x": 12.45, "y": 0},
{"matrix": [6, 4], "x": 13.45, "y": 0.08},
{"matrix": [6, 5], "x": 14.45, "y": 0.25},
{"matrix": [6, 6], "x": 15.45, "y": 0.43},
{"matrix": [6, 7], "x": 16.45, "y": 0.43},
{"matrix": [6, 8], "x": 17.45, "y": 0.43},
{"matrix": [1, 0], "x": 0.25, "y": 1.43},
{"matrix": [1, 1], "x": 1.25, "y": 1.43},
{"matrix": [1, 2], "x": 2.25, "y": 1.43},
{"matrix": [1, 3], "x": 3.25, "y": 1.25},
{"matrix": [1, 4], "x": 4.25, "y": 1.08},
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1.08},
{"matrix": [1, 7], "x": 7.25, "y": 1.15},
{"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0},
{"matrix": [7, 0], "x": 9.45, "y": 1.15},
{"matrix": [7, 1], "x": 10.45, "y": 1.15},
{"matrix": [7, 2], "x": 11.45, "y": 1.08},
{"matrix": [7, 3], "x": 12.45, "y": 1},
{"matrix": [7, 4], "x": 13.45, "y": 1.08},
{"matrix": [7, 5], "x": 14.45, "y": 1.25},
{"matrix": [7, 6], "x": 15.45, "y": 1.43},
{"matrix": [7, 8], "x": 16.45, "y": 1.43, "w": 2},
{"matrix": [2, 0], "x": 0.25, "y": 2.43, "w": 1.5},
{"matrix": [2, 2], "x": 1.75, "y": 2.43, "w": 1.5},
{"matrix": [2, 3], "x": 3.25, "y": 2.25},
{"matrix": [2, 4], "x": 4.25, "y": 2.08},
{"matrix": [2, 5], "x": 5.25, "y": 2},
{"matrix": [2, 6], "x": 6.25, "y": 2.08},
{"matrix": [2, 7], "x": 7.25, "y": 2.15},
{"matrix": [2, 8], "x": 8.25, "y": 2.15},
{"matrix": [8, 0], "x": 9.45, "y": 2.15},
{"matrix": [8, 1], "x": 10.45, "y": 2.15},
{"matrix": [8, 2], "x": 11.45, "y": 2.08},
{"matrix": [8, 3], "x": 12.45, "y": 2},
{"matrix": [8, 4], "x": 13.45, "y": 2.08},
{"matrix": [8, 5], "x": 14.45, "y": 2.25},
{"matrix": [8, 6], "x": 15.45, "y": 2.43},
{"matrix": [8, 7], "x": 16.45, "y": 2.43},
{"matrix": [8, 8], "x": 17.45, "y": 2.43},
{"matrix": [3, 0], "x": 0, "y": 3.43, "w": 1.5},
{"matrix": [3, 2], "x": 1.5, "y": 3.43, "w": 1.75},
{"matrix": [3, 3], "x": 3.25, "y": 3.25},
{"matrix": [3, 4], "x": 4.25, "y": 3.08},
{"matrix": [3, 5], "x": 5.25, "y": 3},
{"matrix": [3, 6], "x": 6.25, "y": 3.08},
{"matrix": [3, 7], "x": 7.25, "y": 3.15},
{"matrix": [3, 8], "x": 8.25, "y": 3.15},
{"matrix": [9, 0], "x": 9.45, "y": 3.15},
{"matrix": [9, 1], "x": 10.45, "y": 3.15},
{"matrix": [9, 2], "x": 11.45, "y": 3.08},
{"matrix": [9, 3], "x": 12.45, "y": 3},
{"matrix": [9, 4], "x": 13.45, "y": 3.08},
{"matrix": [9, 5], "x": 14.45, "y": 3.25},
{"matrix": [9, 6], "x": 15.45, "y": 3.43},
{"matrix": [9, 8], "x": 16.45, "y": 3.43, "w": 2.25},
{"matrix": [4, 0], "x": 0, "y": 4.43},
{"matrix": [4, 1], "x": 1, "y": 4.43, "w": 2.25},
{"matrix": [4, 3], "x": 3.25, "y": 4.25},
{"matrix": [4, 4], "x": 4.25, "y": 4.08},
{"matrix": [4, 5], "x": 5.25, "y": 4},
{"matrix": [4, 6], "x": 6.25, "y": 4.08},
{"matrix": [4, 7], "x": 7.25, "y": 4.15},
{"matrix": [4, 8], "x": 8.25, "y": 4.15},
{"matrix": [10, 0], "x": 9.45, "y": 4.15},
{"matrix": [10, 1], "x": 10.45, "y": 4.15},
{"matrix": [10, 2], "x": 11.45, "y": 4.08},
{"matrix": [10, 3], "x": 12.45, "y": 4},
{"matrix": [10, 4], "x": 13.45, "y": 4.08},
{"matrix": [10, 5], "x": 14.45, "y": 4.25},
{"matrix": [10, 6], "x": 15.45, "y": 4.43, "w": 1.25},
{"matrix": [10, 7], "x": 16.7, "y": 4.43},
{"matrix": [10, 8], "x": 17.7, "y": 4.43},
{"matrix": [5, 0], "x": 0, "y": 5.43},
{"matrix": [5, 1], "x": 1, "y": 5.43},
{"matrix": [5, 2], "x": 2, "y": 5.43},
{"matrix": [5, 3], "x": 3.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 4], "x": 4.5, "y": 5.08, "w": 1.25},
{"matrix": [5, 6], "x": 5.75, "y": 5.08, "w": 1.25},
{"matrix": [5, 7], "x": 7, "y": 5.15, "w": 2.25},
{"matrix": [11, 1], "x": 9.45, "y": 5.15, "w": 2.25},
{"matrix": [11, 2], "x": 11.7, "y": 5.08, "w": 1.25},
{"matrix": [11, 4], "x": 12.95, "y": 5.08, "w": 1.25},
{"matrix": [11, 5], "x": 14.2, "y": 5.25, "w": 1.25},
{"matrix": [11, 6], "x": 15.7, "y": 5.43},
{"matrix": [11, 7], "x": 16.7, "y": 5.43},
{"matrix": [11, 8], "x": 17.7, "y": 5.43}
]
}
}
}

View file

@ -0,0 +1,25 @@
// Copyright 2024 Filip Strzałka (@philvec)
// SPDX-License-Identifier: GPL-3.0-or-later
#include QMK_KEYBOARD_H
enum layers {
BASE,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(
KC_VOLU, 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_EQL, KC_PSCR, KC_DEL,
KC_VOLD, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RGB_MOD, KC_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC,
KC_MPLY, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, C(KC_C), C(KC_V), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_MNXT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, C(KC_Z), C(KC_Y), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_MPRV, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME,
KC_LCTL, KC_NO, KC_NO, KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
};
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[BASE] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
};
#endif

View file

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

View file

@ -0,0 +1,9 @@
// Copyright 2024 Filip Strzałka (@philvec)
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include_next <mcuconf.h>
#undef RP_PWM_USE_PWM2
#define RP_PWM_USE_PWM2 TRUE

View file

@ -0,0 +1,29 @@
# Arrow Mechanics WINGS Mark 1
![Arrow Mechanics WINGS Mark 1](https://i.imgur.com/oQkDmSu.png)
ErgoDox-inspired SPLIT keyboard by [Arrow Mechanics](https://www.arrowmechanics.com/)
* 94 GATERON Low Profile 2.0 hotswap sockets
* RGB diode under each key for WS2812-driven lighting with [RGB Matrix](https://docs.qmk.fm/#/feature_rgb_matrix)
* 2 rotary encoders, one per half, with push-switches
* Buzzers for sound effects and/or [Music Mode](https://docs.qmk.fm/#/feature_audio?id=music-mode)
* Handy magnetic connectors for joining the halves together or splitting with the use of dedicated cable
* Anti-slip pads with magnetic expanding-legs for conveniently adjusting height/lean
* RP2040 Chip + 16MB Flash memory - Dual-core Cortex M0+
---
* Keyboard Maintainer: [arrowmechanics](https://github.com/arrowmechanics/)
* Hardware Supported: [Arrow Mechanics WINGS Keyboard set](https://www.arrowmechanics.com/produkty?view=product&id=8)
* Hardware Availability: [Official Arrow Mechanics E-SHOP](https://www.arrowmechanics.com/produkty?view=product&id=8)
Flashing example for this keyboard:
qmk flash -kb arrowmechanics/wings -km default
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 top-left corner key on power-up.
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

View file

@ -0,0 +1,2 @@
SERIAL_DRIVER = vendor
AUDIO_DRIVER = pwm_hardware