From fbe4364ece8588d587ea403bb4db9bf8901e1d23 Mon Sep 17 00:00:00 2001
From: 280Zo <280Zo@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:52:27 -0800
Subject: [PATCH] configure dongle firmware to use matrix transform and bt/usb
firmware to integrate ZMK studio with physical layout
---
.../shields/charybdis-bt/charybdis_left.conf | 7 +++
.../shields/charybdis-bt/charybdis_right.conf | 10 ++++-
config/charybdis.conf | 8 ----
keymap-drawer/charybdis.svg | 43 +++++++++----------
keymap-drawer/charybdis.yaml | 8 ++--
5 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/boards/shields/charybdis-bt/charybdis_left.conf b/boards/shields/charybdis-bt/charybdis_left.conf
index e69de29b..8f7c0ddb 100644
--- a/boards/shields/charybdis-bt/charybdis_left.conf
+++ b/boards/shields/charybdis-bt/charybdis_left.conf
@@ -0,0 +1,7 @@
+## ZMK Studio - Move this to config/charybdis.conf when dongle works with ZMK Studio
+## https://zmk.dev/docs/features/studio
+CONFIG_ZMK_STUDIO=y
+## https://zmk.dev/docs/config/studio
+CONFIG_ZMK_STUDIO_LOCKING=y
+CONFIG_ZMK_STUDIO_LOCK_ON_DISCONNECT=y
+CONFIG_ZMK_STUDIO_TRANSPORT_BLE_PREF_LATENCY=5
\ No newline at end of file
diff --git a/boards/shields/charybdis-bt/charybdis_right.conf b/boards/shields/charybdis-bt/charybdis_right.conf
index 239cf7f9..54a39820 100644
--- a/boards/shields/charybdis-bt/charybdis_right.conf
+++ b/boards/shields/charybdis-bt/charybdis_right.conf
@@ -2,4 +2,12 @@
## https://zmk.dev/docs/config/system#split-keyboards
CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=1
CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
-CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
\ No newline at end of file
+CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
+
+## ZMK Studio - Move this to config/charybdis.conf when dongle works with ZMK Studio
+## https://zmk.dev/docs/features/studio
+CONFIG_ZMK_STUDIO=y
+## https://zmk.dev/docs/config/studio
+CONFIG_ZMK_STUDIO_LOCKING=y
+CONFIG_ZMK_STUDIO_LOCK_ON_DISCONNECT=y
+CONFIG_ZMK_STUDIO_TRANSPORT_BLE_PREF_LATENCY=5
\ No newline at end of file
diff --git a/config/charybdis.conf b/config/charybdis.conf
index 230f4c7d..7a04751c 100644
--- a/config/charybdis.conf
+++ b/config/charybdis.conf
@@ -30,11 +30,3 @@ CONFIG_INPUT=y
## https://zmk.dev/docs/keymaps/behaviors/macros#behavior-queue-limit
CONFIG_ZMK_BEHAVIORS_QUEUE_SIZE=512
-
-## ZMK Studio
-## https://zmk.dev/docs/features/studio
-CONFIG_ZMK_STUDIO=y
-## https://zmk.dev/docs/config/studio
-CONFIG_ZMK_STUDIO_LOCKING=y
-CONFIG_ZMK_STUDIO_LOCK_ON_DISCONNECT=y
-CONFIG_ZMK_STUDIO_TRANSPORT_BLE_PREF_LATENCY=5
diff --git a/keymap-drawer/charybdis.svg b/keymap-drawer/charybdis.svg
index 85f9c630..8018fa16 100644
--- a/keymap-drawer/charybdis.svg
+++ b/keymap-drawer/charybdis.svg
@@ -339,18 +339,18 @@ path.combo { stroke: #7f7f7f; }
-BACKSPACE
+LCLK
-
-NUM
-
+
-LCLK
+BACKSPACE
-
+
+NUM
+
@@ -550,15 +550,14 @@ path.combo { stroke: #7f7f7f; }
▽
-
+
+
+
+
+
-
-
-
-▽
-
@@ -2590,14 +2589,14 @@ path.combo { stroke: #7f7f7f; }
-
-
-
-
-
+
+
+
+
+
@@ -2765,14 +2764,14 @@ path.combo { stroke: #7f7f7f; }
-
-
-
-
-
+
+
+
+
+
diff --git a/keymap-drawer/charybdis.yaml b/keymap-drawer/charybdis.yaml
index f2235a2d..969f77e3 100644
--- a/keymap-drawer/charybdis.yaml
+++ b/keymap-drawer/charybdis.yaml
@@ -37,8 +37,8 @@ layers:
- /
- DEV TOOLS
- SCRL SLOW
- - {t: BACK SPACE, h: NUM}
- L CLK
+ - {t: BACK SPACE, h: NUM}
- {t: RETURN, h: MOUSE}
- {t: SPACE, h: SYM}
NUM:
@@ -79,8 +79,8 @@ layers:
- {t: '=', h: DEV TOOLS}
- ''
- {t: ▽, type: trans}
+ - ''
- {type: held}
- - {t: ▽, type: trans}
- '0'
- {t: ▽, type: trans}
NAV:
@@ -423,9 +423,9 @@ combos:
- p: [17, 18]
k: CAPS WORD
l: [BASE]
-- p: [28, 38]
+- p: [28, 37]
k: M CLK
-- p: [16, 38]
+- p: [16, 37]
k: R CLK
- p: [38, 39]
k: L_BASE L_EXTRA