From 0ede549a13d6f79ef30ef6cb6e056ae94034ea8d Mon Sep 17 00:00:00 2001
From: CrossR <r.cross@lancaster.ac.uk>
Date: Thu, 3 Sep 2020 22:54:06 +0100
Subject: [PATCH 1/4] Fix Sofle build, update Intro page.

---
 app/boards/shields/sofle/sofle.dtsi | 2 ++
 docs/docs/feature/keymaps.md        | 2 +-
 docs/docs/intro.md                  | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi
index 653a772a..bff42f6f 100644
--- a/app/boards/shields/sofle/sofle.dtsi
+++ b/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 {
diff --git a/docs/docs/feature/keymaps.md b/docs/docs/feature/keymaps.md
index d991925b..56fc2cc9 100644
--- a/docs/docs/feature/keymaps.md
+++ b/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.
 
diff --git a/docs/docs/intro.md b/docs/docs/intro.md
index 29045f76..e75ca3c6 100644
--- a/docs/docs/intro.md
+++ b/docs/docs/intro.md
@@ -18,21 +18,23 @@ include:
 
 - HID Over GATT (HOG) - This is the official term for BLE HID devices
 - Keymaps and layers with basic keycodes
-- Some initial work on one "behavior", Mod-Tap
+- Mod-Tap
+- Layer Tap
 - Basic HID over USB
 - Basic consumer (media) keycodes.
 - Basic OLED display logic
 - Basic Split support
+- Basic RGB Underglow
 - Encoders
 
 ## Missing Features
 
 - One Shot
-- Layer Tap
 - Complete split support
 - Battery reporting
 - Low power mode
 - Shell over BLE
+- Macros
 
 ## Code Of Conduct
 

From 89d604b74bb3292af53dba7d67b2ae27edfed420 Mon Sep 17 00:00:00 2001
From: CrossR <r.cross@lancaster.ac.uk>
Date: Fri, 4 Sep 2020 19:31:04 +0100
Subject: [PATCH 2/4] Clarify low power mode wording.

---
 docs/docs/intro.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/intro.md b/docs/docs/intro.md
index e75ca3c6..e20f053a 100644
--- a/docs/docs/intro.md
+++ b/docs/docs/intro.md
@@ -32,7 +32,7 @@ include:
 - One Shot
 - Complete split support
 - Battery reporting
-- Low power mode
+- Low power sleep states
 - Shell over BLE
 - Macros
 

From df422e0205a63110094bf8bbe1a839ab52c97abb Mon Sep 17 00:00:00 2001
From: CrossR <r.cross@lancaster.ac.uk>
Date: Fri, 4 Sep 2020 20:45:10 +0100
Subject: [PATCH 3/4] Revert changes to Intro page.

---
 docs/docs/intro.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/docs/intro.md b/docs/docs/intro.md
index e20f053a..29045f76 100644
--- a/docs/docs/intro.md
+++ b/docs/docs/intro.md
@@ -18,23 +18,21 @@ include:
 
 - HID Over GATT (HOG) - This is the official term for BLE HID devices
 - Keymaps and layers with basic keycodes
-- Mod-Tap
-- Layer Tap
+- Some initial work on one "behavior", Mod-Tap
 - Basic HID over USB
 - Basic consumer (media) keycodes.
 - Basic OLED display logic
 - Basic Split support
-- Basic RGB Underglow
 - Encoders
 
 ## Missing Features
 
 - One Shot
+- Layer Tap
 - Complete split support
 - Battery reporting
-- Low power sleep states
+- Low power mode
 - Shell over BLE
-- Macros
 
 ## Code Of Conduct
 

From 4ce42350e70a7e4f6b9b7ad3b262d0f00f485995 Mon Sep 17 00:00:00 2001
From: kurtis-lew <kurtis.a.lew@gmail.com>
Date: Fri, 4 Sep 2020 20:28:45 -0700
Subject: [PATCH 4/4] Update iris_right.overlay

---
 app/boards/shields/iris/iris_right.overlay | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/boards/shields/iris/iris_right.overlay b/app/boards/shields/iris/iris_right.overlay
index 3f3dcb85..2d5dce87 100644
--- a/app/boards/shields/iris/iris_right.overlay
+++ b/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>
 		;
 };