From 48ed9fe01d3861689e037f6dab69149e82c08189 Mon Sep 17 00:00:00 2001
From: kurtis-lew <kurtis.a.lew@gmail.com>
Date: Thu, 20 May 2021 21:16:31 -0700
Subject: [PATCH] Revert "Revert "Merge branch 'pr/684' into testing""

This reverts commit 0f4dbeee2a297528d7ca17b768fb2f59237f273d.
---
 .github/workflows/build.yml                   |  1 +
 .../two_percent_milk/Kconfig.defconfig        |  9 +++++++
 .../shields/two_percent_milk/Kconfig.shield   |  5 ++++
 .../two_percent_milk/two_percent_milk.keymap  | 24 +++++++++++++++++++
 .../two_percent_milk/two_percent_milk.overlay | 24 +++++++++++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 app/boards/shields/two_percent_milk/Kconfig.defconfig
 create mode 100644 app/boards/shields/two_percent_milk/Kconfig.shield
 create mode 100644 app/boards/shields/two_percent_milk/two_percent_milk.keymap
 create mode 100644 app/boards/shields/two_percent_milk/two_percent_milk.overlay

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7011283..08713147 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,6 +46,7 @@ jobs:
           - lily58_right
           - microdox_left
           - microdox_right
+          - two_percent_milk
           - nibble
           - qaz
           - quefrency_left
diff --git a/app/boards/shields/two_percent_milk/Kconfig.defconfig b/app/boards/shields/two_percent_milk/Kconfig.defconfig
new file mode 100644
index 00000000..82126ca5
--- /dev/null
+++ b/app/boards/shields/two_percent_milk/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_TWO_PERCENT_MILK
+
+config ZMK_KEYBOARD_NAME
+    default "2% Milk"
+
+endif
diff --git a/app/boards/shields/two_percent_milk/Kconfig.shield b/app/boards/shields/two_percent_milk/Kconfig.shield
new file mode 100644
index 00000000..700eaa13
--- /dev/null
+++ b/app/boards/shields/two_percent_milk/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_TWO_PERCENT_MILK
+	def_bool $(shields_list_contains,two_percent_milk)
diff --git a/app/boards/shields/two_percent_milk/two_percent_milk.keymap b/app/boards/shields/two_percent_milk/two_percent_milk.keymap
new file mode 100644
index 00000000..c2bf02a7
--- /dev/null
+++ b/app/boards/shields/two_percent_milk/two_percent_milk.keymap
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+ #include <behaviors.dtsi>
+ #include <dt-bindings/zmk/keys.h>
+ #include <dt-bindings/zmk/bt.h>
+ 
+ #define DEFAULT 0
+ 
+ / {
+     keymap {
+         compatible = "zmk,keymap";
+ 
+         default_layer {
+             bindings = <
+              &kp X
+              &kp Z
+             >;
+         };
+     };
+ };
\ No newline at end of file
diff --git a/app/boards/shields/two_percent_milk/two_percent_milk.overlay b/app/boards/shields/two_percent_milk/two_percent_milk.overlay
new file mode 100644
index 00000000..1cc7afbe
--- /dev/null
+++ b/app/boards/shields/two_percent_milk/two_percent_milk.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+	};
+
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-direct";
+
+		label = "KSCAN";
+
+		input-gpios
+            = <&pro_micro_d 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			;
+
+	};
+
+};
\ No newline at end of file