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/gherkin/keymaps/bbaserdem/config.h | 4 +- keyboards/gherkin/keymaps/bbaserdem/keymap.c | 2 +- keyboards/gherkin/keymaps/bbaserdem/rules.mk | 5 +- keyboards/lets_split/keymaps/bbaserdem/config.h | 4 +- keyboards/lets_split/keymaps/bbaserdem/keymap.c | 17 +++--- .../lets_split/keymaps/bbaserdem_right/config.h | 4 +- .../lets_split/keymaps/bbaserdem_right/keymap.c | 10 ++-- .../lets_split/keymaps/bbaserdem_right/rules.mk | 2 + .../lets_split_eh/keymaps/bbaserdem/README.md | 7 +++ keyboards/lets_split_eh/keymaps/bbaserdem/config.h | 4 ++ keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c | 27 ++++++++++ keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk | 11 ++++ keyboards/planck/keymaps/bbaserdem/config.h | 8 +-- keyboards/planck/keymaps/bbaserdem/keymap.c | 18 +++---- keyboards/planck/keymaps/bbaserdem/rules.mk | 6 +-- keyboards/xd75/keymaps/bbaserdem/config.h | 20 +------ keyboards/xd75/keymaps/bbaserdem/keymap.c | 63 +--------------------- keyboards/xd75/keymaps/bbaserdem/readme.md | 6 ++- 18 files changed, 97 insertions(+), 121 deletions(-) create mode 100644 keyboards/lets_split_eh/keymaps/bbaserdem/README.md create mode 100755 keyboards/lets_split_eh/keymaps/bbaserdem/config.h create mode 100755 keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c create mode 100755 keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk (limited to 'keyboards') diff --git a/keyboards/gherkin/keymaps/bbaserdem/config.h b/keyboards/gherkin/keymaps/bbaserdem/config.h index 2bd89e8ec..37d7113e7 100644 --- a/keyboards/gherkin/keymaps/bbaserdem/config.h +++ b/keyboards/gherkin/keymaps/bbaserdem/config.h @@ -1,5 +1,5 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#ifndef CONFIG_KEYMAP_H +#define CONFIG_KEYMAP_H #include "../../config.h" #define RGB_DI_PIN F6 diff --git a/keyboards/gherkin/keymaps/bbaserdem/keymap.c b/keyboards/gherkin/keymaps/bbaserdem/keymap.c index d756f9b5c..0d3c8557c 100644 --- a/keyboards/gherkin/keymaps/bbaserdem/keymap.c +++ b/keyboards/gherkin/keymaps/bbaserdem/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void matrix_init_keymap(void) { +void matrix_init_user(void) { // Set LED's to max _delay_us(300); backlight_config.level = 2; diff --git a/keyboards/gherkin/keymaps/bbaserdem/rules.mk b/keyboards/gherkin/keymaps/bbaserdem/rules.mk index 4e3a41820..cd1cddebf 100644 --- a/keyboards/gherkin/keymaps/bbaserdem/rules.mk +++ b/keyboards/gherkin/keymaps/bbaserdem/rules.mk @@ -2,13 +2,16 @@ ifndef QUANTUM_DIR include ../../../../Makefile endif +USER_NAME := bbaserdem-nouserspace + STENO_ENABLE = no # Additional protocols for Stenography(+1700), requires VIRTSER MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = no # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work AUDIO_ENABLE = no # Enable audio output from keyboard + +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work RGBLIGHT_ENABLE = yes # Enable RBG light strips BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/lets_split/keymaps/bbaserdem/config.h b/keyboards/lets_split/keymaps/bbaserdem/config.h index f908e6d9a..6a90e1c35 100755 --- a/keyboards/lets_split/keymaps/bbaserdem/config.h +++ b/keyboards/lets_split/keymaps/bbaserdem/config.h @@ -1,5 +1,5 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#ifndef CONFIG_KEYMAP_H +#define CONFIG_KEYMAP_H #include "../../config.h" diff --git a/keyboards/lets_split/keymaps/bbaserdem/keymap.c b/keyboards/lets_split/keymaps/bbaserdem/keymap.c index 09da67a69..623117530 100755 --- a/keyboards/lets_split/keymaps/bbaserdem/keymap.c +++ b/keyboards/lets_split/keymaps/bbaserdem/keymap.c @@ -20,18 +20,17 @@ uint32_t layer_state_set_keymap(uint32_t state) { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Main Dvorak layer - [_DV] = DVORAK, + [_DV] = LAYOUT_letssplit_wrapper(DVORAK), // Turkish and special character overlay - [_AL] = ALTCHAR, + [_AL] = LAYOUT_letssplit_wrapper(ALTCHAR), // Gaming layer - [_GA] = GAME, + [_GA] = LAYOUT_letssplit_wrapper(GAME), // Numbers layer - [_NU] = NUMBERS, + [_NU] = LAYOUT_letssplit_wrapper(NUMBERS), // Settings layer - [_SE] = SETTINGS, + [_SE] = LAYOUT_letssplit_wrapper(SETTINGS), // Mouse emulation layer - [_MO] = MOUSE, -#ifdef AUDIO_ENABLE - [_MU] = MUSIC, -#endif + [_MO] = LAYOUT_letssplit_wrapper(MOUSE), + // Music layer + [_MU] = LAYOUT_letssplit_wrapper(MUSIC), }; diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/config.h b/keyboards/lets_split/keymaps/bbaserdem_right/config.h index 9b6527db2..47545a059 100755 --- a/keyboards/lets_split/keymaps/bbaserdem_right/config.h +++ b/keyboards/lets_split/keymaps/bbaserdem_right/config.h @@ -1,5 +1,5 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#ifndef CONFIG_KEYMAP_H +#define CONFIG_KEYMAP_H #include "../../config.h" diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c b/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c index 6faabce3c..2dcae0dca 100755 --- a/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c +++ b/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c @@ -22,10 +22,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' `-----------------------' */ // Main Dvorak layer - [0] = LAYOUT( - LCTL(LALT(KC_DEL)), LGUI(KC_GRV), LGUI(KC_Q), LGUI(KC_LALT), LGUI(KC_L), LGUI(KC_RGHT), KC_RPRN, KC_PMNS, KC_PPLS, KC_PEQL, KC_PENT, KC_BSPC, - LGUI(KC_F3), LGUI(KC_M), LGUI(KC_ENT), LGUI(KC_LCTL), LGUI(KC_K), LGUI(KC_UP), KC_LPRN, KC_PAST, KC_P9, KC_P6, KC_P3, KC_PDOT, - LGUI(KC_F2), LGUI(KC_T), LGUI(KC_SPC), LGUI(KC_LSFT), LGUI(KC_J), LGUI(KC_DOWN), KC_PERC, KC_PSLS, KC_P8, KC_P5, KC_P2, KC_PCMM, - LGUI(KC_F1), LGUI(KC_F), LGUI(KC_P), LGUI(KC_TAB), LGUI(KC_H), LGUI(KC_LEFT), KC_NLCK, KC_TAB, KC_P7, KC_P4, KC_P1, KC_P0 + [0] = LAYOUT_ortho_4x12( + LCTL(LALT(KC_DEL)), LGUI(KC_GRV), LGUI(KC_Q), LGUI(KC_LALT), LGUI(KC_L), LGUI(KC_RGHT), KC_RPRN, KC_PMNS, KC_PPLS, KC_PEQL, KC_PENT, KC_BSPC, \ + LGUI(KC_F3), LGUI(KC_M), LGUI(KC_ENT), LGUI(KC_LCTL), LGUI(KC_K), LGUI(KC_UP), KC_LPRN, KC_PAST, KC_P9, KC_P6, KC_P3, KC_PDOT, \ + LGUI(KC_F2), LGUI(KC_T), LGUI(KC_SPC), LGUI(KC_LSFT), LGUI(KC_J), LGUI(KC_DOWN), KC_PERC, KC_PSLS, KC_P8, KC_P5, KC_P2, KC_PCMM, \ + LGUI(KC_F1), LGUI(KC_F), LGUI(KC_P), LGUI(KC_TAB), LGUI(KC_H), LGUI(KC_LEFT), KC_NLCK, KC_TAB, KC_P7, KC_P4, KC_P1, KC_P0 \ ) }; diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk index 65a64c94f..36b4b8fc2 100755 --- a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk +++ b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk @@ -1,5 +1,7 @@ # Build options +USER_NAME := bbaserdem-without-userspace + BACKLIGHT_ENABLE = no # Switch LEDs MOUSEKEY_ENABLE = no # Emulates mouse key using keypresses RGBLIGHT_ENABLE = no # LED strips diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/README.md b/keyboards/lets_split_eh/keymaps/bbaserdem/README.md new file mode 100644 index 000000000..fcb703793 --- /dev/null +++ b/keyboards/lets_split_eh/keymaps/bbaserdem/README.md @@ -0,0 +1,7 @@ +# Lets Split Eh Layout + +Check out [user readme](../../../../users/bbaserdem/README.md) for more info. + +# Usage + +Fill in after flashing diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/config.h b/keyboards/lets_split_eh/keymaps/bbaserdem/config.h new file mode 100755 index 000000000..47be76567 --- /dev/null +++ b/keyboards/lets_split_eh/keymaps/bbaserdem/config.h @@ -0,0 +1,4 @@ +#ifndef CONFIG_KEYMAP_H +#define CONFIG_KEYMAP_H +#include "../../config.h" +#endif diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c b/keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c new file mode 100755 index 000000000..92e72bbf1 --- /dev/null +++ b/keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c @@ -0,0 +1,27 @@ +#include "lets_split_eh.h" +#include "bbaserdem.h" + + +void matrix_init_keymap (void) { +} + +uint32_t layer_state_set_keymap(uint32_t state) { + return state; +} + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // Main Dvorak layer + [_DV] = LAYOUT_letssplit_wrapper(DVORAK), + // Turkish and special character overlay + [_AL] = LAYOUT_letssplit_wrapper(ALTCHAR), + // Gaming layer + [_GA] = LAYOUT_letssplit_wrapper(GAME), + // Numbers layer + [_NU] = LAYOUT_letssplit_wrapper(NUMBERS), + // Settings layer + [_SE] = LAYOUT_letssplit_wrapper(SETTINGS), + // Mouse emulation layer + [_MO] = LAYOUT_letssplit_wrapper(MOUSE), + // Music layer + [_MU] = LAYOUT_letssplit_wrapper(MUSIC), +}; diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk b/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk new file mode 100755 index 000000000..4159db3fe --- /dev/null +++ b/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk @@ -0,0 +1,11 @@ +# Build options + +BACKLIGHT_ENABLE = no # 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 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 diff --git a/keyboards/xd75/keymaps/bbaserdem/config.h b/keyboards/xd75/keymaps/bbaserdem/config.h index 2c24bb767..28d32e562 100644 --- a/keyboards/xd75/keymaps/bbaserdem/config.h +++ b/keyboards/xd75/keymaps/bbaserdem/config.h @@ -1,21 +1,5 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 . - */ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#ifndef CONFIG_KEYMAP_H +#define CONFIG_KEYMAP_H #include "../../config.h" diff --git a/keyboards/xd75/keymaps/bbaserdem/keymap.c b/keyboards/xd75/keymaps/bbaserdem/keymap.c index 0b8ab6235..68071d018 100644 --- a/keyboards/xd75/keymaps/bbaserdem/keymap.c +++ b/keyboards/xd75/keymaps/bbaserdem/keymap.c @@ -15,66 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Tog|Mut| | ] | * `-----------------------------------------------------------' */ -[_DV] = KM( - BL_STEP, LGUI(KC_ESC), KC_GRV,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_WHOM, LGUI(KC_ENT), DVORAK_1, KC_CAPS, - KC_CALC, LGUI(KC_P), DVORAK_2, KC_BSLS, - KC_MPRV, KC_MNXT, DVORAK_3, KC_LBRC, - KC_MPLY, KC_MUTE, DVORAK_4, KC_RBRC ), - -[_AL] = KM( - _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, - _______,_______,_______, - _______,_______, ALTCHAR_1, _______, - _______,_______, ALTCHAR_2, _______, - _______,_______, ALTCHAR_3, _______, - _______,_______, ALTCHAR_4, _______ ), - -[_GA] = KM( - _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, - _______,_______,_______, - _______,_______, GAME_1, _______, - _______,_______, GAME_2, _______, - _______,_______, GAME_3, _______, - _______,_______, GAME_4, _______ ), - -[_NU] = KM( - _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, - _______,_______,_______, - _______,_______, NUMBERS_1, _______, - _______,_______, NUMBERS_2, _______, - _______,_______, NUMBERS_3, _______, - _______,_______, NUMBERS_4, _______ ), - -[_SE] = KM( - _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, - _______,_______,_______, - _______,_______, SETTINGS_1, _______, - _______,_______, SETTINGS_2, _______, - _______,_______, SETTINGS_3, _______, - _______,_______, SETTINGS_4, _______ ), - -[_MO] = KM( - _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, - _______,_______,_______, - _______,_______, MOUSE_1, _______, - _______,_______, MOUSE_2, _______, - _______,_______, MOUSE_3, _______, - _______,_______, MOUSE_4, _______ ), - -#ifdef AUDIO_ENABLE -[_MU] = KM( - XXX, XXX, MASK, XXX, - XXX, XXX, MASK, XXX, - XXX, XXX, MASK, XXX, - XXX, XXX, MASK, XXX, - XXX, XXX, MUSIC_4, XXX ), -#endif - +[0] = KM( FKLAVYE ), +[1] = KM( AYARLAR ), }; diff --git a/keyboards/xd75/keymaps/bbaserdem/readme.md b/keyboards/xd75/keymaps/bbaserdem/readme.md index 68a05b030..f96c8ea97 100644 --- a/keyboards/xd75/keymaps/bbaserdem/readme.md +++ b/keyboards/xd75/keymaps/bbaserdem/readme.md @@ -1,7 +1,9 @@ # XD75RE Setup -This layout is the xd75re layout, inspired by my planck keymap. -Contains some code from the original keymap here, but had to be modded. +(WIP) F keyboard for turkish, using unicode. + +* Write down keymap in userspace +* Figure out LED indicators # Make -- cgit v1.2.3-24-g4f1b