Merge commit '6f8157427060ec97d63a37b1b0bbb3d7425280ff' into corne

config/corne.keymap

@@ -9,16 +9,16 @@
 #include <dt-bindings/zmk/bt.h>
 
 /* Global */
-#include "os/all/times.dtsi"
-#include "os/all/general.dtsi"
-#include "os/windows/layers.dtsi"
+#include "os/shared/times.dtsi"
+#include "os/shared/general.dtsi"
 #include "os/macos/layers.dtsi"
+#include "os/windows/layers.dtsi"
 #include "os/android/layers.dtsi"
 
 /* Keys */
-#include "os/all/keys.dtsi"
-#include "os/windows/keys.dtsi"
+#include "os/shared/keys.dtsi"
 #include "os/macos/keys.dtsi"
+#include "os/windows/keys.dtsi"
 #include "os/android/keys.dtsi"
 
 /* Helpers */
@@ -28,17 +28,17 @@
 
 / {
     macros {
-        #include "os/all/macros/layers.dtsi"
-        #include "os/all/macros/settings.dtsi"
-
-        #include "os/windows/macros/layers.dtsi"
-        #include "os/windows/macros/int.dtsi"
-        #include "os/windows/macros/dev.dtsi"
+        #include "os/shared/macros/layers.dtsi"
+        #include "os/shared/macros/settings.dtsi"
 
         #include "os/macos/macros/layers.dtsi"
         #include "os/macos/macros/int.dtsi"
         #include "os/macos/macros/dev.dtsi"
 
+        #include "os/windows/macros/layers.dtsi"
+        #include "os/windows/macros/int.dtsi"
+        #include "os/windows/macros/dev.dtsi"
+
         #include "os/android/macros/layers.dtsi"
         #include "os/android/macros/int.dtsi"
         #include "os/android/macros/dev.dtsi"
@@ -48,19 +48,9 @@
 
 / {
     behaviors {
-        #include "os/all/morph/shared.dtsi"
-        #include "os/all/morph/num.dtsi"
-        #include "os/all/hold/shared.dtsi"
-
-        #include "os/windows/morph/layers.dtsi"
-        #include "os/windows/morph/base.dtsi"
-        #include "os/windows/morph/int.dtsi"
-        #include "os/windows/morph/actions.dtsi"
-        #include "os/windows/morph/dev.dtsi"
-        #include "os/windows/morph/settings.dtsi"
-        #include "os/windows/hold/layers.dtsi"
-        #include "os/windows/hold/base.dtsi"
-        #include "os/windows/hold/dev.dtsi"
+        #include "os/shared/morph/shared.dtsi"
+        #include "os/shared/morph/num.dtsi"
+        #include "os/shared/hold/shared.dtsi"
 
         #include "os/macos/morph/layers.dtsi"
         #include "os/macos/morph/base.dtsi"
@@ -73,6 +63,16 @@
         #include "os/macos/hold/dev.dtsi"
         #include "os/macos/hold/settings.dtsi"
 
+        #include "os/windows/morph/layers.dtsi"
+        #include "os/windows/morph/base.dtsi"
+        #include "os/windows/morph/int.dtsi"
+        #include "os/windows/morph/actions.dtsi"
+        #include "os/windows/morph/dev.dtsi"
+        #include "os/windows/morph/settings.dtsi"
+        #include "os/windows/hold/layers.dtsi"
+        #include "os/windows/hold/base.dtsi"
+        #include "os/windows/hold/dev.dtsi"
+
         #include "os/android/morph/layers.dtsi"
         #include "os/android/morph/base.dtsi"
         #include "os/android/morph/int.dtsi"
@@ -86,12 +86,12 @@
     combos {
         compatible = "zmk,combos";
 
-        #include "os/windows/combos/base.dtsi"
-        #include "os/windows/combos/help.dtsi"
-
         #include "os/macos/combos/base.dtsi"
         #include "os/macos/combos/help.dtsi"
 
+        #include "os/windows/combos/base.dtsi"
+        #include "os/windows/combos/help.dtsi"
+
         #include "os/android/combos/base.dtsi"
     };
 };
@@ -100,8 +100,8 @@
     keymap {
         compatible = "zmk,keymap";
 
-        #include "os/windows/keymap.dtsi"
         #include "os/macos/keymap.dtsi"
+        #include "os/windows/keymap.dtsi"
         #include "os/android/keymap.dtsi"
     };
 };

config/os/all/macros/settings.dtsi → config/os/shared/macros/settings.dtsi

@@ -2,28 +2,28 @@ m_s_b1: macro_stg_bluetooth_1 {
     compatible = "zmk,behavior-macro";
     #binding-cells = <0>;
     bindings =
-        <&bt BT_SEL 0 &to_wBAS>;
+        <&bt BT_SEL 0 &to_mBAS>;
 };
 
 m_s_b2: macro_stg_bluetooth_2 {
     compatible = "zmk,behavior-macro";
     #binding-cells = <0>;
     bindings =
-        <&bt BT_SEL 1 &to_wBAS>;
+        <&bt BT_SEL 1 &to_mBAS>;
 };
 
 m_s_b3: macro_stg_bluetooth_3 {
     compatible = "zmk,behavior-macro";
     #binding-cells = <0>;
     bindings =
-        <&bt BT_SEL 2 &to_mBAS>;
+        <&bt BT_SEL 2 &to_sBAS>;
 };
 
 m_s_b4: macro_stg_bluetooth_4 {
     compatible = "zmk,behavior-macro";
     #binding-cells = <0>;
     bindings =
-        <&bt BT_SEL 3 &to_mBAS>;
+        <&bt BT_SEL 3 &to_sBAS>;
 };
 
 m_s_b5: macro_stg_bluetooth_5 {
@@ -39,3 +39,15 @@ m_s_b6: macro_stg_bluetooth_6 {
     bindings =
         <&bt BT_SEL 5 &to_aBAS>;
 };
+
+// mp_sSTG_bluetooth
+MORPH_KAS(
+    s,
+    STG,
+    bluetooth,
+    rectangle,
+    MOD_LALT,
+    &none,                      // tap:   none
+    &bt BT_CLR,                 // alt: clear selected profile
+    &bt BT_CLR_ALL              // shift: clear all profiles
+)