Merge pull request petejohanson#5 from petejohanson/soft-off-support

feat: Add revisions and Technikable 1.1 support
Fetiorin · Mar 27, 2024 · 1f70333 · 1f70333
2 parents 34ccb1c + 60b1d2e
commit 1f70333
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 3 deletions.
diff --git a/boards/arm/technikable/revision.cmake b/boards/arm/technikable/revision.cmake
@@ -0,0 +1,3 @@
+board_check_revision(FORMAT MAJOR.MINOR.PATCH
+                     DEFAULT_REVISION 1.0.0
+                     VALID_REVISIONS 1.0.0 1.1.0)
diff --git a/boards/arm/technikable/technikable.dts b/boards/arm/technikable/technikable.dts
@@ -80,7 +80,9 @@
 
 	kscan: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+
+		wakeup-source;
+
 		debounce-press-ms = <1>;
 		debounce-release-ms = <5>;
 

diff --git a/boards/arm/technikable/technikable_1_0_0.conf b/boards/arm/technikable/technikable_1_0_0.conf
diff --git a/boards/arm/technikable/technikable_1_0_0.overlay b/boards/arm/technikable/technikable_1_0_0.overlay
diff --git a/boards/arm/technikable/technikable_1_1_0.conf b/boards/arm/technikable/technikable_1_1_0.conf
@@ -0,0 +1,3 @@
+# Enable soft-off by default
+CONFIG_ZMK_PM_SOFT_OFF=y
+
diff --git a/boards/arm/technikable/technikable_1_1_0.overlay b/boards/arm/technikable/technikable_1_1_0.overlay
@@ -0,0 +1,38 @@
+/ {
+	keys {
+		compatible = "gpio-keys";
+		wakeup_key: wakeup_key {
+			gpios = <&gpio1 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+		};
+	};
+
+	behaviors {
+		hw_soft_off: hw_soft_off {
+			compatible = "zmk,behavior-soft-off";
+			#binding-cells = <0>;
+		};
+	};
+
+	soft_off_direct_scan: soft_off_direct_scan {
+		compatible = "zmk,kscan-gpio-direct";
+		input-keys = <&wakeup_key>;
+		wakeup-source;
+	};
+
+        soft_off_wakers {
+		compatible = "zmk,soft-off-wakeup-sources";
+		wakeup-sources = <&soft_off_direct_scan>;
+	};
+
+	side_band_behavior_triggers: side_band_behavior_triggers {
+		compatible = "zmk,kscan-sideband-behaviors";
+		wakeup-source;
+		kscan = <&soft_off_direct_scan>;
+		soft_off {
+			column = <0>;
+			row = <0>;
+			bindings = <&hw_soft_off>;
+		};
+	};
+
+};
diff --git a/build.yaml b/build.yaml
@@ -1,3 +1,4 @@
 ---
 include:
   - board: technikable
+  - board: [email protected]
diff --git a/config/west.yml b/config/west.yml
@@ -2,10 +2,17 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
+    - name: petejohanson
+      url-base: https://github.com/petejohanson
   projects:
     - name: zmk
-      remote: zmkfirmware
-      revision: main
+      remote: petejohanson
+      revision: features/soft-off-take-3
+      # Switch to below to use ZMK main. Will not work with the [email protected] target until
+      # soft off PR https://github.com/zmkfirmware/zmk/pull/2085/ is merged
+      #
+      # remote: zmkfirmware
+      # revision: main
       import: app/west.yml
   self:
     path: config
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Enable soft-off by default
		CONFIG_ZMK_PM_SOFT_OFF=y