Merge 2843d09278
into a82a0ec496
This commit is contained in:
commit
648a3377ce
11 changed files with 300 additions and 22 deletions
|
@ -1,5 +1,5 @@
|
|||
|
||||
if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_REV2_LEFT
|
||||
if SHIELD_KYRIA_RIGHT || SHIELD_KYRIA_REV2_RIGHT
|
||||
|
||||
config ZMK_KEYBOARD_NAME
|
||||
default "Kyria"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Uncomment these two line to add support for encoders to your firmware
|
||||
# CONFIG_EC11=y
|
||||
# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
|
||||
CONFIG_EC11=y
|
||||
CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
|
||||
|
||||
# Uncomment the following line to enable the Kyria OLED Display
|
||||
# CONFIG_ZMK_DISPLAY=y
|
||||
|
|
|
@ -33,13 +33,13 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
|
|||
// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 |
|
||||
five_column_transform: keymap_transform_1 {
|
||||
compatible = "zmk,matrix-transform";
|
||||
columns = <14>;
|
||||
columns = <10>;
|
||||
rows = <4>;
|
||||
map = <
|
||||
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
|
||||
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
|
||||
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
|
||||
RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
|
||||
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
|
||||
RC(3,2) RC(3,3) RC(3,4) RC(3,9) RC(3,10) RC(3,11)
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -7,24 +7,99 @@
|
|||
#include <behaviors.dtsi>
|
||||
#include <dt-bindings/zmk/keys.h>
|
||||
|
||||
/ {
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
#define DEFAULT 0
|
||||
#define SYMNUM 1
|
||||
#define NAVFN 2
|
||||
#define CONFIG 3
|
||||
|
||||
default_layer {
|
||||
// ---------------------------------------------------------------------------------------------------------------------------------
|
||||
// | ESC | Q | W | E | R | T | | Y | U | I | O | P | \ |
|
||||
// | TAB | A | S | D | F | G | | H | J | K | L | ; | ' |
|
||||
// | SHIFT | Z | X | C | V | B | L SHIFT | L SHIFT | | L SHIFT | L SHIFT | N | M | , | . | / | CTRL |
|
||||
// | GUI | DEL | RET | SPACE | ESC | | RET | SPACE | TAB | BSPC | R-ALT |
|
||||
bindings = <
|
||||
&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH
|
||||
&kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
|
||||
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT &kp LSHFT &kp LSHFT &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RCTRL
|
||||
&kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC &kp RET &kp SPACE &kp TAB &kp BSPC &kp RALT
|
||||
>;
|
||||
&mt {
|
||||
tapping-term-ms = <165>;
|
||||
};
|
||||
|
||||
/ {
|
||||
|
||||
five_column_transform: keymap_transform_1 {
|
||||
compatible = "zmk,matrix-transform";
|
||||
columns = <10>;
|
||||
rows = <4>;
|
||||
map = <
|
||||
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
|
||||
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
|
||||
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
|
||||
RC(3,2) RC(3,3) RC(3,4) RC(3,9) RC(3,10) RC(3,11)
|
||||
>;
|
||||
};
|
||||
chosen {
|
||||
zmk,matrix_transform = &five_column_transform;
|
||||
};
|
||||
|
||||
macros {
|
||||
ZMK_MACRO(save,
|
||||
wait-ms = <30>;
|
||||
tap-ms = <40>;
|
||||
bindings = <¯o_tap &kp ESC &kp COLON &kp W &kp RET>;
|
||||
)
|
||||
};
|
||||
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
|
||||
default_layer {
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// | B | Y | O | U | | L | D | W | V |
|
||||
// | LGUI(C) | LALT(I) | LSHFT(E) | LCTRL(A) | | RCTRL(H) | RSHFT(T) | RALT(S) | RGUI(N) |
|
||||
// | G | X | J | K | | R | M | F | P |
|
||||
// | RET | NAV(SPC) | | SYM(BSPC) | CONF(ESC) |
|
||||
bindings = <
|
||||
&kp B &kp Y &kp O &kp U &none &none &kp L &kp D &kp W &kp V
|
||||
&mt LGUI C &mt LALT I &mt LSHFT E &mt LCTRL A &none &none &mt RCTRL H &mt RSHFT T &mt RALT S &mt RGUI N
|
||||
&kp G &kp X &kp J &kp K &none &none &kp R &kp M &kp F &kp P
|
||||
&kp RET < NAVFN SPACE < SYMNUM BSPC < CONFIG ESC
|
||||
>;
|
||||
sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp C_VOL_UP C_VOL_DN>;
|
||||
};
|
||||
|
||||
symnum_layer {
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// | | ` | \ | / | | 1 | 2 | 3 | 4 |
|
||||
// | LGUI(') | LALT(-) | LSHFT(,) | LCTRL(.) | | RCTRL(5) | RSHFT(6) | RALT(7) | RGUI(8) |
|
||||
// | = | ; | [ | ] | | 9 | 0 | Z | Q |
|
||||
// | SAVE | TAB | | | |
|
||||
bindings = <
|
||||
&none &kp GRAVE &kp BSLH &kp FSLH &none &none &kp N1 &kp N2 &kp N3 &kp N4
|
||||
&mt LGUI SQT &mt LALT MINUS &mt LSHFT COMMA &mt LCTRL DOT &none &none &mt RCTRL N5 &mt RSHFT N6 &mt RALT N7 &mt RGUI N8
|
||||
&kp EQUAL &kp SEMI &kp LBKT &kp RBKT &none &none &kp N9 &kp N0 &kp Z &kp Q
|
||||
&save &kp TAB &trans &none
|
||||
>;
|
||||
};
|
||||
|
||||
navfn_layer {
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// | | | | | | F1 | F2 | F3 | F4 |
|
||||
// | LGUI(LFT) | LALT(DWN) | LSHFT(UP) | LCTRL(RGT) | | RCTRL(F5) | RSHFT(F6) | RALT(F7) | RGUI(F8) |
|
||||
// | HOME | PGDN | PGUP | END | | F9 | F10 | F11 | F12 |
|
||||
// | | | | DEL | |
|
||||
bindings = <
|
||||
&none &none &none &none &none &none &kp F1 &kp F2 &kp F3 &kp F4
|
||||
&mt LGUI LEFT &mt LALT DOWN &mt LSHFT UP &mt LCTRL RIGHT &none &none &mt RCTRL F5 &mt RSHFT F6 &mt RALT F7 &mt RGUI F8
|
||||
&kp HOME &kp PG_DN &kp PG_UP &kp END &none &none &kp F9 &kp F10 &kp F11 &kp F12
|
||||
&none &trans &kp DEL &caps_word
|
||||
>;
|
||||
};
|
||||
|
||||
config_layer {
|
||||
// -----------------------------------------------------------------------------------------
|
||||
// | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ | | BT1 | BT2 | BT3 | BT4 |
|
||||
// | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI+ | | BT5 | | | |
|
||||
// | | | | RGB TOG | | BT CLR | | | RESET |
|
||||
// | | | | | |
|
||||
bindings = <
|
||||
&rgb_ug RGB_BRI &rgb_ug RGB_SAI &rgb_ug RGB_HUI &rgb_ug RGB_EFF &none &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3
|
||||
&rgb_ug RGB_BRD &rgb_ug RGB_SAD &rgb_ug RGB_HUD &rgb_ug RGB_EFR &none &none &bt BT_SEL 4 &none &none &none
|
||||
&none &none &none &rgb_ug RGB_TOG &none &none &bt BT_CLR &none &out OUT_TOG &reset
|
||||
&trans &trans &trans &trans
|
||||
>;
|
||||
|
||||
sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
9
app/boards/shields/reviung34/Kconfig.defconfig
Normal file
9
app/boards/shields/reviung34/Kconfig.defconfig
Normal file
|
@ -0,0 +1,9 @@
|
|||
# Copyright (c) 2020 The ZMK Contributors
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
if SHIELD_REVIUNG34
|
||||
|
||||
config ZMK_KEYBOARD_NAME
|
||||
default "Reviung34"
|
||||
|
||||
endif
|
6
app/boards/shields/reviung34/Kconfig.shield
Normal file
6
app/boards/shields/reviung34/Kconfig.shield
Normal file
|
@ -0,0 +1,6 @@
|
|||
|
||||
# Copyright (c) 2020 The ZMK Contributors
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
config SHIELD_REVIUNG34
|
||||
def_bool $(shields_list_contains,reviung34)
|
31
app/boards/shields/reviung34/boards/nice_nano_v2.overlay
Normal file
31
app/boards/shields/reviung34/boards/nice_nano_v2.overlay
Normal file
|
@ -0,0 +1,31 @@
|
|||
#include <dt-bindings/led/led.h>
|
||||
|
||||
&spi1 {
|
||||
compatible = "nordic,nrf-spim";
|
||||
status = "okay";
|
||||
mosi-pin = <6>;
|
||||
// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
|
||||
sck-pin = <5>;
|
||||
miso-pin = <7>;
|
||||
|
||||
led_strip: ws2812@0 {
|
||||
compatible = "worldsemi,ws2812-spi";
|
||||
label = "WS2812";
|
||||
|
||||
/* SPI */
|
||||
reg = <0>; /* ignored, but necessary for SPI bindings */
|
||||
spi-max-frequency = <4000000>;
|
||||
|
||||
/* WS2812 */
|
||||
chain-length = <9>; /* arbitrary; change at will */
|
||||
spi-one-frame = <0x70>;
|
||||
spi-zero-frame = <0x40>;
|
||||
color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
|
||||
};
|
||||
};
|
||||
|
||||
/ {
|
||||
chosen {
|
||||
zmk,underglow = &led_strip;
|
||||
};
|
||||
};
|
3
app/boards/shields/reviung34/reviung34.conf
Normal file
3
app/boards/shields/reviung34/reviung34.conf
Normal file
|
@ -0,0 +1,3 @@
|
|||
# Uncomment the following lines to enable RGB underglow
|
||||
# CONFIG_ZMK_RGB_UNDERGLOW=y
|
||||
# CONFIG_WS2812_STRIP=y
|
92
app/boards/shields/reviung34/reviung34.keymap
Normal file
92
app/boards/shields/reviung34/reviung34.keymap
Normal file
|
@ -0,0 +1,92 @@
|
|||
/*
|
||||
* Copyright (c) 2020 The ZMK Contributors
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#include <behaviors.dtsi>
|
||||
#include <dt-bindings/zmk/keys.h>
|
||||
#include <dt-bindings/zmk/bt.h>
|
||||
#include <dt-bindings/zmk/rgb.h>
|
||||
#include <dt-bindings/zmk/outputs.h>
|
||||
|
||||
|
||||
|
||||
#define DEFAULT 0
|
||||
#define SYMNUM 1
|
||||
#define NAVFN 2
|
||||
#define CONFIG 3
|
||||
|
||||
&mt {
|
||||
tapping-term-ms = <165>;
|
||||
};
|
||||
|
||||
/ {
|
||||
macros {
|
||||
ZMK_MACRO(save,
|
||||
wait-ms = <30>;
|
||||
tap-ms = <40>;
|
||||
bindings = <¯o_tap &kp ESC &kp COLON &kp W &kp RET>;
|
||||
)
|
||||
};
|
||||
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
|
||||
default_layer {
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// | B | Y | O | U | | L | D | W | V |
|
||||
// | LGUI(C) | LALT(I) | LSHFT(E) | LCTRL(A) | | RCTRL(H) | RSHFT(T) | RALT(S) | RGUI(N) |
|
||||
// | G | X | J | K | | R | M | F | P |
|
||||
// | RET | NAV(SPC) | | SYM(BSPC) | CONF(ESC) |
|
||||
bindings = <
|
||||
&kp B &kp Y &kp O &kp U &none &none &kp L &kp D &kp W &kp V
|
||||
&mt LGUI C &mt LALT I &mt LSHFT E &mt LCTRL A &none &none &mt RCTRL H &mt RSHFT T &mt RALT S &mt RGUI N
|
||||
&kp G &kp X &kp J &kp K &none &none &kp R &kp M &kp F &kp P
|
||||
&kp RET < NAVFN SPACE < SYMNUM BSPC < CONFIG ESC
|
||||
>;
|
||||
};
|
||||
|
||||
symnum_layer {
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// | | ` | \ | / | | 1 | 2 | 3 | 4 |
|
||||
// | LGUI(') | LALT(-) | LSHFT(,) | LCTRL(.) | | RCTRL(5) | RSHFT(6) | RALT(7) | RGUI(8) |
|
||||
// | = | ; | [ | ] | | 9 | 0 | Z | Q |
|
||||
// | SAVE | TAB | | | |
|
||||
bindings = <
|
||||
&none &kp GRAVE &kp BSLH &kp FSLH &none &none &kp N1 &kp N2 &kp N3 &kp N4
|
||||
&mt LGUI SQT &mt LALT MINUS &mt LSHFT COMMA &mt LCTRL DOT &none &none &mt RCTRL N5 &mt RSHFT N6 &mt RALT N7 &mt RGUI N8
|
||||
&kp EQUAL &kp SEMI &kp LBKT &kp RBKT &none &none &kp N9 &kp N0 &kp Z &kp Q
|
||||
&save &kp TAB &trans &none
|
||||
>;
|
||||
};
|
||||
|
||||
navfn_layer {
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// | | | | | | F1 | F2 | F3 | F4 |
|
||||
// | LGUI(LFT) | LALT(DWN) | LSHFT(UP) | LCTRL(RGT) | | RCTRL(F5) | RSHFT(F6) | RALT(F7) | RGUI(F8) |
|
||||
// | HOME | PGDN | PGUP | END | | F9 | F10 | F11 | F12 |
|
||||
// | | | | DEL | |
|
||||
bindings = <
|
||||
&none &none &none &none &none &none &kp F1 &kp F2 &kp F3 &kp F4
|
||||
&mt LGUI LEFT &mt LALT DOWN &mt LSHFT UP &mt LCTRL RIGHT &none &none &mt RCTRL F5 &mt RSHFT F6 &mt RALT F7 &mt RGUI F8
|
||||
&kp HOME &kp PG_DN &kp PG_UP &kp END &none &none &kp F9 &kp F10 &kp F11 &kp F12
|
||||
&none &trans &kp DEL &caps_word
|
||||
>;
|
||||
};
|
||||
|
||||
config_layer {
|
||||
// -----------------------------------------------------------------------------------------
|
||||
// | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ | | BT1 | BT2 | BT3 | BT4 |
|
||||
// | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI+ | | BT5 | | | |
|
||||
// | | | | RGB TOG | | BT CLR | | | RESET |
|
||||
// | | | | | |
|
||||
bindings = <
|
||||
&rgb_ug RGB_BRI &rgb_ug RGB_SAI &rgb_ug RGB_HUI &rgb_ug RGB_EFF &none &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3
|
||||
&rgb_ug RGB_BRD &rgb_ug RGB_SAD &rgb_ug RGB_HUD &rgb_ug RGB_EFR &none &none &bt BT_SEL 4 &none &none &none
|
||||
&none &none &none &rgb_ug RGB_TOG &none &none &bt BT_CLR &none &out OUT_TOG &reset
|
||||
&trans &trans &trans &trans
|
||||
>;
|
||||
};
|
||||
};
|
||||
};
|
53
app/boards/shields/reviung34/reviung34.overlay
Normal file
53
app/boards/shields/reviung34/reviung34.overlay
Normal file
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
* Copyright (c) 2020 The ZMK Contributors
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#include <dt-bindings/zmk/matrix_transform.h>
|
||||
|
||||
/ {
|
||||
chosen {
|
||||
zmk,kscan = &kscan0;
|
||||
zmk,matrix_transform = &default_transform;
|
||||
};
|
||||
|
||||
default_transform: keymap_transform_0 {
|
||||
compatible = "zmk,matrix-transform";
|
||||
columns = <10>;
|
||||
rows = <4>;
|
||||
|
||||
map = <
|
||||
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(3,9)
|
||||
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(3,6)
|
||||
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(3,7)
|
||||
RC(3,2) RC(3,3) RC(3,4) RC(3,8)
|
||||
>;
|
||||
};
|
||||
|
||||
kscan0: kscan_0 {
|
||||
compatible = "zmk,kscan-gpio-matrix";
|
||||
label = "KSCAN";
|
||||
diode-direction = "col2row";
|
||||
|
||||
col-gpios
|
||||
= <&pro_micro 4 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 5 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 6 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 7 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 8 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 9 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 14 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 16 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 10 GPIO_ACTIVE_HIGH>
|
||||
, <&pro_micro 15 GPIO_ACTIVE_HIGH>
|
||||
;
|
||||
|
||||
row-gpios
|
||||
= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||
, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||
, <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||
, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||
;
|
||||
};
|
||||
};
|
9
app/boards/shields/reviung34/reviung34.zmk.yml
Normal file
9
app/boards/shields/reviung34/reviung34.zmk.yml
Normal file
|
@ -0,0 +1,9 @@
|
|||
file_format: "1"
|
||||
id: reviung34
|
||||
name: REVIUNG34
|
||||
type: shield
|
||||
url: https://github.com/gtips/reviung/tree/master/reviung34
|
||||
requires: [pro_micro]
|
||||
features:
|
||||
- keys
|
||||
- underglow
|
Loading…
Add table
Reference in a new issue