-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
feat: add support for zmk studio in ergodash #3041
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file is extra and should be removed |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# | ||
# Copyright (c) 2020 The ZMK Contributors | ||
# | ||
# SPDX-License-Identifier: MIT | ||
# | ||
|
||
# ZMK Studio support build configuration for Ergodash shield | ||
# See: https://zmk.dev/docs/features/studio#adding-zmk-studio-support-to-a-keyboard | ||
|
||
# Example for left (central) side with Studio support | ||
default: | ||
board: nice_nano_v2 | ||
shield: ergodash_left | ||
snippets: | ||
- studio-rpc-usb-uart | ||
cmake-args: | ||
- -DCONFIG_ZMK_STUDIO=y | ||
|
||
# Example for right side (no Studio needed) | ||
right: | ||
board: nice_nano_v2 | ||
shield: ergodash_right |
Large diffs are not rendered by default.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unnecessary, please remove |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# | ||
# Copyright (c) 2020 The ZMK Contributors | ||
# | ||
# SPDX-License-Identifier: MIT | ||
# |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,11 +32,11 @@ | |
* .----------------------------------------------------------------------------------------------------------------------. | ||
*/ | ||
bindings = < | ||
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LBKT &kp RBKT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp PSCRN | ||
&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp MINUS &kp EQUAL &kp Y &kp U &kp I &kp O &kp P &kp BSLH | ||
&kp TAB &kp A &kp S &kp D &kp F &kp G &kp DEL &kp BSPC &kp H &kp J &kp K &kp L &kp SEMI &kp SQT | ||
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp END &kp HOME &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp RSHFT | ||
&kp LCTRL &none &kp PG_DN &kp LMETA &kp LALT &kp SPACE &mo LOWER &mo RAISE &kp RET &kp RALT &none &kp PG_UP &kp INS &kp RCTRL | ||
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LBKT &kp RBKT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp PSCRN | ||
&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp MINUS &kp EQUAL &kp Y &kp U &kp I &kp O &kp P &kp BSLH | ||
&kp TAB &kp A &kp S &kp D &kp F &kp G &kp DEL &kp BSPC &kp H &kp J &kp K &kp L &kp SEMI &kp SQT | ||
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp END &kp HOME &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp RSHFT | ||
&kp LCTRL &studio_unlock &kp PG_DN &kp LMETA &kp LALT &kp SPACE &mo LOWER &mo RAISE &kp RET &kp RALT &none &kp PG_UP &kp INS &kp RCTRL | ||
>; | ||
}; | ||
lower_layer { | ||
|
@@ -56,7 +56,7 @@ | |
&kp F11 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &none &none &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F12 | ||
&none &none &none &none &none &none &none &none &none &none &none &none &none &none | ||
&none &none &none &none &none &none &none &none &none &none &none &none &none &none | ||
&trans &bootloader &sys_reset &none &none &none &none &none &none &none &none &none &none &trans | ||
&trans &bootloader &sys_reset &none &none &none &none &none &none &none &none &none &none &trans | ||
&trans &none &none &trans &trans &none &trans &trans &none &trans &none &none &none &trans | ||
>; | ||
}; | ||
|
@@ -77,8 +77,8 @@ | |
&none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &none &bt BT_CLR &none &none &none &none &none &none &none | ||
&none &none &none &none &none &none &none &none &none &none &none &none &none &none | ||
&none &none &none &none &none &none &none &none &none &none &none &none &none &none | ||
&trans &none &none &none &none &none &none &none &none &none &none &bootloader &sys_reset &trans | ||
&trans &none &none &trans &trans &none &trans &trans &none &trans &none &none &none &trans | ||
&trans &none &none &none &none &none &none &none &none &none &none &bootloader &sys_reset &trans | ||
&trans &bt BT_PRV &bt BT_NXT &trans &trans &none &trans &trans &none &trans &none &none &none &trans | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change is unrelated, I'd remove |
||
>; | ||
}; | ||
}; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not used and unnecessary, please remove |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"file_format": "1", | ||
"id": "ergodash", | ||
"name": "Ergodash", | ||
"description": "A split ergonomic keyboard with support for ZMK Studio.", | ||
"url": "https://github.com/omkbd/ErgoDash", | ||
"image": "https://raw.githubusercontent.com/omkbd/ErgoDash/master/images/ergodash.jpg", | ||
"features": ["keys", "studio"], | ||
"studio": { | ||
"physicalLayout": "ergodash_physical_layout" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,9 @@ | ||
# | ||
# Copyright (c) 2020 The ZMK Contributors | ||
# | ||
# SPDX-License-Identifier: MIT | ||
# | ||
|
||
Comment on lines
+1
to
+6
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd undo this header addition, not really necessary |
||
file_format: "1" | ||
id: ergodash | ||
name: Ergodash | ||
|
@@ -6,6 +12,7 @@ url: https://github.com/omkbd/ErgoDash | |
requires: [pro_micro] | ||
features: | ||
- keys | ||
- studio | ||
siblings: | ||
- ergodash_left | ||
- ergodash_right |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unnecessary, please remove |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# | ||
# Copyright (c) 2020 The ZMK Contributors | ||
# | ||
# SPDX-License-Identifier: MIT | ||
# | ||
|
||
CONFIG_BT=y | ||
CONFIG_BT_LL_SW_SPLIT=y | ||
|
||
# Windows Bluetooth connectivity fixes | ||
# Disable PHY 2M to fix pairing issues with Windows (Realtek and Intel chips) | ||
CONFIG_BT_CTLR_PHY_2M=n | ||
|
||
# Fix Windows battery notification bug | ||
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n | ||
|
||
# Enable experimental connection stability improvements | ||
CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y | ||
CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y | ||
|
||
# Enable passkey entry for better compatibility with Windows (especially work-managed PCs) | ||
CONFIG_ZMK_BLE_PASSKEY_ENTRY=n | ||
|
||
# Uncomment to boost BLE transmit power for improved range (may increase power consumption) | ||
# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unnecessary, please remove |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# | ||
# Copyright (c) 2020 The ZMK Contributors | ||
# | ||
# SPDX-License-Identifier: MIT | ||
# | ||
|
||
CONFIG_BT=y | ||
CONFIG_BT_LL_SW_SPLIT=y | ||
|
||
# Windows Bluetooth connectivity fixes | ||
# Disable PHY 2M to fix pairing issues with Windows (Realtek and Intel chips) | ||
CONFIG_BT_CTLR_PHY_2M=n | ||
|
||
# Fix Windows battery notification bug | ||
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n | ||
|
||
# Enable experimental connection stability improvements | ||
CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y | ||
CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y | ||
|
||
# Enable passkey entry for better compatibility with Windows (especially work-managed PCs) | ||
CONFIG_ZMK_BLE_PASSKEY_ENTRY=n | ||
|
||
|
||
# Uncomment to boost BLE transmit power for improved range (may increase power consumption) | ||
# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove these, Studio isn't enabled by default