zephyr 3.5 config for the charybdis

16 files changed, 189 insertions, 89 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d74fb89..44f21c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
+    uses: petejohanson/zmk/.github/workflows/build-user-config.yml@core/zephyr-3.5-update
\ No newline at end of file
diff --git a/config/boards/shields/charybdis/Kconfig.defconfig b/config/boards/shields/charybdis/Kconfig.defconfig
new file mode 100644
index 0000000..5a73bf8
--- /dev/null
+++ b/config/boards/shields/charybdis/Kconfig.defconfig
@@ -0,0 +1,16 @@
+if SHIELD_CHARYBDIS_RIGHT

+

+config ZMK_KEYBOARD_NAME

+	default "Charybdis"

+

+config ZMK_SPLIT_BLE_ROLE_CENTRAL

+	default y

+

+endif

+

+if SHIELD_CHARYBDIS_LEFT || SHIELD_CHARYBDIS_RIGHT

+

+config ZMK_SPLIT

+	default y

+	

+endif
\ No newline at end of file
diff --git a/config/boards/shields/charybdis/Kconfig.shield b/config/boards/shields/charybdis/Kconfig.shield
new file mode 100644
index 0000000..2060526
--- /dev/null
+++ b/config/boards/shields/charybdis/Kconfig.shield
@@ -0,0 +1,5 @@
+config SHIELD_CHARYBDIS_LEFT

+	def_bool $(shields_list_contains,charybdis_left)

+

+config SHIELD_CHARYBDIS_RIGHT

+	def_bool $(shields_list_contains,charybdis_right)
\ No newline at end of file
diff --git a/config/charybdis.conf b/config/boards/shields/charybdis/charybdis.conf
index d926111..9818c56 100644
--- a/config/charybdis.conf
+++ b/config/boards/shields/charybdis/charybdis.conf
@@ -1,4 +1,4 @@
-CONFIG_BT_LL_SW_LLCP_LEGACY=y
+CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=9
 CONFIG_BT_PERIPHERAL_PREF_LATENCY=16
diff --git a/config/boards/shields/charybdis/charybdis.dtsi b/config/boards/shields/charybdis/charybdis.dtsi
new file mode 100644
index 0000000..794910a
--- /dev/null
+++ b/config/boards/shields/charybdis/charybdis.dtsi
@@ -0,0 +1,47 @@
+#include <dt-bindings/zmk/matrix_transform.h>

+

+/ {

+    chosen {

+        zmk,kscan = &kscan0;

+        zmk,matrix_transform = &default_transform;

+    };

+

+    default_transform: keymap_transform_0 {

+        compatible = "zmk,matrix-transform";

+        columns = <12>;

+        rows = <4>;

+

+        map = <

+	RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)

+	RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)

+	RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)

+							RC(3,3) RC(3,4) RC(3,1)  RC(3,7)  RC(3,9)

+        >;

+    };

+

+    five_column_transform: keymap_transform_1 {

+        compatible = "zmk,matrix-transform";

+        columns = <10>;

+        rows = <4>;

+

+        map = <

+	RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)

+	RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)

+	RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)

+					RC(3,3) RC(3,4) RC(3,1)  RC(3,6)  RC(3,8)

+        >;

+    };

+	

+    kscan0: kscan {

+        compatible = "zmk,kscan-gpio-matrix";

+        label = "KSCAN";

+

+        diode-direction = "row2col";

+		row-gpios

+			= <&pro_micro 18 GPIO_ACTIVE_HIGH>

+			, <&pro_micro 5 GPIO_ACTIVE_HIGH>

+			, <&pro_micro 4 GPIO_ACTIVE_HIGH>

+			, <&pro_micro 9 GPIO_ACTIVE_HIGH>

+            ;

+    };

+};
\ No newline at end of file
diff --git a/config/charybdis.keymap b/config/boards/shields/charybdis/charybdis.keymap
index ace8944..c40464a 100644
--- a/config/charybdis.keymap
+++ b/config/boards/shields/charybdis/charybdis.keymap
@@ -23,8 +23,6 @@
 &kp LSHFT  &kp Z  &kp X      &kp C      &kp V  &kp B    &kp N    &kp M  &kp COMMA  &kp DOT  &kp FSLH  &kp RSHIFT
                          &kp LCTRL  &kp SPACE  &mo 1    &mo 2  &kp RET
             >;
