fixes

mike1808 · Jun 21, 2024 · 149fd5f · 149fd5f
1 parent 93e7a24
commit 149fd5f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 27 deletions.
diff --git a/config/boards/shields/hillside_view/Kconfig.defconfig b/config/boards/shields/hillside_view/Kconfig.defconfig
@@ -28,7 +28,7 @@ config ZMK_DISPLAY
 
 if ZMK_MOUSE
 
-config SPI
+config I2C
   default y
 
 endif # ZMK_MOUSE

diff --git a/config/boards/shields/hillside_view/hillside_view.dtsi b/config/boards/shields/hillside_view/hillside_view.dtsi
@@ -94,14 +94,14 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                                       RC
 };
 
 &pinctrl {
-  spi0_default: spi0_default {
+  spi1_default: spi1_default {
     group1 {
       psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
         <NRF_PSEL(SPIM_MOSI, 0, 17)>,
         <NRF_PSEL(SPIM_MISO, 0, 25)>;
     };
   };
-  spi0_sleep: spi0_sleep {
+  spi1_sleep: spi1_sleep {
     group1 {
       psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
         <NRF_PSEL(SPIM_MOSI, 0, 17)>,
@@ -124,15 +124,15 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                                       RC
 
   i2c0_default: i2c0_default {
     group1 {
-      psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
-          <NRF_PSEL(TWIM_SCL, 1, 0)>;
+      psels = <NRF_PSEL(TWIM_SDA, 1, 0)>,
+          <NRF_PSEL(TWIM_SCL, 0, 24)>;
     };
   };
 
   i2c0_sleep: i2c0_sleep {
     group1 {
-      psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
-          <NRF_PSEL(TWIM_SCL, 1, 0)>;
+      psels = <NRF_PSEL(TWIM_SDA, 1, 0)>,
+          <NRF_PSEL(TWIM_SCL, 0, 24)>;
       low-power-enable;
     };
   };
@@ -190,10 +190,10 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                                       RC
     };
 };
 
-nice_view_spi: &spi0 {
+nice_view_spi: &spi1 {
   compatible = "nordic,nrf-spim";
-  pinctrl-0 = <&spi0_default>;
-  pinctrl-1 = <&spi0_sleep>;
+  pinctrl-0 = <&spi1_default>;
+  pinctrl-1 = <&spi1_sleep>;
   pinctrl-names = "default", "sleep";
   cs-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
 

diff --git a/config/boards/shields/hillside_view/hillside_view_left.conf b/config/boards/shields/hillside_view/hillside_view_left.conf
@@ -0,0 +1,9 @@
+CONFIG_ZMK_MOUSE=y
+CONFIG_INPUT=y
+CONFIG_GPIO=y
+
+CONFIG_I2C=y
+CONFIG_PINCTRL=y
+CONFIG_INPUT_PINNACLE=y
+
+CONFIG_ZMK_USB_LOGGING=y
diff --git a/config/hillside_view.conf b/config/hillside_view.conf
@@ -17,11 +17,3 @@ CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
 
 CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y
 
-
-
-CONFIG_I2C=y
-CONFIG_PINNACLE=y
-CONFIG_NFCT_PINS_AS_GPIOS=y
-CONFIG_ZMK_MOUSE=y
-CONFIG_INPUT=y
-CONFIG_INPUT_PINNACLE=y
diff --git a/config/hillside_view.keymap b/config/hillside_view.keymap
@@ -5,6 +5,9 @@
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/rgb.h>
 
+#include <dt-bindings/zmk/mouse.h>
+#include <behaviors/mouse_keys.dtsi>
+
 // Left bottom row pinky 2nd column
 
 #ifndef LB5

diff --git a/config/west.yml b/config/west.yml
@@ -49,18 +49,9 @@ manifest:
     - name: zmk-split-peripheral-bonding-tweak
       remote: badjeff
       revision: main
-    - name: zmk-drv2605-driver
-      remote: badjeff
-      revision: main      
     - name: zmk-kscan-blackout
       remote: badjeff
       revision: main      
-    # - name: zmk-behavior-set-default-layer
-    #   remote: badjeff
-    #   revision: main
-    - name: kb_zmk_ps2_mouse_trackpoint_driver
-      remote: badjeff
-      revision: main
     - name: cirque-input-module
       remote: badjeff
       revision: main