From 738a9fc16c833d79831c5a26eb33880661e33524 Mon Sep 17 00:00:00 2001 From: Batuhan Baserdem Date: Wed, 18 Jul 2018 23:17:55 -0400 Subject: Userspace update for user bbaserdem (#3443) * Put in my keymaps * Fixed all but weird lets split issue * Organized and tried to trobleshoot lets split * Organized and tried to trobleshoot lets split * Added bbaserdem keymaps * Added bbaserdem keymaps * Fixed stuff * FIxed a filename error * Lets split eh * Finalized things regarding keymap --- keyboards/planck/keymaps/bbaserdem/config.h | 8 +++++--- keyboards/planck/keymaps/bbaserdem/keymap.c | 18 ++++++++---------- keyboards/planck/keymaps/bbaserdem/rules.mk | 6 +----- 3 files changed, 14 insertions(+), 18 deletions(-) (limited to 'keyboards/planck') diff --git a/keyboards/planck/keymaps/bbaserdem/config.h b/keyboards/planck/keymaps/bbaserdem/config.h index 2edb45673..ac5460bda 100755 --- a/keyboards/planck/keymaps/bbaserdem/config.h +++ b/keyboards/planck/keymaps/bbaserdem/config.h @@ -1,7 +1,7 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#ifndef CONFIG_KEYMAP_H +#define CONFIG_KEYMAP_H -#include "../../config.h" +#include "config_common.h" // LED strip stuff #ifdef RGBLIGHT_ENABLE @@ -19,4 +19,6 @@ #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1 #endif +#define ENCODER_RESOLUTION 4 + #endif diff --git a/keyboards/planck/keymaps/bbaserdem/keymap.c b/keyboards/planck/keymaps/bbaserdem/keymap.c index 0f6e4fbc5..1fa8132dd 100755 --- a/keyboards/planck/keymaps/bbaserdem/keymap.c +++ b/keyboards/planck/keymaps/bbaserdem/keymap.c @@ -6,25 +6,23 @@ * Check qmk_firmware/users/bbaserdem for the main part of the code */ -#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example" #include "planck.h" #include "bbaserdem.h" + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Main Dvorak layer - [_DV] = DVORAK, + [_DV] = LAYOUT_planck_wrapper(DVORAK), // Turkish and special character overlay - [_AL] = ALTCHAR, + [_AL] = LAYOUT_planck_wrapper(ALTCHAR), // Gaming layer - [_GA] = GAME, + [_GA] = LAYOUT_planck_wrapper(GAME), // Numbers layer - [_NU] = NUMBERS, + [_NU] = LAYOUT_planck_wrapper(NUMBERS), // Settings layer - [_SE] = SETTINGS, + [_SE] = LAYOUT_planck_wrapper(SETTINGS), // Mouse emulation layer - [_MO] = MOUSE, -#ifdef MUSIC_ENABLE + [_MO] = LAYOUT_planck_wrapper(MOUSE), // Music mode - [_MU] = MUSIC, -#endif + [_MU] = LAYOUT_planck_wrapper(MUSIC), }; diff --git a/keyboards/planck/keymaps/bbaserdem/rules.mk b/keyboards/planck/keymaps/bbaserdem/rules.mk index e2b5eb3c3..b9b589e8d 100755 --- a/keyboards/planck/keymaps/bbaserdem/rules.mk +++ b/keyboards/planck/keymaps/bbaserdem/rules.mk @@ -4,8 +4,4 @@ BACKLIGHT_ENABLE = yes # Switch LEDs MOUSEKEY_ENABLE = yes # Emulates mouse key using keypresses RGBLIGHT_ENABLE = yes # LED strips TAP_DANCE_ENABLE = no # Use multi-tap features -AUDIO_ENABLE = no # Audio stuff - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +AUDIO_ENABLE = yes # Audio stuff -- cgit v1.2.3-24-g4f1b