Refactor to using .keymap files

* Still just devicetree keymaps.
* Filename can now use `<board>.keymap` or
  `<shield>.keymap` convention, including
  overrides for revisions, etc.

14 files changed, 0 insertions, 179 deletions

diff --git a/app/boards/arm/planck/keymap/keymap.overlay b/app/boards/arm/planck/planck_rev6.keymap
index f474ec9..f474ec9 100644
--- a/app/boards/arm/planck/keymap/keymap.overlay
+++ b/app/boards/arm/planck/planck_rev6.keymap
diff --git a/app/boards/shields/clueboard_california/keymap/keymap.overlay b/app/boards/shields/clueboard_california/clueboard_california.keymap
index c2fa7f8..c2fa7f8 100644
--- a/app/boards/shields/clueboard_california/keymap/keymap.overlay
+++ b/app/boards/shields/clueboard_california/clueboard_california.keymap
diff --git a/app/boards/shields/kyria/keymap/keymap.overlay b/app/boards/shields/kyria/kyria.keymap
index 53101ff..53101ff 100644
--- a/app/boards/shields/kyria/keymap/keymap.overlay
+++ b/app/boards/shields/kyria/kyria.keymap
diff --git a/app/boards/shields/lily58/keymap/keymap.overlay b/app/boards/shields/lily58/lily58.keymap
index a198770..a198770 100644
--- a/app/boards/shields/lily58/keymap/keymap.overlay
+++ b/app/boards/shields/lily58/lily58.keymap
diff --git a/app/boards/shields/petejohanson_handwire/Kconfig.defconfig b/app/boards/shields/petejohanson_handwire/Kconfig.defconfig
deleted file mode 100644
index 7da09ac..0000000
--- a/app/boards/shields/petejohanson_handwire/Kconfig.defconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-
-if SHIELD_PETEJOHANSON_HANDWIRE
-
-config ZMK_KEYBOARD_NAME
-	default "Pete's Handwire Breadboard"
-
-config ZMK_BLE
-	default y
-
-config ZMK_ACTION_MOD_TAP
-	default y
-
-endif
diff --git a/app/boards/shields/petejohanson_handwire/Kconfig.shield b/app/boards/shields/petejohanson_handwire/Kconfig.shield
deleted file mode 100644
index defb90a..0000000
--- a/app/boards/shields/petejohanson_handwire/Kconfig.shield
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2019 Linaro Limited
-# SPDX-License-Identifier: MIT
-
-config SHIELD_PETEJOHANSON_HANDWIRE
-	def_bool $(shields_list_contains,petejohanson_handwire)
diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay
deleted file mode 100644
index b294171..0000000
--- a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <dt-bindings/zmk/keys.h>
-#include <behaviors.dtsi>
-
-/ {
-	chosen {
-		zmk,keymap = &keymap0;
-	};
-
-	keymap0: keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-		layers = <&default &lower &raise>;
-	};
-
-	layers {
-		compatible = "zmk,layers";
-
-		default: layer_0 {
-			label = "DEFAULT";
-			bindings = <
-				&cp M_NEXT &mt MOD_LSFT B &trans &trans
-				&mo 1  &mo 2         &trans &trans>;
-		};
-
-		lower: layer_1 {
-			label = "LOWER";
-
-			bindings = <
-				&cp M_PLAY &cp M_NEXT &trans &trans
-				&trans  &trans &trans &trans>;
-		};
-
-		raise: layer_2 {
-			label = "RAISE";
-			bindings = <
-				&kp C &kp D &trans &trans
-				&trans  &kp E &trans &trans>;
-		};
-	};
-};
diff --git a/app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
deleted file mode 100644
index 63829ba..0000000
--- a/app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER=y
diff --git a/app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
deleted file mode 100644
index 95b0835..0000000
--- a/app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/ {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
-
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-composite";
-		label = "KSCAN_COMP";
-		rows = <2>;
-		columns = <4>;
-
-		left {
-			kscan = <&left_hand>;
-		};
-
-		right {
-			kscan = <&right_hand>;
-			column-offset = <2>;
-		};
-	};
-
-	left_hand: kscan_1 {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN_LEFT";
-
-		diode-direction = "row2col";
-		row-gpios = <&arduino_header 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-		            <&arduino_header 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		col-gpios = <&arduino_header 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-		            <&arduino_header 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-	};
-
-	right_hand: kscan_2 {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN_RIGHT";
-
-		diode-direction = "row2col";
-		row-gpios = <&arduino_header 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-		            <&arduino_header 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		col-gpios = <&arduino_header 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-		            <&arduino_header 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-	};
-};
diff --git a/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.defconfig b/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.defconfig
deleted file mode 100644
index 5098fc8..0000000
--- a/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.defconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-
-if SHIELD_PETEJOHANSON_PRO_MICRO_HANDWIRE
-
-config ZMK_KEYBOARD_NAME
-	default "Pete's ProMicro Compat Handwire"
-
-config ZMK_USB
-	default y
-
-config ZMK_ACTION_MOD_TAP
-	default y
-
-endif
diff --git a/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.shield b/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.shield
deleted file mode 100644
index b6264db..0000000
--- a/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.shield
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2020 Pete Johanson
-# SPDX-License-Identifier: MIT
-
-config SHIELD_PETEJOHANSON_PRO_MICRO_HANDWIRE
-	def_bool $(shields_list_contains,petejohanson_pro_micro_handwire)
diff --git a/app/boards/shields/petejohanson_pro_micro_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_pro_micro_handwire/keymap/keymap.overlay
deleted file mode 100644
index ca03557..0000000
--- a/app/boards/shields/petejohanson_pro_micro_handwire/keymap/keymap.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/keys.h>
-
-/ {
-	chosen {
-		zmk,keymap = &keymap0;
-	};
-	keymap0: keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-		layers = <&default &lower &raise>;
-	};
-
-	layers {
-		compatible = "zmk,layers";
-
-		default: layer_0 {
-			label = "DEFAULT";
-
-			bindings = <
-				&mo 1 &kp A
-				&mo 2 &kp C>;
-		};
-
-		lower: layer_1 {
-			label = "LOWER";
-
-			bindings = <
-				&trans &kp D
-				&trans &kp E>;
-		};
-
-		raise: layer_2 {
-			label = "RAISE";
-
-			bindings = <
-				&trans &kp I
-				&trans &kp H>;
-		};
-	};
-};
diff --git a/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.conf b/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.conf
deleted file mode 100644
index e69de29..0000000
--- a/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.conf
+++ /dev/null
diff --git a/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.overlay b/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.overlay
deleted file mode 100644
index 1b27b93..0000000
--- a/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/ {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
-
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
-
-		diode-direction = "row2col";
-		row-gpios = <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-		            <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		col-gpios = <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-		            <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-	};
-};