diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi index 86eded3..3775d1a 100644 --- a/config/boards/shields/wyld_dm/wyld_dm.dtsi +++ b/config/boards/shields/wyld_dm/wyld_dm.dtsi @@ -51,14 +51,14 @@ // >; map = < - RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) - RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) - RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(4,8) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) - RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) - RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,9) RC(4,10) RC(4,11) RC(4,12) - RC(5,2) RC(5,1) RC(5,13) - RC(5,4) RC(5,0) RC(5,12) - RC(5,3) RC(5,6) RC(5,10) + 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(0,9) RC(0,10) RC(0,11) + 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(1,9) RC(1,10) RC(1,11) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(4,4) RC(4,7) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) + RC(3,0) RC(3,1) 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(4,2) RC(4,3) RC(4,8) RC(4,9) + RC(5,2) RC(5,1) RC(5,8) + RC(5,4) RC(5,0) RC(5,7) + RC(5,3) RC(5,6) RC(5,6) >; }; @@ -68,26 +68,6 @@ // label = "KSCAN"; diode-direction = "col2row"; - // expander pins -// row-gpios -// = <&expander 9 (GPIO_ACTIVE_LOW)> -// , <&expander 10 (GPIO_ACTIVE_LOW)> -// , <&expander 11 (GPIO_ACTIVE_LOW)> -// , <&expander 12 (GPIO_ACTIVE_LOW)> -// , <&expander 13 (GPIO_ACTIVE_LOW)> -// , <&expander 14 (GPIO_ACTIVE_LOW)> -// ; - - - // PILLBUG PINS - // row-gpios - // = <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // PB1 / 1.11 - // , <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // PB0 / 1.09 - // , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // PA4 / 1.11 - // , <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // PA3 / 0.31 - // , <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // PA2 / 1.15 - // , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // PA1 / 0.29 - // ; // NANO V2 PINS row-gpios @@ -101,46 +81,32 @@ }; -// left_encoder: encoder_left { -// compatible = "alps,ec11"; -// label = "LEFT_ENCODER"; -// a-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; -// b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; -// steps = <60>; -// status = "disabled"; -// }; -// -// right_encoder: encoder_right { -// compatible = "alps,ec11"; -//// label = "RIGHT_ENCODER"; -// a-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; -// b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; -// steps = <60>; -// status = "disabled"; -// }; -// -// sensors: sensors { -// compatible = "zmk,keymap-sensors"; -// sensors = <&right_encoder>, <&right_encoder>; -// triggers-per-rotation = <15>; -// }; + left_encoder: encoder_left { + compatible = "alps,ec11"; + label = "LEFT_ENCODER"; + a-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + steps = <60>; + status = "disabled"; + }; + + right_encoder: encoder_right { + compatible = "alps,ec11"; + label = "RIGHT_ENCODER"; + a-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + steps = <60>; + status = "disabled"; + }; + + sensors: sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&right_encoder>, <&left_encoder>; + triggers-per-rotation = <15>; + }; }; &pinctrl { -// spi1_default: spi1_default { -// group1 { -// psels = , -// ; -// }; -// }; -// -// spi3_sleep: spi3_sleep { -// group1 { -// psels = , -// ; -// low-power-enable; -// }; -// }; spi3_default: spi3_default { group1 { @@ -158,39 +124,6 @@ }; }; -//&pinctrl { -//// spi1_default: spi1_default { -//// group1 { -//// psels = , -//// , -//// ; -//// }; -//// }; -//// -//// spi1_sleep: spi1_sleep { -//// group1 { -//// psels = , -//// , -//// ; -//// low-power-enable; -//// }; -//// }; -// -//// spi3_default: spi3_default { -//// group1 { -//// psels = , -//// ; -//// }; -//// }; -//// -//// spi3_sleep: spi3_sleep { -//// group1 { -//// psels = , -//// ; -//// low-power-enable; -//// }; -//// }; -//}; &spi3 { compatible = "nordic,nrf-spim"; diff --git a/config/boards/shields/wyld_dm/wyld_dm_left.overlay b/config/boards/shields/wyld_dm/wyld_dm_left.overlay index 644762f..eb6ab3e 100644 --- a/config/boards/shields/wyld_dm/wyld_dm_left.overlay +++ b/config/boards/shields/wyld_dm/wyld_dm_left.overlay @@ -43,9 +43,9 @@ nice_view_spi: &spi0 { cs-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; }; -//&left_encoder { -// status = "okay"; -//}; +&left_encoder { + status = "okay"; +}; diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.overlay b/config/boards/shields/wyld_dm/wyld_dm_right.overlay index df03c67..fdebcd7 100644 --- a/config/boards/shields/wyld_dm/wyld_dm_right.overlay +++ b/config/boards/shields/wyld_dm/wyld_dm_right.overlay @@ -22,9 +22,9 @@ ; }; -//&right_encoder { -// status = "okay"; -//}; +&right_encoder { + status = "okay"; +}; &pinctrl { spi0_default: spi0_default { diff --git a/config/wyld_dm.keymap b/config/wyld_dm.keymap index f483a17..839826e 100644 --- a/config/wyld_dm.keymap +++ b/config/wyld_dm.keymap @@ -29,67 +29,67 @@ display-name = "QWERTY"; bindings = < - &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT - &kp CAPS &kp A &kp S &kp D &kp F &kp G &kp K_MUTE &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 N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT - &kp LCTRL &kp LGUI &kp LBKT &kp RBKT &kp EQUAL &kp PLUS &kp RGUI &kp RCTRL - &mo RAISE &kp SPACE &mo LOWER - &kp TAB &kp DEL &kp ENTER - &mkp LCLK &mkp RCLK &kp BSPC + &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT + &kp CAPS &kp A &kp S &kp D &kp F &kp G &kp K_HOME &kp K_MUTE &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 N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT + &kp LBKT &kp RBKT &kp EQUAL &kp PLUS + &mo RAISE &kp SPACE &mo LOWER + &kp TAB &kp DEL &kp ENTER + &mkp LCLK &mkp RCLK &kp BSPC >; -// sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>, <&inc_dec_kp C_VOL_DN C_VOL_UP>; }; lower_layer { display-name = "LOWER"; bindings = < - &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 - &kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp F12 - &bootloader &rgb_ug RGB_ON &rgb_ug RGB_OFF &rgb_ug RGB_EFF &rgb_ug RGB_EFR &trans &kp HOME &trans &kp MINUS &kp KP_PLUS &kp LBRC &kp RBRC &bootloader - &trans &ext_power EP_ON &ext_power EP_OFF &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans - &trans &trans &trans - &trans &trans &trans + &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 + &kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp F12 + &bootloader &rgb_ug RGB_ON &rgb_ug RGB_OFF &rgb_ug RGB_EFF &rgb_ug RGB_EFR &trans &kp K_HOME &kp K_MUTE &trans &kp MINUS &kp KP_PLUS &kp LBRC &kp RBRC &bootloader + &trans &ext_power EP_ON &ext_power EP_OFF &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans + &trans &trans &trans + &trans &trans &trans + &trans &trans &trans >; -// sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>, <&inc_dec_kp C_VOL_DN C_VOL_UP>; }; raise_layer { display-name = "RAISE"; bindings = < - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &out OUT_BLE &out OUT_USB &trans &trans &trans &trans - &trans &trans &trans &trans &trans &kp LBKT &kp RBKT &trans &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_DIVIDE - &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp PGUP &kp LPAR &kp K_MUTE &kp RPAR &trans &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_MULTIPLY - &trans &trans &trans &trans &kp PGDN &trans &trans &trans &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_MINUS - &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans - &trans &trans &trans - &trans &trans &trans + &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &out OUT_BLE &out OUT_USB &trans &trans &trans &trans + &trans &trans &trans &trans &trans &kp LBKT &kp RBKT &trans &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_DIVIDE + &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp PGUP &kp LPAR &kp K_HOME &kp K_MUTE &kp RPAR &trans &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_MULTIPLY + &trans &trans &trans &trans &kp PGDN &trans &trans &trans &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_MINUS + &trans &trans &trans &trans + &trans &trans &trans + &trans &trans &trans + &trans &trans &trans >; -// sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>, <&inc_dec_kp C_VOL_DN C_VOL_UP>; }; mouse_layer { display-name = "MOUSE"; bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &mkp LCLK &mkp RCLK &trans &kp K_MUTE &trans &mkp LCLK &mkp RCLK &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans - &trans &trans &trans - &mkp LCLK &mkp RCLK &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &mkp LCLK &mkp RCLK &trans &kp K_HOME &kp K_MUTE &trans &mkp LCLK &mkp RCLK &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans + &trans &trans &trans + &trans &trans &trans + &mkp LCLK &mkp RCLK &trans >; -// sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>, <&inc_dec_kp C_VOL_DN C_VOL_UP>; }; }; };