remove pos_map and some tweaks

keeb-it · Aug 20, 2024 · 0acdb09 · 0acdb09
1 parent 194f6ab
commit 0acdb09
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 54 deletions.
diff --git a/boards/shields/hammer40/Kconfig.defconfig b/boards/shields/hammer40/Kconfig.defconfig
@@ -6,6 +6,12 @@ if SHIELD_HAMMER40
 config ZMK_KEYBOARD_NAME
     default "hammer40"
 
+config SPI
+    default y
+
+config I2C
+    default y
+
 if ZMK_DISPLAY
 
 config SSD1306

diff --git a/boards/shields/hammer40/hammer40.conf b/boards/shields/hammer40/hammer40.conf
diff --git a/boards/shields/hammer40/hammer40.overlay b/boards/shields/hammer40/hammer40.overlay
@@ -83,19 +83,6 @@
             ;
     };
 
-    pos_map {
-		compatible = "zmk,physical-layout-position-map";
-		complete;
-		default {
-			physical-layout = <&default_layout>;
-			positions
-				= < 0  1  2  3  4  5     6  7  8  9 10 11>
-				, <12 13 14 15 16 17    18 19 20 21 22 23>
-				, <24 25 26 27 28 29 30 31 32 33 34 35 36>
-				, <37 38 39 40 41 42 43 44 45 46 47 48 49>;
-		};
-	};
-
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
         wakeup-source;

diff --git a/boards/shields/hana/hana.keymap b/boards/shields/hana/hana.keymap
@@ -16,5 +16,25 @@
                                 &studio_unlock &kp LGUI &kp ESC &kp SPACE                  &kp RET &mo 2 &kp LALT  &trans
             >;
         };
+
+        nav_layer {
+            display-name = "nav";
+            status = "reserved";
+        };
+
+        fn_layer {
+            display-name = "fn";
+            status = "reserved";
+        };
+
+        num_layer {
+            display-name = "num";
+            status = "reserved";
+        };
+
+        sys_layer {
+            display-name = "sys";
+            status = "reserved";
+        };
     };
 };
diff --git a/config/hammer40.conf b/config/hammer40.conf
@@ -0,0 +1,19 @@
+# Copyright (c) 2020 Ryan Cross
+# SPDX-License-Identifier: MIT
+
+# Increasing the transmit power of the keyboard's BLE radio
+CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
+
+# Uncomment these two lines to add support for encoders
+CONFIG_EC11=y
+CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+
+# Enable deep sleep
+CONFIG_ZMK_SLEEP=y
+
+# Set NFC Pins on Xiao as GPIO
+CONFIG_NFCT_PINS_AS_GPIOS=y
+
+# Turn on logging, and set ZMK logging to debug output
+CONFIG_ZMK_USB_LOGGING=n
+# CONFIG_INPUT_LOG_LEVEL_DBG=y