summaryrefslogtreecommitdiff
path: root/keyboards/eagle_viper
diff options
context:
space:
mode:
authorMechMerlin2018-05-20 09:59:02 -0700
committerDrashna Jaelre2018-05-20 09:59:02 -0700
commit0b591fd84394e2c07d3047fb29e734b612bfc248 (patch)
treeb0c4196d8ebdb17970c6be02f9da43f133e25560 /keyboards/eagle_viper
parentc9102f9e35f479bd7d5dd06ce10a5089b199fb0d (diff)
Merlin community layouts (#3004)
* community layout support for eagle_viper v2 and remove mechmerlin keymap dir * community layout support for eagle_viper v2 and remove mechmerlin keymap dir * Change to QMK_KEYBOARD_H and remove merlin keymap in favor of cmmunity layouts * community layout support 60_ansi * community layout support for 60_ansi
Diffstat (limited to 'keyboards/eagle_viper')
-rw-r--r--keyboards/eagle_viper/rules.mk2
-rw-r--r--keyboards/eagle_viper/v2/keymaps/default/keymap.c2
-rw-r--r--keyboards/eagle_viper/v2/keymaps/mechmerlin/keymap.c44
-rw-r--r--keyboards/eagle_viper/v2/keymaps/mechmerlin/readme.md15
-rw-r--r--keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c2
5 files changed, 4 insertions, 61 deletions
diff --git a/keyboards/eagle_viper/rules.mk b/keyboards/eagle_viper/rules.mk
index ba2241fa8..ad8bd5ca1 100644
--- a/keyboards/eagle_viper/rules.mk
+++ b/keyboards/eagle_viper/rules.mk
@@ -1 +1,3 @@
DEFAULT_FOLDER = eagle_viper/v2
+
+LAYOUTS = 60_ansi \ No newline at end of file
diff --git a/keyboards/eagle_viper/v2/keymaps/default/keymap.c b/keyboards/eagle_viper/v2/keymaps/default/keymap.c
index 3fdd1cfdd..2a6bda74f 100644
--- a/keyboards/eagle_viper/v2/keymaps/default/keymap.c
+++ b/keyboards/eagle_viper/v2/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
* 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 "eagle_viper.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* layer 0: qwerty */
diff --git a/keyboards/eagle_viper/v2/keymaps/mechmerlin/keymap.c b/keyboards/eagle_viper/v2/keymaps/mechmerlin/keymap.c
deleted file mode 100644
index a7f14b678..000000000
--- a/keyboards/eagle_viper/v2/keymaps/mechmerlin/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2017 MechMerlin <mechmerlin@gmail.com>
- *
- * 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 "eagle_viper.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* layer 0: qwerty */
- [0] = LAYOUT_eagle(\
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, KC_RCTL),
-
- [1] = LAYOUT_eagle(\
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS,
- KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_PGDN, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, TG(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
- [2] = LAYOUT_eagle(\
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),
- };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
- return MACRO_NONE;
-};
diff --git a/keyboards/eagle_viper/v2/keymaps/mechmerlin/readme.md b/keyboards/eagle_viper/v2/keymaps/mechmerlin/readme.md
deleted file mode 100644
index 2e8784696..000000000
--- a/keyboards/eagle_viper/v2/keymaps/mechmerlin/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-MechMerlin's Duck Eagle V2 Layout
-======================
-
-This is the preferred 60% layout used by u/merlin36, host of the MechMerlin YouTube channel.
-
-![Duck Eagle V2 Layout](https://imgur.com/FRcsmJc.png)
-
-## Keymap Notes
-- Highly influenced by the KBP V60 and WKL B.Face standard layouts
-- Does not support any form of inswitch lighting as Merlin hates them.
-- Arrow toggle switch is FN + Space
-- Reset is FN + R
-
-### Build
-To build this keymap, simply run `make eagle_viper/v2:mechmerlin` from the qmk_firmware directory. \ No newline at end of file
diff --git a/keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c b/keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c
index bd53fc3e7..d3be5e800 100644
--- a/keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c
+++ b/keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c
@@ -13,7 +13,7 @@
* 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 "eagle_viper.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* layer 0: qwerty */