Merge remote-tracking branch 'upstream/main' into bluetooth/battery-reporting

4 files changed, 29 insertions, 15 deletions

diff --git a/app/boards/shields/qaz/Kconfig.defconfig b/app/boards/shields/qaz/Kconfig.defconfig
index f82f458..c84180b 100644
--- a/app/boards/shields/qaz/Kconfig.defconfig
+++ b/app/boards/shields/qaz/Kconfig.defconfig
@@ -1,5 +1,5 @@
- # Copyright (c) 2020 TJ Campie
- # SPDX-License-Identifier: MIT
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 if SHIELD_QAZ
 
diff --git a/app/boards/shields/qaz/Kconfig.shield b/app/boards/shields/qaz/Kconfig.shield
index 9da6077..7cc8f1e 100644
--- a/app/boards/shields/qaz/Kconfig.shield
+++ b/app/boards/shields/qaz/Kconfig.shield
@@ -1,5 +1,5 @@
-# Copyright (c) 2020 TJ Campie
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
- 
- config SHIELD_MY_BOARD
-    def_bool $(shields_list_contains,qaz)
+
+config SHIELD_QAZ
+   def_bool $(shields_list_contains,qaz)
diff --git a/app/boards/shields/qaz/qaz.keymap b/app/boards/shields/qaz/qaz.keymap
index ffa2f6c..3622972 100644
--- a/app/boards/shields/qaz/qaz.keymap
+++ b/app/boards/shields/qaz/qaz.keymap
@@ -1,16 +1,30 @@
 /*
- * Copyright (c) 2020 TJ Campie
- * 
+ * 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>
 
 #define DEFAULT 0
 #define NUM_SYM 1
 #define NAV     2
- 
+
+/ {
+    behaviors {
+        hm: homerow_mods {
+            compatible = "zmk,behavior-hold-tap";
+            label = "homerow mods";
+            #binding-cells = <2>;
+            tapping_term_ms = <225>;
+            flavor = "tap-preferred";
+            bindings = <&kp>, <&kp>;
+        };
+    };
+};
+
 / {
     keymap {
         compatible = "zmk,keymap";
@@ -18,9 +32,9 @@
         default_layer {
             bindings = <
     &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P    
-    &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp RET
+    &hm LGUI A &hm LALT S &hm LCTL D &hm LSFT F &kp G &kp H &hm RSFT J &hm RCTL K &hm RALT L &hm RGUI RET
     &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT
-    &kp LSFT &kp LGUI &kp LALT &mo NAV &kp SPC &mo NUM_SYM &kp QUOT &kp FSLH
+    &kp LSFT &kp LGUI &kp LALT &lt NAV RET &lt NUM_SYM SPC &kp COLN &kp QUOT &kp FSLH
             >;
         };
         num_sym {
@@ -34,10 +48,10 @@
 
     nav {
             bindings = <
-    &none &none &none &none &none &none &none &kp UARW &none &kp BKSP    
+    &bt BT_CLR &bt BT_NXT &bt BT_PRV &none &none &none &none &kp UARW &none &kp BKSP    
     &trans &trans &trans &trans &none &none &kp LARW &kp DARW &kp RARW &none       
     &none &none &none &none &none &none &none &none &none
-    &none &none &none &none &none &trans &trans &kp RET &trans &kp FSLH
+    &none &none &none &trans &trans &kp RET &trans &kp FSLH
             >;
         };
     };
diff --git a/app/boards/shields/qaz/qaz.overlay b/app/boards/shields/qaz/qaz.overlay
index 472005b..4e73370 100644
--- a/app/boards/shields/qaz/qaz.overlay
+++ b/app/boards/shields/qaz/qaz.overlay
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2020 TJ Campie
- * 
+ * Copyright (c) 2020 The ZMK Contributors
+ *
  * SPDX-License-Identifier: MIT
  */