From 0b591fd84394e2c07d3047fb29e734b612bfc248 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Sun, 20 May 2018 09:59:02 -0700 Subject: 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 --- keyboards/v60_type_r/keymaps/default/keymap.c | 2 +- keyboards/v60_type_r/keymaps/vimouse/keymap.c | 2 +- keyboards/v60_type_r/rules.mk | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'keyboards/v60_type_r') diff --git a/keyboards/v60_type_r/keymaps/default/keymap.c b/keyboards/v60_type_r/keymaps/default/keymap.c index 3ba77c658..4f9b7f9b2 100644 --- a/keyboards/v60_type_r/keymaps/default/keymap.c +++ b/keyboards/v60_type_r/keymaps/default/keymap.c @@ -17,7 +17,7 @@ /* This is the default ANSI layout provided by the KBP V60 Type R * as depicted in their manual and on the stock keycaps. */ -#include "v60_type_r.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c index 1e3775ab6..fba711148 100644 --- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c +++ b/keyboards/v60_type_r/keymaps/vimouse/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 . */ -#include "v60_type_r.h" +#include QMK_KEYBOARD_H #define _____ KC_TRNS #define XXXXX KC_NO diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk index b970f2722..afd65cd1a 100644 --- a/keyboards/v60_type_r/rules.mk +++ b/keyboards/v60_type_r/rules.mk @@ -67,3 +67,5 @@ UNICODE_ENABLE ?= no # Unicode BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE ?= no # Audio output on port C6 FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches + +LAYOUTS = 60_ansi \ No newline at end of file -- cgit v1.2.3-24-g4f1b