Skip to content

Commit

Permalink
chore: update configs to latest ZMK, modules
Browse files Browse the repository at this point in the history
  • Loading branch information
minusfive committed Oct 10, 2024
1 parent 1d1ad89 commit dbcc255
Show file tree
Hide file tree
Showing 14 changed files with 129 additions and 100 deletions.
28 changes: 23 additions & 5 deletions config/corne.conf
Original file line number Diff line number Diff line change
@@ -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

8 changes: 0 additions & 8 deletions config/corne.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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"
34 changes: 24 additions & 10 deletions config/corneish_zen.conf
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

10 changes: 1 addition & 9 deletions config/corneish_zen.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
};

16 changes: 15 additions & 1 deletion config/west.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
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
4 changes: 2 additions & 2 deletions knucklehead/L3.dtsi → knucklehead/Fn.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
keymap {
compatible = "zmk,keymap";

layer_3 {
label = "Fn";
fn_layer {
display-name = "Fn";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// 0 1 2 3 4 5 6 7 8 9 10 11
Expand Down
4 changes: 2 additions & 2 deletions knucklehead/L1_colemak-dh.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
keymap {
compatible = "zmk,keymap";

layer_1 {
label = "L1";
colemak_dh_layer {
display-name = "L1";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// 0 1 2 3 4 5 6 7 8 9 10 11
Expand Down
4 changes: 2 additions & 2 deletions knucklehead/L1_colemak.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
keymap {
compatible = "zmk,keymap";

layer_1 {
label = "L1";
colemak_layer {
display-name = "L1";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// 0 1 2 3 4 5 6 7 8 9 10 11
Expand Down
4 changes: 2 additions & 2 deletions knucklehead/L1_qwerty.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
keymap {
compatible = "zmk,keymap";

layer_1 {
label = "L1";
qwerty_layer {
display-name = "L1";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// 0 1 2 3 4 5 6 7 8 9 10 11
Expand Down
2 changes: 1 addition & 1 deletion knucklehead/L2.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
compatible = "zmk,keymap";

layer_2 {
label = "L2";
display-name = "L2";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// 0 1 2 3 4 5 6 7 8 9 10 11
Expand Down
13 changes: 12 additions & 1 deletion knucklehead/base.dtsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ZMK Core Includes
#include <behaviors.dtsi>
#include <behaviors/num_word.dtsi> // requires https://github.com/urob/zmk-auto-layer module
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/outputs.h>
Expand All @@ -15,7 +16,7 @@
// Behaviors Constants
#define TAPPING_TERM_MS 280
#define QUICK_TAP_MS 175
#define GLOBAL_QUICK_TAP_MS 150
#define REQUIRE_PRIOR_IDLE_MS 150

// Combos Constants
#define COMBO_TERM_DEFAULT 30
Expand All @@ -24,3 +25,13 @@
#include "behaviors.dtsi"
#include "macros.dtsi"
#include "combos.dtsi"

// Alpha layer: uncomment desired, comment the others
#include "L1_colemak-dh.dtsi"
// #include "L1_colemak.dtsi"
// #include "L1_qwerty.dtsi"

// Other layers
#include "L2.dtsi"
#include "Fn.dtsi"

Loading

0 comments on commit dbcc255

Please sign in to comment.