From a371b954dfb7ea169b0eb759f387372b2c0aea1c Mon Sep 17 00:00:00 2001 From: "Chow Castro, Marcos" Date: Sat, 17 Sep 2022 21:47:39 +0200 Subject: [PATCH] test de compatibilidad con activacion de rgb --- config/corne.conf | 4 +-- config/corne.keymap | 71 +++++++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/config/corne.conf b/config/corne.conf index 6916c0f..d790dc8 100644 --- a/config/corne.conf +++ b/config/corne.conf @@ -1,6 +1,6 @@ # Uncomment the following lines to enable the Corne RGB Underglow -CONFIG_ZMK_RGB_UNDERGLOW=y -CONFIG_WS2812_STRIP=y +# CONFIG_ZMK_RGB_UNDERGLOW=y +# CONFIG_WS2812_STRIP=y # Uncomment the following line to enable the Corne OLED Display # CONFIG_ZMK_DISPLAY=y diff --git a/config/corne.keymap b/config/corne.keymap index a85c577..5efe632 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -10,7 +10,11 @@ #include #include #include -#include +// }}} +// ### ifdef CONFIG_ZMK_RGB_UNDERGLOW {{{ +#ifdef CONFIG_ZMK_RGB_UNDERGLOW +# include +# include /* * Temporarily here because nice nano v2 spi is not defined on ZMk Yet @@ -18,7 +22,6 @@ * GitHub Issue: https://github.com/zmkfirmware/zmk/issues/885 */ -#include &spi1 { compatible = "nordic,nrf-spim"; status = "okay"; @@ -48,8 +51,8 @@ zmk,underglow = &led_strip; }; }; - -// }}} +#endif // CONFIG_ZMK_RGB_UNDERGLOW +//}}} // ### definiendo capas {{{ #define DEFAULT 0 #define NUMBER 1 @@ -57,7 +60,6 @@ #define FUNCTION 3 #define MEDIA 4 #define MOUSE 5 -// < LOWER SPACE //}}} // ### definicion de teclado ALEMAN STANDARD {{{ #define DE_Y &kp Z // Y @@ -102,14 +104,14 @@ // |--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+---------| // |LT5 TAB | A | S | D | F | G | | H | J | K | L | UP | ENTER | // |--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+---------| - // |SHIFT | Y | X | C | V | B | | N | M |RSFT , | LEFT | DOWN | RIGHT | + // |SHIFT | Y | X | C | V | B | | N | M |LSFT , | LEFT | DOWN | RIGHT | // '---------------------------------------------------------| |----------------------------------------------------------' // | CTRL | CMD | ALT | | LT1 SPACE | LT2 CMD | LT3 RALT | // '--------------------------------' '----------------------------------' bindings = < < MEDIA ESC &kp Q &kp W &kp E &kp R &kp T DE_Z &kp U &kp I &kp O &kp P &kp BSPC < MOUSE TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp UP &kp RET - &kp LSHFT DE_Y &kp X &kp C &kp V &kp B &kp N &kp M &mt RSHFT COMMA &kp LEFT &kp DOWN &kp RIGHT + &kp LSHFT DE_Y &kp X &kp C &kp V &kp B &kp N &kp M &mt LSHFT COMMA &kp LEFT &kp DOWN &kp RIGHT &kp LCTRL &kp LGUI &kp RALT < NUMBER SPACE < SYMBOL RGUI < FUNCTION RALT >; }; @@ -193,42 +195,47 @@ >; }; // }}} +#ifdef CONFIG_ZMK_RGB_UNDERGLOW // ### mouse_layer {{{ mouse_layer { // .------------------------------------------------. TODO: .-------------------------------------------------. - // |RGB TOG | | |OUT_USB|OUT_BLE|OUT_TOG| | | |WH_LEFT|WH_RIGH|WH_DOWN| WH_UP | + // | | | |OUT_USB|OUT_BLE|OUT_TOG| |RGBBRI-|RGBBRI+|WH_LEFT|WH_RIGH|WH_DOWN| WH_UP | // |--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+---------| - // | |CLICK_1|CLICK_2|BT_CLR |BT_PRV | BT_NXT| | | | |CLICK_1| UP |CLICK_2 | + // | |CLICK_1|CLICK_2|BT_CLR |BT_PRV | BT_NXT| |RGBSAT-|RGBSAT+| |CLICK_1| UP |CLICK_2 | // |--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+---------| - // |BT_CLR |BT_0 |BT_1 |BT_2 |BT_3 |BT_4 | |EP_ON | EP_OFF|EP_TOG | LEFT | DOWN | RIGHT | + // |BT_CLR |BT_0 |BT_1 |BT_2 |BT_3 |BT_4 | |RGBHUE-|RGBHUE+| | LEFT | DOWN | RIGHT | // '---------------------------------------------------------| |----------------------------------------------------------' - // | CTRL | CMD | SPACE | | | | | + // |EP_ON | EP_OFF| EP_TOG | |RGB ANI-|RGB ANI+| TOG | // '--------------------------------' '--------------------------------' - // &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &none &none &none - // &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &none &none &none &none &none bindings = < - &rgb_ug RGB_TOG &none &none &out OUT_USB &out OUT_BLE &out OUT_TOG &none &none &none &none &none &none - &none &none &none &bt BT_CLR &bt BT_PRV &bt BT_NXT &none &none &none &none &none &none - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &none &none &none - &kp LCTRL &kp LGUI &kp SPACE &kp RET &kp RALT &kp LCTRL + &none &none &none &out OUT_USB &out OUT_BLE &out OUT_TOG &rgb_ug RGB_BRD &rgb_ug RGB_BRI &none &none &none &none + &none &none &none &bt BT_CLR &bt BT_PRV &bt BT_NXT &rgb_ug RGB_SAD &rgb_ug RGB_SAI &none &none &none &none + &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &rgb_ug RGB_HUD &rgb_ug RGB_HUI &none &none &none &none + &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &rgb_ug RGB_EFR &rgb_ug RGB_EFF &rgb_ug RGB_TOG >; }; // }}} +#else + // ### mouse_layer {{{ + mouse_layer { + // .------------------------------------------------. TODO: .-------------------------------------------------. + // | | | |OUT_USB|OUT_BLE|OUT_TOG| | | |WH_LEFT|WH_RIGH|WH_DOWN| WH_UP | + // |--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+---------| + // | |CLICK_1|CLICK_2|BT_CLR |BT_PRV | BT_NXT| | | | |CLICK_1| UP |CLICK_2 | + // |--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+---------| + // |BT_CLR |BT_0 |BT_1 |BT_2 |BT_3 |BT_4 | | | | | LEFT | DOWN | RIGHT | + // '---------------------------------------------------------| |----------------------------------------------------------' + // |EP_ON | EP_OFF| EP_TOG | | | | | + // '--------------------------------' '--------------------------------' + bindings = < + &none &none &none &out OUT_USB &out OUT_BLE &out OUT_TOG &none &none &none &none &none &none + &none &none &none &bt BT_CLR &bt BT_PRV &bt BT_NXT &none &none &none &none &none &none + &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &none &none &none &none &none + &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &none &none &none + >; + }; + // }}} +#endif // CONFIG_ZMK_RGB_UNDERGLOW }; }; -/* - adjust_layer { -// ----------------------------------------------------------------------------------------- -// | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ | | RGB TOG | | BT1 | BT2 | BT3 | BT4 | BT5 | BT CLR | -// | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI+ | | | | | | | | | | -// | | | | | | | | RESET | | | | | | -// | | | | | | - bindings = < - &rgb_ug RGB_BRI &rgb_ug RGB_SAI &rgb_ug RGB_HUI &rgb_ug RGB_EFF &none &rgb_ug RGB_TOG &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &rgb_ug RGB_BRD &rgb_ug RGB_SAD &rgb_ug RGB_HUD &rgb_ug RGB_EFR &none &none &none &none &none &none &none &none - &none &none &none &none &none &none &reset &none &none &none &none &none - &trans &trans &tog _ADJUST &trans &trans - >; - }; -*/ // vim: fdm=marker: