Compare commits

..

No commits in common. "2d2a2e50481b6bf2cd2cf1dba935610edb75e194" and "4d9e15effee0f2d73ec07fd416b8d43cca57269f" have entirely different histories.

8 changed files with 19 additions and 109 deletions

View file

@ -31,19 +31,17 @@ rm foo
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_EXPORT_COMPILE_COMMANDS=1
west build --board nice_nano -d /workspaces/zmk/app/build/settings_reset -- -DSHIELD=settings_reset west build --board nice_nano -d build/nibble -- -DSHIELD=nibble -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
west build --board nice_nano_v2 -d /workspaces/zmk/app/build/nibble -- -DSHIELD=nibble -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config west build --board nice_nano -d build/tidbit -- -DSHIELD=tidbit -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
west build --board nice_nano_v2 -d /workspaces/zmk/app/build/tidbit -- -DSHIELD=tidbit -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config west build --board nice_nano -d build/the_paintbrush_left -- -DSHIELD=the_paintbrush_left -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config
west build --board nice_nano -d /workspaces/zmk/app/build/the_paintbrush_left -- -DSHIELD=the_paintbrush_left -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config west build --board nice_nano -d build/the_paintbrush_right -- -DSHIELD=the_paintbrush_right -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config
west build --board nice_nano -d /workspaces/zmk/app/build/the_paintbrush_right -- -DSHIELD=the_paintbrush_right -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config west build --board nice_nano -d build/corne_5_col_artsey_left_big -- -DSHIELD=corne_5_col_artsey_left_big -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config
west build --board nice_nano -d /workspaces/zmk/app/build/corne_5_col_artsey_left_big -- -DSHIELD=corne_5_col_artsey_left_big -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config west build --board nice_nano -d build/corne_5_col_artsey_right_big -- -DSHIELD=corne_5_col_artsey_right_big -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config
west build --board nice_nano -d /workspaces/zmk/app/build/corne_5_col_artsey_right_big -- -DSHIELD=corne_5_col_artsey_right_big -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config
west build --board nrf52840_mdk_dongle -d build/pockettype/central -- -DSHIELD=pockettype_central -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config west build --board nrf52840_mdk_dongle -d build/pockettype/central -- -DSHIELD=pockettype_central -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
@ -51,9 +49,9 @@ west build --board nice_nano -d build/pockettype/peripheral -- -DSHIELD=pocketty
west build --board nice_nano -d build/tg4x -- -DSHIELD=tg4x -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config west build --board nice_nano -d build/tg4x -- -DSHIELD=tg4x -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
west build --board nice_nano -d /workspaces/zmk/app/build/7skb_left -- -DSHIELD=7skb_left -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config west build --board nice_nano -d build/7skb_left -- -DSHIELD=7skb_left -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
west build --board nice_nano -d /workspaces/zmk/app/build/7skb_right -- -DSHIELD=7skb_right -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config west build --board nice_nano -d build/7skb_right -- -DSHIELD=7skb_right -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
west build --board nice_nano_v2 -d build/miryoku/corne_left -- -DSHIELD=corne_left -DZMK_CONFIG=/workspaces/miryoku/config west build --board nice_nano_v2 -d build/miryoku/corne_left -- -DSHIELD=corne_left -DZMK_CONFIG=/workspaces/miryoku/config
@ -69,8 +67,6 @@ west build --board nice_nano -d build/tidbit_artsey_left -- -DSHIELD=tidbit_arts
west build --board nice_nano -d build/tidbit_artsey_right -- -DSHIELD=tidbit_artsey_right -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config west build --board nice_nano -d build/tidbit_artsey_right -- -DSHIELD=tidbit_artsey_right -DZMK_CONFIG=/workspaces/zmk-config/zmk-artsey/config
west build --board nice_nano -d /workspaces/zmk/app/build/navi10 -- -DSHIELD=navi10 -DZMK_CONFIG=/workspaces/zmk-config/kemonine/zmk-config/config
west build --board nice_nano_v2 -d build/miryoku/lily58_left -- -DSHIELD=lily58_left -DZMK_CONFIG=/workspaces/miryoku/config west build --board nice_nano_v2 -d build/miryoku/lily58_left -- -DSHIELD=lily58_left -DZMK_CONFIG=/workspaces/miryoku/config
west build --board nice_nano_v2 -d build/miryoku/lily58_right -- -DSHIELD=lily58_right -DZMK_CONFIG=/workspaces/miryoku/config west build --board nice_nano_v2 -d build/miryoku/lily58_right -- -DSHIELD=lily58_right -DZMK_CONFIG=/workspaces/miryoku/config

