Re-enable stuff.

trankillity · Jun 24, 2024 · 88f9ffc · 88f9ffc
1 parent b723d1f
commit 88f9ffc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/config/ffkb_v3.conf b/config/ffkb_v3.conf
@@ -8,19 +8,19 @@
 #CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 # I2C (only if cirque)
-# CONFIG_I2C=y
+CONFIG_I2C=y
 
 # zmk mouse emulation
-# CONFIG_ZMK_MOUSE=y
+CONFIG_ZMK_MOUSE=y
 
 # SPI for shift register
 CONFIG_SPI=y
 
 # for logging, remove later
-CONFIG_ZMK_USB_LOGGING=y
+# CONFIG_ZMK_USB_LOGGING=y
 
 # trying this for problematic BLE on one of my machines
-# CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=n
+CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y
 
 # Uncomment to enable encoder
 CONFIG_EC11=y

diff --git a/config/ffkb_v3.keymap b/config/ffkb_v3.keymap
@@ -9,8 +9,8 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/ext_power.h>
 #include <dt-bindings/zmk/outputs.h>
-// #include <dt-bindings/zmk/mouse.h>
-// #include <behaviors/mouse_keys.dtsi>
+#include <dt-bindings/zmk/mouse.h>
+#include <behaviors/mouse_keys.dtsi>
 
 #define BASE 0
 #define NAVI 1

diff --git a/config/ffkb_v3.overlay b/config/ffkb_v3.overlay
@@ -7,44 +7,44 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 // From Pete: https://discord.com/channels/719497620560543766/845285481888743434/1206181117296644106
-// &pro_micro_i2c {
-//     status = "okay";
-//     glidepoint: glidepoint@2a {
-//         compatible = "cirque,pinnacle";
-//         reg = <0x2a>;
-//         status = "okay";
-//         dr-gpios = <&gpio0 6 (GPIO_ACTIVE_HIGH)>;
-//         sensitivity = "2x";
-//         sleep;
-//         no-taps;
-//     };
-// };
+&pro_micro_i2c {
+    status = "okay";
+    glidepoint: glidepoint@2a {
+        compatible = "cirque,pinnacle";
+        reg = <0x2a>;
+        status = "okay";
+        dr-gpios = <&gpio0 6 (GPIO_ACTIVE_HIGH)>;
+        sensitivity = "2x";
+        sleep;
+        no-taps;
+    };
+};
 
 / {
     // Rotation config, from Pete
     // This will change in the future
     // https://discord.com/channels/719497620560543766/845285481888743434/1206407883777114182
-    // input_config {
-    //     compatible = "zmk,input-listener";
-    //     device = <&glidepoint>;
-    //     xy-swap;
-    //     y-invert;
-    //     x-invert;
-    // };
+    input_config {
+        compatible = "zmk,input-listener";
+        device = <&glidepoint>;
+        xy-swap;
+        y-invert;
+        x-invert;
+    };
     encoder_1: encoder_1 {
-        // compatible = "alps,ec11";
-        // a-gpios = <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        // b-gpios = <&pro_micro 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        compatible = "alps,ec11";
+        a-gpios = <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
         steps = <15>;
-        // status = "okay";
+        status = "okay";
     };
 
     // Right encoder
     encoder_2: encoder_2 {
-        // compatible = "alps,ec11";
-        // a-gpios = <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        // b-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        compatible = "alps,ec11";
+        a-gpios = <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
         steps = <15>;
-        // status = "okay";
+        status = "okay";
     };
 };