-
-            trackball-bindings = <&tmv_coarse>;
         };
 
         Lower {
diff --git a/config/boards/shields/charybdis/charybdis.zmk.yml b/config/boards/shields/charybdis/charybdis.zmk.yml
new file mode 100644
index 0000000..23dd993
--- /dev/null
+++ b/config/boards/shields/charybdis/charybdis.zmk.yml
@@ -0,0 +1,11 @@
+file_format: "1"

+id: charybdis

+name: Charybdis

+type: shield

+url: https://github.com/Bastardkb/Charybdis/

+requires: [pro_micro]

+features:

+  - keys

+siblings:

+  - charybdis_left

+  - charybdis_right
\ No newline at end of file
diff --git a/config/boards/shields/charybdis/charybdis_left.conf b/config/boards/shields/charybdis/charybdis_left.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/boards/shields/charybdis/charybdis_left.conf
diff --git a/config/boards/shields/charybdis/charybdis_left.overlay b/config/boards/shields/charybdis/charybdis_left.overlay
new file mode 100644
index 0000000..46791bd
--- /dev/null
+++ b/config/boards/shields/charybdis/charybdis_left.overlay
@@ -0,0 +1,18 @@
+/*

+ * Copyright (c) 2020 ZMK Contributors

+ *

+ * SPDX-License-Identifier: MIT

+ */

+

+#include "charybdis.dtsi"

+

+&kscan0 {

+	col-gpios

+		= <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		;

+};
\ No newline at end of file
diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf
new file mode 100644
index 0000000..5fc8661
--- /dev/null
+++ b/config/boards/shields/charybdis/charybdis_right.conf
@@ -0,0 +1,18 @@
+CONFIG_SPI=y
+CONFIG_INPUT=y
+CONFIG_ZMK_MOUSE=y
+
+CONFIG_ZMK_EXT_POWER=y
+
+CONFIG_PMW3610=y
+CONFIG_PMW3610_CPI=2400
+CONFIG_PMW3610_CPI_DIVIDOR=4
+CONFIG_PMW3610_ORIENTATION_90=y
+CONFIG_PMW3610_SNIPE_CPI=800
+CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4
+CONFIG_PMW3610_SCROLL_TICK=32
+CONFIG_PMW3610_INVERT_X=y
+
+CONFIG_PMW3610_POLLING_RATE_125_SW=y
+
+CONFIG_PMW3610_SMART_ALGORITHM=y
diff --git a/config/boards/shields/charybdis/charybdis_right.overlay b/config/boards/shields/charybdis/charybdis_right.overlay
new file mode 100644
index 0000000..efc259e
--- /dev/null
+++ b/config/boards/shields/charybdis/charybdis_right.overlay
@@ -0,0 +1,64 @@
+/*

+ * Copyright (c) 2020 ZMK Contributors

+ *

+ * SPDX-License-Identifier: MIT

+ */

+ 

+#include "charybdis.dtsi"

+

+&default_transform {

+	col-offset = <6>;

+};

+

+&five_column_transform {

+	col-offset = <5>;

+};

+

+&kscan0 {

+	col-gpios

+		= <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>

+		;

+};

+

+&pinctrl {

+    spi0_default: spi0_default {

+        group1 {

+            psels = <NRF_PSEL(SPIM_SCK, 0, 8)>,

+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,

+                <NRF_PSEL(SPIM_MISO, 0, 17)>;

+        };

+    };

+

+    spi0_sleep: spi0_sleep {

+        group1 {

+            psels = <NRF_PSEL(SPIM_SCK, 0, 8)>,

+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,

+                <NRF_PSEL(SPIM_MISO, 0, 17)>;

+            low-power-enable;

+        };

+    };

+};

+

+&spi0 {

+    status = "okay";

+    compatible = "nordic,nrf-spim";

+    pinctrl-0 = <&spi0_default>;

+    pinctrl-1 = <&spi0_sleep>;

+    pinctrl-names = "default", "sleep";

+    cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;

+

+    trackball: trackball@0 {

+        status = "okay";

+        compatible = "pixart,pmw3610";

+        reg = <0>;

+        spi-max-frequency = <2000000>;

+        irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;

+        scroll-layers = <1>;

+        snipe-layers = <5>;

+    };

+};
\ No newline at end of file
diff --git a/config/info.json b/config/boards/shields/charybdis/info.json
index 630f8ed..630f8ed 100644
--- a/config/info.json
+++ b/config/boards/shields/charybdis/info.json
diff --git a/config/charybdis_right.conf b/config/charybdis_right.conf
deleted file mode 100644
index b1f57a8..0000000
--- a/config/charybdis_right.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_PMW3610_SMART_ALGORITHM=y
-CONFIG_PMW3610_CPI=1000
-CONFIG_PMW3610_CPI_DIVIDOR=4
-CONFIG_PMW3610_ORIENTATION_90=y
-CONFIG_ZMK_MOUSE_TICK_DURATION=6
-CONFIG_MOUSE_LAYER_ACTIVE_MS=750
-CONFIG_MOUSE_LAYER_INDEX=5
diff --git a/config/corne.conf b/config/corne.conf
deleted file mode 100644
index 0a39f96..0000000
--- a/config/corne.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Uncomment the following lines to enable the Corne RGB Underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_WS2812_STRIP=y
-
-# Uncomment the following line to enable the Corne OLED Display
-CONFIG_ZMK_DISPLAY=y
-CONFIG_ZMK_EXT_POWER=y
diff --git a/config/corne.keymap b/config/corne.keymap
deleted file mode 100644
index 9442f25..0000000
--- a/config/corne.keymap
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/bt.h>
-#include <dt-bindings/zmk/outputs.h>
-
-/ {
-    keymap {
-        compatible = "zmk,keymap";
-
-        Base {
-            // -----------------------------------------------------------------------------------------
-            // |  TAB |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | BKSP |
-            // | CTRL |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |  '   |
-            // | SHFT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | ESC  |
-            //                    | GUI | LWR | SPC |   | ENT | RSE  | ALT |
-
-            label = "Base";
-            bindings = <
-   &kp TAB   &kp Q   &kp W      &kp E   &kp R      &kp T            &kp Y   &kp U      &kp I    &kp O     &kp P    &kp BSPC
-   &kp ESC   &kp A   &kp S      &kp D   &kp F      &kp G            &kp H   &kp J      &kp K    &kp L  &kp SEMI    &kp APOS
- &kp LSHFT   &kp Z   &kp X      &kp C   &kp V      &kp B            &kp N   &kp M  &kp COMMA  &kp DOT  &kp FSLH  &kp RSHIFT
-                            &kp LCTRL   &mo 1  &kp SPACE          &kp RET   &mo 2   &kp RALT
-            >;
-        };
-
-        Lower {
-            // -----------------------------------------------------------------------------------------
-            // |  TAB |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BKSP |
-            // | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 |   | LFT | DWN |  UP | RGT |     |      |
-            // | SHFT |     |     |     |     |     |   |     |     |     |     |     |      |
-            //                    | GUI |     | SPC |   | ENT |     | ALT |
-
-            label = "Lower";
-            bindings = <
-   &kp TAB  &kp K_PP    &kp UP     &kp N1     &kp N2     &kp N3           &kp N7  &kp N8    &kp N9     &kp N0  &kp HOME      &trans
-  &kp LALT  &kp LEFT  &kp DOWN  &kp RIGHT     &kp N4     &kp N5           &kp N4  &kp N5    &kp N6  &kp RIGHT    &trans     &kp F10
- &kp LSHFT    &trans    &trans     &trans  &kp MINUS   &kp PLUS           &kp N1  &kp N2    &kp N3    &kp DOT    &trans  &kp RSHIFT
-                                 &kp LGUI     &trans  &kp SPACE          &kp RET  &trans  &kp RALT
-            >;
-        };
-
-        Raise {
-            // -----------------------------------------------------------------------------------------
-            // |  TAB |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BKSP |
-            // | CTRL |     |     |     |     |     |   |  -  |  =  |  [  |  ]  |  \  |  `   |
-            // | SHFT |     |     |     |     |     |   |  _  |  +  |  {  |  }  | "|" |  ~   |
-            //                    | GUI |     | SPC |   | ENT |     | ALT |
-
-            label = "Raise";
-            bindings = <
- &trans      &kp EXCL      &kp AT    &kp HASH      &kp DLLR  &kp PRCNT          &kp CARET   &kp AMPS  &kp KP_MULTIPLY  &kp LPAR  &kp RPAR    &kp DEL
- &trans    &bt BT_CLR  &bt BT_PRV  &bt BT_NXT  &bt BT_SEL 0      &to 3          &kp UNDER  &kp EQUAL         &kp LBKT  &kp RBKT  &kp BSLH  &kp GRAVE
- &trans  &out OUT_TOG      &trans      &trans        &trans     &trans          &kp MINUS   &kp PLUS         &kp LBRC  &kp RBRC  &kp PIPE  &kp TILDE
-                                     &kp LGUI  &kp LEFT_ALT  &kp SPACE            &kp RET     &trans         &kp RALT
-            >;
-        };
-    };
-};
-
-&nice_view_spi {
-    cs-gpios = <&pro_micro 0 GPIO_ACTIVE_HIGH>;
-};
diff --git a/config/west.yml b/config/west.yml
index ef93b42..1d2a57a 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -1,11 +1,16 @@
 manifest:
   remotes:
     - name: zmkfirmware
-      url-base: https://github.com/victorlucachi
+      url-base: https://github.com/petejohanson
+    - name: inorichi
+      url-base: https://github.com/inorichi
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: pmw3610-aml
+      revision: feat/pointers-move-scroll
       import: app/west.yml
+    - name: zmk-pmw3610-driver
+      remote: inorichi
+      revision: main
   self:
-    path: config
+    path: config
\ No newline at end of file