Update for the 0.9 firmware

MickiusMousius · Oct 11, 2023 · 37a9be9 · 37a9be9
1 parent dc7586b
commit 37a9be9
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 11 deletions.
diff --git a/build.yaml b/build.yaml
@@ -17,5 +17,5 @@ include:
  shield: rolio_left nice_view_adapter nice_view
  - board: nice_nano_v2
  shield: rolio_right nice_view_adapter nice_view
-  #- board: nice_nano_v2
- #shield: settings_reset
+ - board: nice_nano_v2
+ shield: settings_reset
diff --git a/config/boards/shields/rolio/rolio.dtsi b/config/boards/shields/rolio/rolio.dtsi
@@ -25,7 +25,7 @@
 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(3,0) RC(3,11) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
- 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,2) RC(3,3) RC(3,4) RC(3,5) RC(3,1) RC(3,10) RC(3,6) RC(3,7) RC(3,8) RC(3,9)
  >;
  };
 

diff --git a/config/boards/shields/rolio/rolio.keymap b/config/boards/shields/rolio/rolio.keymap
@@ -85,10 +85,53 @@
  tapping-term-ms = <200>;
  bindings = <&kp RGUI>, <&tog WINDOWS>;
  };
+ // Backspace a whole word when holding backspace
+ backspace_word: backspace_word {
+ compatible = "zmk,behavior-hold-tap";
+ label = "BACKSPACE_WORD";
+ #binding-cells = <2>;
+ tapping_term_ms = <135>;
+ quick_tap_ms = <0>;
+ flavor = "tap-preferred";
+ bindings = <&bsp_word>, <&kp>;
+ };
+ w_backspace_word: w_backspace_word {
+ compatible = "zmk,behavior-hold-tap";
+ label = "WINDOWS_BACKSPACE_WORD";
+ #binding-cells = <2>;
+ tapping_term_ms = <135>;
+ quick_tap_ms = <0>;
+ flavor = "tap-preferred";
+ bindings = <&w_bsp_word>, <&kp>;
+ };
+ //Mac OS Zoom
+ mac_zoom: mac_zoom {
+ compatible = "zmk,behavior-sensor-rotate";
+ label = "MAC_ZOOM";
+ #sensor-binding-cells = <0>;
+ bindings = <&zoom_in>, <&zoom_out>;
+ };
+ //Windows OS Zoom
+ win_zoom: win_zoom {
+ compatible = "zmk,behavior-sensor-rotate";
+ label = "WINDOWS_ZOOM";
+ #sensor-binding-cells = <0>;
+ bindings = <&w_zoom_in>, <&w_zoom_out>;
+ };
  };
 
 
  macros {
+ unindent: unindent {
+ label = "UNINDENT";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LSHIFT>
+ , <&macro_tap &kp TAB>
+ , <&macro_release &kp LSHIFT>
+ ;
+ };
  lstart: lstart {
  label = "Line_Start";
  compatible = "zmk,behavior-macro";
@@ -167,6 +210,89 @@
  , <&macro_release &kp LGUI>
  ;
  };
+ // Word backspace macros
+ bsp_word: bsp_word {
+ label = "BSP_WORD";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LALT>
+ , <&macro_tap &kp BSPC>
+ , <&macro_release &kp LALT>
+ ;
+ };
+ w_bsp_word: w_bsp_word {
+ label = "W_BSP_WORD";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LCTRL>
+ , <&macro_tap &kp BSPC>
+ , <&macro_release &kp LCTRL>
+ ;
+ };
+ // Zoom macros
+ zoom_in: zoom_in {
+ label = "ZOOM_IN";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LGUI>
+ , <&macro_tap &kp EQUAL>
+ , <&macro_release &kp LGUI>
+ ;
+ };
+ zoom_out: zoom_out {
+ label = "ZOOM_OUT";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LGUI>
+ , <&macro_tap &kp MINUS>
+ , <&macro_release &kp LGUI>
+ ;
+ };
+ reset_zoom: reset_zoom {
+ label = "RESET_ZOOM";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LGUI>
+ , <&macro_tap &kp N0>
+ , <&macro_release &kp LGUI>
+ ;
+ };
+ w_zoom_in: w_zoom_in {
+ label = "WINDOWS_ZOOM_IN";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LCTRL>
+ , <&macro_tap &kp EQUAL>
+ , <&macro_release &kp LCTRL>
+ ;
+ };
+ w_zoom_out: w_zoom_out {
+ label = "WINDOWS_ZOOM_OUT";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LCTRL>
+ , <&macro_tap &kp MINUS>
+ , <&macro_release &kp LCTRL>
+ ;
+ };
+ w_reset_zoom: w_reset_zoom {
+ label = "WINDOWS_RESET_ZOOM";
+ compatible = "zmk,behavior-macro";
+ #binding-cells = <0>;
+ bindings
+ = <&macro_press &kp LCTRL>
+ , <&macro_tap &kp N0>
+ , <&macro_release &kp LCTRL>
+ ;
+ };
+
  };
 
 
