From 05b7383703d9e7bb68f29765adf865ba78facf2d Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Aug 2018 15:05:58 -0400 Subject: Keyboard: Refactor Levinson to use split common code (#3639) * Migrate Levinson to use split_common code * Update keymap --- keyboards/levinson/keymaps/bakingpy2u/config.h | 7 +------ keyboards/levinson/keymaps/bakingpy2u/keymap.c | 4 +--- keyboards/levinson/keymaps/bakingpy2u/rules.mk | 4 ---- keyboards/levinson/keymaps/default/config.h | 8 ++------ keyboards/levinson/keymaps/default/rules.mk | 5 ++--- keyboards/levinson/keymaps/treadwell/keymap.c | 4 +--- keyboards/levinson/keymaps/treadwell/rules.mk | 4 ---- keyboards/levinson/keymaps/valgrahf/rules.mk | 5 ----- 8 files changed, 7 insertions(+), 34 deletions(-) (limited to 'keyboards/levinson/keymaps') diff --git a/keyboards/levinson/keymaps/bakingpy2u/config.h b/keyboards/levinson/keymaps/bakingpy2u/config.h index 75753ac2e7..1db6ea433f 100644 --- a/keyboards/levinson/keymaps/bakingpy2u/config.h +++ b/keyboards/levinson/keymaps/bakingpy2u/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" +#pragma once /* Use I2C or Serial, not both */ @@ -22,5 +19,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - -#endif diff --git a/keyboards/levinson/keymaps/bakingpy2u/keymap.c b/keyboards/levinson/keymaps/bakingpy2u/keymap.c index da46d2a05a..219e3468fb 100644 --- a/keyboards/levinson/keymaps/bakingpy2u/keymap.c +++ b/keyboards/levinson/keymaps/bakingpy2u/keymap.c @@ -1,6 +1,4 @@ -#include "levinson.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/levinson/keymaps/bakingpy2u/rules.mk b/keyboards/levinson/keymaps/bakingpy2u/rules.mk index 22b6ec4766..d7463419b4 100644 --- a/keyboards/levinson/keymaps/bakingpy2u/rules.mk +++ b/keyboards/levinson/keymaps/bakingpy2u/rules.mk @@ -1,6 +1,2 @@ RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/levinson/keymaps/default/config.h b/keyboards/levinson/keymaps/default/config.h index 6b31e8d14e..e710d6e4aa 100644 --- a/keyboards/levinson/keymaps/default/config.h +++ b/keyboards/levinson/keymaps/default/config.h @@ -3,6 +3,7 @@ This is the c configuration file for the keymap Copyright 2012 Jun Wako Copyright 2015 Jack Humbert +Copyright 2018 Danny Nguyen 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 @@ -18,10 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" +#pragma once /* Use I2C or Serial, not both */ @@ -33,5 +31,3 @@ along with this program. If not, see . #define MASTER_LEFT // #define MASTER_RIGHT // #define EE_HANDS - -#endif diff --git a/keyboards/levinson/keymaps/default/rules.mk b/keyboards/levinson/keymaps/default/rules.mk index 457a3d01d4..d7463419b4 100644 --- a/keyboards/levinson/keymaps/default/rules.mk +++ b/keyboards/levinson/keymaps/default/rules.mk @@ -1,3 +1,2 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +RGBLIGHT_ENABLE = yes +BACKLIGHT_ENABLE = yes diff --git a/keyboards/levinson/keymaps/treadwell/keymap.c b/keyboards/levinson/keymaps/treadwell/keymap.c index 10d7d30355..f930ebb795 100644 --- a/keyboards/levinson/keymaps/treadwell/keymap.c +++ b/keyboards/levinson/keymaps/treadwell/keymap.c @@ -1,6 +1,4 @@ -#include "levinson.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/levinson/keymaps/treadwell/rules.mk b/keyboards/levinson/keymaps/treadwell/rules.mk index c5e16f1369..1d2d9e5a9c 100644 --- a/keyboards/levinson/keymaps/treadwell/rules.mk +++ b/keyboards/levinson/keymaps/treadwell/rules.mk @@ -1,6 +1,2 @@ RGBLIGHT_ENABLE = no BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/levinson/keymaps/valgrahf/rules.mk b/keyboards/levinson/keymaps/valgrahf/rules.mk index 0db809fe4b..1f54b32c48 100644 --- a/keyboards/levinson/keymaps/valgrahf/rules.mk +++ b/keyboards/levinson/keymaps/valgrahf/rules.mk @@ -1,8 +1,3 @@ RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes AUDIO_ENABLE = no -USE_I2C = no - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif -- cgit v1.2.3