Merge branch 'main' of github.com:zmkfirmware/zmk into main

app/boards/shields/iris/iris_right.overlay

@@ -12,12 +12,12 @@
 
 &kscan0 {
 	col-gpios
-		= <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
-		, <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+		= <&pro_micro_d 10 GPIO_ACTIVE_HIGH>
 		, <&pro_micro_d 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro_d 10 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
 		;
 };
 

app/boards/shields/sofle/sofle.dtsi

@@ -50,6 +50,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
         a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         resolution = <4>;
+        status = "disabled";
     };
 
     right_encoder: encoder_right {
@@ -58,6 +59,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
         a-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         resolution = <4>;
+        status = "disabled";
     };
 
     sensors {

docs/docs/feature/keymaps.md

@@ -55,7 +55,7 @@ in the stack _also_ get the event.
 ## Behavior Bindings
 
 Binding a behavior at a certain key position may include up to two extra parameters that are used to
-alter the behavior when that specific key position is activated/deactived. For example, when binding
+alter the behavior when that specific key position is activated/deactivated. For example, when binding
 the "key press" (`kp`) behavior at a certain key position, you must specific _which_ keycode should
 be used for that key position.