View file

@ -1,9 +0,0 @@
# Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT
if SHIELD_NAVI10
config ZMK_KEYBOARD_NAME
default "navi10"
endif

View file

@ -1,5 +0,0 @@
# Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT
config SHIELD_NAVI10
def_bool $(shields_list_contains,navi10)

View file

@ -1,23 +0,0 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
/ {
keymap {
compatible = "zmk,keymap";
default_layer {
bindings = <
&kp INSERT &kp HOME &kp PAGE_UP
&kp DELETE &kp END &kp PAGE_DOWN
&kp UP
&kp LEFT &kp DOWN &kp RIGHT
>;
};
};
};

View file

@ -1,47 +0,0 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <dt-bindings/zmk/matrix_transform.h>
/ {
kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
label = "KSCAN";
diode-direction = "col2row";
row-gpios
= <&pro_micro_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
;
col-gpios
= <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
, <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
;
};
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
rows = <4>;
columns = <3>;
map = <
RC(0,0) RC(0,1) RC(0,2)
RC(1,0) RC(1,1) RC(1,2)
RC(2,1)
RC(3,0) RC(3,1) RC(3,2)
>;
};
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
};

View file

@ -8,7 +8,6 @@
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/rgb.h> #include <dt-bindings/zmk/rgb.h>
#include <dt-bindings/zmk/ext_power.h> #include <dt-bindings/zmk/ext_power.h>
#include <dt-bindings/zmk/mouse.h>
#define TIMEOUT_COMBO 250 #define TIMEOUT_COMBO 250
@ -88,8 +87,8 @@
bindings = < bindings = <
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL
&trans &trans &kp PG_UP &kp HOME &kp UP &kp END &trans &trans &mkp MB1 &mmv MOVE_UP &mkp MB2 &mwh SCROLL_UP &trans &trans &trans &trans &trans &trans &kp PG_UP &kp HOME &kp UP &kp END &trans &trans &kp HOME &kp UP &kp END &kp PG_UP &trans &trans &trans &trans
&none &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &trans &trans &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mwh SCROLL_DOWN &trans &trans &trans &none &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp LEFT &kp DOWN &kp RIGHT &kp PG_DN &trans &trans &trans
&none &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&none &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
>; >;
@ -101,8 +100,8 @@
bindings = < bindings = <
&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &kp DEL &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &kp DEL
&trans &kp CAPS &kp PG_UP &kp HOME &kp UP &kp END &trans &trans &mkp MB1 &mmv MOVE_UP &mkp MB2 &mwh SCROLL_UP &trans &trans &kp INS &kp INS &trans &kp CAPS &kp PG_UP &kp HOME &kp UP &kp END &trans &trans &kp HOME &kp UP &kp END &kp PG_UP &trans &trans &kp INS &kp INS
&none &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &trans &trans &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mwh SCROLL_DOWN &trans &kp PSCRN &kp PSCRN &none &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp LEFT &kp DOWN &kp RIGHT &kp PG_DN &trans &kp PSCRN &kp PSCRN
&none &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp C_PP &none &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp C_PP
&none &trans &trans &trans &trans &trans &kp C_VOLUME_UP &kp C_VOLUME_DOWN &kp C_MUTE &trans &trans &none &trans &trans &trans &trans &trans &kp C_VOLUME_UP &kp C_VOLUME_DOWN &kp C_MUTE &trans &trans
>; >;

View file

@ -10,7 +10,6 @@
#include <dt-bindings/zmk/rgb.h> #include <dt-bindings/zmk/rgb.h>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/ext_power.h> #include <dt-bindings/zmk/ext_power.h>
#include <dt-bindings/zmk/mouse.h>
&encoder_1_top_row { &encoder_1_top_row {
status = "disabled"; status = "disabled";
@ -58,9 +57,9 @@
label = "Mouse"; label = "Mouse";
bindings = < bindings = <
&to 0 &to 2 &to 3 &to 0 &to 2 &to 3
&mkp MB1 &mmv MOVE_UP &mkp MB2 &mwh SCROLL_UP &rgb_ug RGB_COLOR_HSB(215, 100, 50) &rgb_ug RGB_COLOR_HSB(275, 100, 50) &none &kp LC(LA(TAB))
&mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mwh SCROLL_DOWN &none &none &none &kp LG(DOWN_ARROW)
&kp ESCAPE &kp LC(LA(TAB)) &kp LG(DOWN_ARROW) &none &kp ESCAPE &none &none &none
&kp C_MUTE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &none &kp C_MUTE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &none
>; >;