feat: Home Row Mods, cleanup, improvements

minusfive · Oct 10, 2024 · 15a13aa · 15a13aa
1 parent 1d1ad89
commit 15a13aa
Show file tree

Hide file tree

Showing 17 changed files with 523 additions and 423 deletions.
diff --git a/README.md b/README.md
diff --git a/config/corne.conf b/config/corne.conf
@@ -1,12 +1,30 @@
-# Uncomment the following line to enable deep sleep
-# CONFIG_ZMK_SLEEP=y
+# Turn on logging, and set ZMK logging to debug output
+# CONFIG_ZMK_USB_LOGGING=y
+
+# Reset BT connections on next firmware boot
+# CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
 
-# Uncomment the following line to increase the keyboard's wireless range
+# Boost Bluetooth TX power
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
+# Require passkey on pairing
+CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
+
+# Sleep timeout 30 minutes
+CONFIG_ZMK_SLEEP=y
+CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
+
 # Enable eager debouncing
 CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1
 CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=7
 
-# Uncomment the following line to enable USB Logging (this increases power usage by a significant amount, turn it off when not in use)
-# CONFIG_ZMK_USB_LOGGING=y
+# Fix battery reporting on Windows
+CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
+
+# Experimental: BLE improvements
+CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
+
+# Report battery peripheral battery level
+CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
+CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
+
diff --git a/config/corne.keymap b/config/corne.keymap
@@ -6,11 +6,3 @@
 
 #include "../knucklehead/base.dtsi"
 
-// Alpha layer: uncomment desired, comment the others
-#include "../knucklehead/L1_colemak-dh.dtsi"
-// #include "../knucklehead/L1_colemak.dtsi"
-// #include "../knucklehead/L1_qwerty.dtsi"
-
-// Other layers
-#include "../knucklehead/L2.dtsi"
-#include "../knucklehead/L3.dtsi"
diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf
@@ -1,6 +1,9 @@
 # Turn on logging, and set ZMK logging to debug output
 # CONFIG_ZMK_USB_LOGGING=y
 
+# Reset BT connections on next firmware boot
+# CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
+
 # Boost Bluetooth TX power
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
@@ -11,19 +14,30 @@ CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
 CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
 
-# Reset BT connections on next firmware boot
-# CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
+# Enable eager debouncing
+CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1
+CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=7
+
+# Fix battery reporting on Windows
+CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
+
+# Experimental: BLE improvements
+CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
+
+# Report battery peripheral battery level
+CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
+CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
+
+# Stock status screen
+# CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
+# CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
+# CONFIG_CUSTOM_WIDGET_LOGO_IMAGE_ZMK=y
 
-#######################
 # Zen display tweaks
-# https://gist.github.com/caksoylar/c411313990978e1903c244f03039187a
-#######################
-CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
+# - See: https://gist.github.com/caksoylar/c411313990978e1903c244f03039187a
+# CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
 # Invert display
 # CONFIG_IL0323_INVERT=y
 # Use alternative refresh method
 # CONFIG_IL0323_ALTERNATIVE_REFRESH=y
-# Stock status screen
-#CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
-CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
-#CONFIG_CUSTOM_WIDGET_LOGO_IMAGE_ZMK=y
+
diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap
@@ -6,17 +6,9 @@
 
 #include "../knucklehead/base.dtsi"
 
-// Alpha layer: uncomment desired, comment the others
-#include "../knucklehead/L1_colemak-dh.dtsi"
-// #include "../knucklehead/L1_colemak.dtsi"
-// #include "../knucklehead/L1_qwerty.dtsi"
-
-// Other layers
-#include "../knucklehead/L2.dtsi"
-#include "../knucklehead/L3.dtsi"
-
 / {
   chosen {
     zmk,matrix_transform = &default_transform;
   };
 };
+
diff --git a/config/west.yml b/config/west.yml
@@ -1,11 +1,46 @@
+# Copied from: https://github.com/urob/zmk-config/blob/main/config/west.yml
+#
+# This file specifies the build dependencies for Github Action workflows and
+# for local build environments. The workspace has three toplevel directories
+# containing the user config, user modules and ZMK. Zephyr and its dependencies
+# are namespaced under /zmk to keep the toplevel clean.
+#
+# ZMK-Workspace
+# ├── config
+# ├── modules (user modules)
+# └── zmk
+#     └── modules (Zephyr modules)
+#
+# To create a local build environment, clone this repository and then run the
+# following commands from its toplevel directory:
+#
+# $ west init -l config
+# $ west update
+# $ west zephyr-export
+#
+---
 manifest:
   remotes:
+    - name: zmkfirmware
+      url-base: https://github.com/zmkfirmware
     - name: urob
       url-base: https://github.com/urob
+    - name: caksoylar
+      url-base: https://github.com/caksoylar
+
   projects:
     - name: zmk
+      remote: zmkfirmware
+      import: app/west.yml
+      revision: main
+
+    - name: zmk-auto-layer
       remote: urob
       revision: main
-      import: app/west.yml
+
+    - name: zmk-tri-state
+      remote: caksoylar
+      revision: split-locality
+
   self:
     path: config