From 727045e1e163bf3482d1b27062047c01754cc96c Mon Sep 17 00:00:00 2001
From: Kyle McCreery <mccreery.kyle@gmail.com>
Date: Sat, 18 Mar 2023 03:20:17 -0400
Subject: [PATCH] Added conf for blackpill to help with the matrix scanning

---
 .../shields/obe/boards/blackpill_f401ce.conf     |  3 +++
 app/boards/shields/obe/boards/pillbug.overlay    |  2 +-
 app/boards/shields/obe/obe.conf                  | 16 ++++++++--------
 app/boards/shields/obe/obe.keymap                |  4 +---
 app/boards/shields/obe/obe.overlay               |  2 --
 5 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 app/boards/shields/obe/boards/blackpill_f401ce.conf

diff --git a/app/boards/shields/obe/boards/blackpill_f401ce.conf b/app/boards/shields/obe/boards/blackpill_f401ce.conf
new file mode 100644
index 00000000..2a8d16df
--- /dev/null
+++ b/app/boards/shields/obe/boards/blackpill_f401ce.conf
@@ -0,0 +1,3 @@
+# Necessary to stop double matrix reads on first row
+CONFIG_ZMK_KSCAN_MATRIX_WAIT_BEFORE_INPUTS=150
+CONFIG_ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS=150
diff --git a/app/boards/shields/obe/boards/pillbug.overlay b/app/boards/shields/obe/boards/pillbug.overlay
index 83307834..5890c669 100644
--- a/app/boards/shields/obe/boards/pillbug.overlay
+++ b/app/boards/shields/obe/boards/pillbug.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
- #include <dt-bindings/led/led.h>
+#include <dt-bindings/led/led.h>
 
 &spi1 {
 	compatible = "nordic,nrf-spim";
diff --git a/app/boards/shields/obe/obe.conf b/app/boards/shields/obe/obe.conf
index 9778bc95..81a3fad6 100644
--- a/app/boards/shields/obe/obe.conf
+++ b/app/boards/shields/obe/obe.conf
@@ -1,14 +1,14 @@
 # Uncomment to turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
+#CONFIG_ZMK_USB_LOGGING=y
 
-# Uncomment both to enable underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_WS2812_STRIP=y
+# Uncomment both to enable underglow, will not work with blackpill (currently)
+#CONFIG_ZMK_RGB_UNDERGLOW=y
+#CONFIG_WS2812_STRIP=y
 
 # Uncomment both to enable encoder
-# CONFIG_EC11=y
-# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+#CONFIG_EC11=y
+#CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Quality of life settings
-# CONFIG_ZMK_IDLE_TIMEOUT=300000
-# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
+#CONFIG_ZMK_IDLE_TIMEOUT=300000
+#CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
diff --git a/app/boards/shields/obe/obe.keymap b/app/boards/shields/obe/obe.keymap
index d545f4dd..7e20072b 100644
--- a/app/boards/shields/obe/obe.keymap
+++ b/app/boards/shields/obe/obe.keymap
@@ -10,7 +10,6 @@
 #include <dt-bindings/zmk/rgb.h>
 #include <dt-bindings/zmk/ext_power.h>
 
-
 #define TIMEOUT 300
 
 &encoder_1 {
@@ -52,14 +51,13 @@
         sensors = <&encoder_1>;
     };
 
-
     keymap0: keymap {
         compatible = "zmk,keymap";
 
         default_layer {
             label = "default layer";
             bindings = <
-                &kp C_MUTE &kp ESC   &kp N1   &kp N2   &kp N3 &kp N4    &kp N5 &kp N6    &kp N7 &kp N8   &kp N9    &kp N0   &kp MINUS &kp EQUAL &trans &kp BSPC
+                &kp C_MUTE &kp ESC   &kp N1   &kp N2   &kp N3 &kp N4    &kp N5 &kp N6    &kp N7 &kp N8   &kp N9    &kp N0   &kp MINUS &kp EQUAL &kp BSLH &kp BSPC
                 &kp PG_UP  &kp TAB   &kp Q    &kp W    &kp E  &kp R     &kp T  &kp Y     &kp U  &kp I    &kp O     &kp P    &kp LBKT  &kp RBKT         &kp BSLH
                 &kp PG_DN  &mo 1     &kp A    &kp S    &kp D  &kp F     &kp G  &kp H     &kp J  &kp K    &kp L     &kp SEMI &kp APOS                   &kp ENTER
                            &kp LSHFT &kp Z    &kp X    &kp C  &kp V     &kp B  &kp B     &kp N  &kp M    &kp COMMA &kp DOT  &kp FSLH  &kp UP           &kp RSHFT
diff --git a/app/boards/shields/obe/obe.overlay b/app/boards/shields/obe/obe.overlay
index 0fbf4da6..74f56e38 100644
--- a/app/boards/shields/obe/obe.overlay
+++ b/app/boards/shields/obe/obe.overlay
@@ -15,7 +15,6 @@
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
         label = "KSCAN";
-
         diode-direction = "col2row";
         row-gpios
             = <&blackpill 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
@@ -61,5 +60,4 @@
         resolution = <4>;
         status = "disabled";
     };
-
 };