From 0f4dbeee2a297528d7ca17b768fb2f59237f273d Mon Sep 17 00:00:00 2001 From: kurtis-lew Date: Thu, 20 May 2021 21:04:42 -0700 Subject: [PATCH] Revert "Merge branch 'pr/684' into testing" This reverts commit a02aba653951c2e2ce41d8ac84651dd4ccebb7e5, reversing changes made to 8fbaeddea5f12628b2d18a8fea49ea92329d7ee9. --- .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 deletions(-) delete mode 100644 app/boards/shields/two_percent_milk/Kconfig.defconfig delete mode 100644 app/boards/shields/two_percent_milk/Kconfig.shield delete mode 100644 app/boards/shields/two_percent_milk/two_percent_milk.keymap delete 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 08713147..d7011283 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,6 @@ 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 deleted file mode 100644 index 82126ca5..00000000 --- a/app/boards/shields/two_percent_milk/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# 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 deleted file mode 100644 index 700eaa13..00000000 --- a/app/boards/shields/two_percent_milk/Kconfig.shield +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index c2bf02a7..00000000 --- a/app/boards/shields/two_percent_milk/two_percent_milk.keymap +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2021 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - - #include - #include - #include - - #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 deleted file mode 100644 index 1cc7afbe..00000000 --- a/app/boards/shields/two_percent_milk/two_percent_milk.overlay +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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