Merge remote-tracking branch 'upstream/master' into develop

4 files changed, 0 insertions, 88 deletions

diff --git a/keyboards/keyhive/maypad/keymaps/eosti/config.h b/keyboards/keyhive/maypad/keymaps/eosti/config.h
deleted file mode 100644
index 8e6a83b791..0000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#define TAPPING_TERM 200
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/keymap.c b/keyboards/keyhive/maypad/keymaps/eosti/keymap.c
deleted file mode 100644
index e4d4b87b7a..0000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _MOD
-};
-
-// Keymaps Shortcut Defines
-
-#define ESC_MOD LT(_MOD, KC_ESC)
-#define MOD     TG(_MOD)
-#define SQRT    RALT(KC_V)      // (macOS) Prints √
-#define NEQL    RALT(KC_EQL)    // (macOS) Prints ≠
-#define PM      RALT(KC_PLUS)   // (macOS) Prints ±
-#define PI      RALT(KC_P)      // (macOS) Prints π
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_QWERTY] = LAYOUT_numpad_5x4_split_plus(
-    // ┌────────┬────────┬────────┬────────┐
-         ESC_MOD, KC_PSLS, KC_PAST, KC_PEQL,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P1,   KC_P2,   KC_P3,
-    // ├─────────────────┼────────┼        ┤
-              KC_P0,       KC_PDOT, KC_PENT
-    // ├─────────────────┴────────┴────────┘
-    ),
-    [_MOD] = LAYOUT_numpad_5x4_split_plus(
-    // ┌────────┬────────┬────────┬────────┐
-          MOD,     SQRT,  KC_CIRC,   NEQL,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P7,   KC_P8,   KC_P9,     PM,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P4,   KC_P5,   KC_P6,     PI,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P1,   KC_P2,   KC_P3,
-    // ├─────────────────┼────────┼        ┤
-              KC_P0,       KC_BSPC, KC_TAB
-    // ├─────────────────┴────────┴────────┘
-    )
-
-};
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/readme.md b/keyboards/keyhive/maypad/keymaps/eosti/readme.md
deleted file mode 100644
index 5b3ee3bc82..0000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# EosTi's Maypad Layout
-
-## Features
-* Split-plus layout (who needs a massive plus anyway)
-* Tapdance ESC/mod key, giving access to special characters and mod functions
-* Standard numpad base layer
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/rules.mk b/keyboards/keyhive/maypad/keymaps/eosti/rules.mk
deleted file mode 100644
index 4c1902ee99..0000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-LTO_ENABLE = yes