@@ -179,11 +305,11 @@
  bindings = <
 //---------------------------------------------------------------+ +---------------------------------------------------------------//
 // | | | | | | | | | | | | // 
- &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
+ &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &backspace_word 0 BSPC
 // | | | | | | | | | | | | //
  &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
 // | | | | | +-----------+ +-----------| | | | | | //
- &td2 &kp Z &kp X &kp C &kp V &kp B &kp F15 &kp F14 &kp N &kp M &kp COMMA &kp DOT &kp FSLH &td3
+ &td2 &kp Z &kp X &kp C &kp V &kp B &kp F16 &kp F17 &kp N &kp M &kp COMMA &kp DOT &kp FSLH &td3
 //--------------------| | | | | | | | | | |--------------------------------// 
  &kp LALT &kp LCTRL &td4 &td0 &kp ENTER &kp SPACE &td1 &td5 &kp RCTRL &kp DEL
 // +----------|-----------|----------|--------------------+ +-----------|-------|--------|-----------|---------+ //
@@ -192,15 +318,15 @@
 
  f_keys_layer {
  label = "F Keys";
- sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PLUS MINUS>;
+ sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &mac_zoom>;
  bindings = <
 //-------------------------------------------------------------------------------+ +-------------------------------------------------------------------//
 // | | | | | | | | | | | | // 
  &kp ESCAPE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11
 // | | | | | | | | | | | | // 
-  &trans  &bt BT_PRV &bt BT_NXT &kp C_PREV &kp C_PP &kp C_NEXT &lstart &kp UP &lend &scrsh &kp PG_UP &kp F12
+ &unindent &bt BT_PRV &bt BT_NXT &kp C_PREV &kp C_PP &kp C_NEXT &lstart &kp UP &lend &scrsh &kp PG_UP &kp F12
 // | | | | | +-------------+ +--------+ | | | | | // 
- &trans &bl BL_TOG &bl BL_SET 2 &kp C_VOL_DN &kp C_MUTE &kp C_VOL_UP &kp C_MUTE  &kp F16  &kp LEFT &kp DOWN &kp RIGHT &scrcr &kp PG_DN &kp F13
+ &trans &bl BL_TOG &bl BL_SET 2 &kp C_VOL_DN &kp C_MUTE &kp C_VOL_UP &kp C_MUTE &reset_zoom &kp LEFT &kp DOWN &kp RIGHT &scrcr &kp PG_DN &kp F13
 //-----------------------| | | | | | | | | | | |-----------------------// 
  &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
 // +------------|--------------|------------|--------------|-------------+ +--------|----------|----------|-----------|---------+ //
@@ -231,7 +357,7 @@
  bindings = <
 //-----------------------------------------------------------------+ +------------------------------------------------------------------//
 // | | | | | | | | | | | | // 
- &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &w_backspace_word 0 BSPC
 // | | | | | | | | | | | | //
  &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
 // | | | | | +--------+ +---------| | | | | | // 
@@ -244,15 +370,15 @@
 
  windows_fkeys_layer {
  label = "F Keys";
- sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PLUS MINUS>;
+ sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &win_zoom>;
  bindings = <
 //-----------------------------------------------------------------+ +------------------------------------------------------------------//
 // | | | | | | | | | | | | // 
  &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
 // | | | | | | | | | | | | //
  &trans &trans &trans &trans &trans &trans &kp HOME &trans &kp END &kp PSCRN &trans &trans
 // | | | | | +--------+ +---------| | | | | | // 
- &trans &trans &trans &trans &trans &trans &trans  &trans  &trans &trans &trans &wscrcr &trans &trans
+ &trans &trans &trans &trans &trans &trans &trans &w_reset_zoom &trans &trans &trans &wscrcr &trans &trans
 //---------------------| | | | | | | | | | | |----------------------//
  &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
 // +----------|----------|----------|----------|--------+ +----------|---------|----------|----------|----------+ //

diff --git a/config/rolio.conf b/config/rolio.conf
@@ -26,3 +26,4 @@ CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y
 CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_20=y
 CONFIG_LV_FONT_DEFAULT_MONTSERRAT_20=y
 CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y
+CONFIG_ZMK_WIDGET_WPM_STATUS=y