mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

Changed up some stuff

pull/14484/head^2
Batuhan Başerdem 2 years ago
parent
df42a1463e
commit
52f5ea4d33
11 changed files with 235 additions and 33 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk
  2. +24
    -0
      layouts/default/split_3x6_5/default_split_3x6_3/keymap.c
  3. +62
    -0
      layouts/default/split_3x6_5/info.json
  4. +12
    -0
      layouts/default/split_3x6_5/layout.json
  5. +5
    -0
      layouts/default/split_3x6_5/readme.md
  6. +109
    -0
      users/bbaserdem/;
  7. +2
    -2
      users/bbaserdem/bb-encoder.c
  8. +2
    -2
      users/bbaserdem/bb-macro.c
  9. +2
    -2
      users/bbaserdem/bb-macro.h
  10. +14
    -24
      users/bbaserdem/config.h
  11. +2
    -2
      users/bbaserdem/rules.mk

+ 1
- 1
keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk View File

@ -22,5 +22,5 @@ ifneq (,$(findstring splitkb/kyria/rev1,$(KEYBOARD)))
# Space savers
NKRO_ENABLE = no
VELOCIKEY_ENABLE = no
WPM_ENABLE = no
WPM_ENABLE = yes
endif

+ 24
- 0
layouts/default/split_3x6_5/default_split_3x6_3/keymap.c View File

@ -0,0 +1,24 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐
* │Tab│ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │Bsp│
* ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤
* │Ctl│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │
* ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤
* │Sft│ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │Sft│
* └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘
* ┌───┐ ┌───┐
* │GUI├───┐ ┌───┤Alt│
* └───┤Bsp├───┐ ┌───┤Ent├───┘
* └───┤ │ │ ├───┘
* └───┘ └───┘
*/
[0] = LAYOUT_split_3x6_3(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
)
};

+ 62
- 0
layouts/default/split_3x6_5/info.json View File

@ -0,0 +1,62 @@
{
"keyboard_name": "3x6+3 split layout",
"url": "",
"maintainer": "qmk",
"width": 14,
"height": 4.75,
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
{"x":0, "y":0.25},
{"x":1, "y":0.25},
{"x":2, "y":0.125},
{"x":3, "y":0},
{"x":4, "y":0.125},
{"x":5, "y":0.25},
{"x":8, "y":0.25},
{"x":9, "y":0.125},
{"x":10, "y":0},
{"x":11, "y":0.125},
{"x":12, "y":0.25},
{"x":13, "y":0.25},
{"x":0, "y":1.25},
{"x":1, "y":1.25},
{"x":2, "y":1.125},
{"x":3, "y":1},
{"x":4, "y":1.125},
{"x":5, "y":1.25},
{"x":8, "y":1.25},
{"x":9, "y":1.125},
{"x":10, "y":1},
{"x":11, "y":1.125},
{"x":12, "y":1.25},
{"x":13, "y":1.25},
{"x":0, "y":2.25},
{"x":1, "y":2.25},
{"x":2, "y":2.125},
{"x":3, "y":2},
{"x":4, "y":2.125},
{"x":5, "y":2.25},
{"x":8, "y":2.25},
{"x":9, "y":2.125},
{"x":10, "y":2},
{"x":11, "y":2.125},
{"x":12, "y":2.25},
{"x":13, "y":2.25},
{"x":3.5, "y":3.25},
{"x":4.5, "y":3.5},
{"x":5.5, "y":3.75},
{"x":7.5, "y":3.75},
{"x":8.5, "y":3.5},
{"x":9.5, "y":3.25}
]
}
}
}

+ 12
- 0
layouts/default/split_3x6_5/layout.json View File

@ -0,0 +1,12 @@
[{x:3,a:7},"",{x:6},""],
[{y:-0.875,x:2},"",{x:1},"",{x:4},"",{x:1},""],
[{y:-0.875},"","",{x:3},"",{x:2},"",{x:3},"",""],
[{y:-0.25,x:3},"",{x:6},""],
[{y:-0.875,x:2},"",{x:1},"",{x:4},"",{x:1},""],
[{y:-0.875},"","",{x:3},"",{x:2},"",{x:3},"",""],
[{y:-0.25,x:3},"",{x:6},""],
[{y:-0.875,x:2},"",{x:1},"",{x:4},"",{x:1},""],
[{y:-0.875},"","",{x:3},"",{x:2},"",{x:3},"",""],
[{x:3.5},"",{x:5},""],
[{y:-0.75,x:4.5},"",{x:3},""],
[{y:-0.75,x:5.5},"",{x:1},""]

+ 5
- 0
layouts/default/split_3x6_5/readme.md View File

@ -0,0 +1,5 @@
# split_3x6_5
LAYOUT_split_3x6_5
Layout for split keyboards with 3x6 keys and five thumb keys per hand. Examples include Kyria.

+ 109
- 0
users/bbaserdem/; View File

@ -0,0 +1,109 @@
/*
Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
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/>.
*/
#pragma once
#include "bbaserdem.h"
/* This header file contains definitons regarding custom keycodes.
* - Both regular and unicode macros are dealt with in this file
*/
// These will be delegated to keymap specific stuff (weak definition)
bool process_record_macro(uint16_t keycode, keyrecord_t *record);
// Unicodemap implementation
#ifdef UNICODEMAP_ENABLE
enum userspace_unicodemap {
UPC_A_CIRC,
UPC_C_CEDI,
UPC_G_BREV,
UPC_I_CIRC,
UPC_I_DOTL,
UPC_I_DOTT,
UPC_O_DIAE,
UPC_S_CEDI,
UPC_U_CIRC,
UPC_U_DIAE,
LOW_A_CIRC,
LOW_C_CEDI,
LOW_G_BREV,
LOW_I_CIRC,
LOW_I_DOTL,
LOW_I_DOTT,
LOW_O_DIAE,
LOW_S_CEDI,
LOW_U_CIRC,
LOW_U_DIAE,
ELLIPSIS,
PLANCK_CON,
ANGSTROM,
MATHPI,
BITCOIN,
UPC_ALPHA,
UPC_BETA,
UPC_GAMMA,
UPC_DELTA,
UPC_EPSILON,
UPC_ZETA,
UPC_ETA,
UPC_THETA,
UPC_IOTA,
UPC_KAPPA,
UPC_LAMBDA,
UPC_MU,
UPC_NU,
UPC_XI,
UPC_OMICRON,
UPC_PI,
UPC_RHO,
UPC_SIGMA,
UPC_TAU,
UPC_UPSILON,
UPC_PHI,
UPC_CHI,
UPC_PSI,
UPC_OMEGA,
LOW_ALPHA,
LOW_BETA,
LOW_GAMMA,
LOW_DELTA,
LOW_EPSILON,
LOW_ZETA,
LOW_ETA,
LOW_THETA,
LOW_IOTA,
LOW_KAPPA,
LOW_LAMBDA,
LOW_MU,
LOW_NU,
LOW_XI,
LOW_OMICRON,
LOW_PI,
LOW_RHO,
LOW_SIGMA,
LOW_TAU,
LOW_UPSILON,
LOW_PHI,
LOW_CHI,
LOW_PSI,
LOW_OMEGA,
};
#endif
// Tap dance stuff
#ifdef AUDIO_ENABLE
#ifdef TAP_DANCE_ENABLE
enum {
TD_AUDIO_TEMPO,
};
#endif
#endif

+ 2
- 2
users/bbaserdem/bb-encoder.c View File

@ -134,7 +134,7 @@ void encoder_state_string(uint8_t index, uint8_t layer, char* buffer) {
bool encoder_update_user(uint8_t index, bool clockwise) {
// Differentiate layer roles
switch (get_highest_layer(layer_state)) {
#ifdef(RGB_MATRIX_ENABLE)
#ifdef RGB_MATRIX_ENABLE
case _MEDI:
switch(encoder_state[index].rgb) {
case 0: // Effect the RGB mode
@ -283,7 +283,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
void encoder_click_action(uint8_t index) {
// Differentiate layer roles
switch (get_highest_layer(layer_state)) {
#ifdef(RGB_MATRIX_ENABLE)
#ifdef RGB_MATRIX_ENABLE
case _MEDI:
switch(encoder_state[index].rgb) {
case 0: // Return to no animation


+ 2
- 2
users/bbaserdem/bb-macro.c View File

@ -18,14 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Tap dance definitons
#ifdef AUDIO_ENABLE
#ifdef TAP_DANCE_ENABLE
qk_tap_dance_action_t tap_dance_actions[] = {
#ifdef AUDIO_ENABLE
// Music playback speed modulator
[TD_AUDIO_TEMPO] = ACTION_TAP_DANCE_DOUBLE(MU_SLOW, MU_FAST),
#endif
};
#endif
#endif
// Unicode definitions; for single character keys
// We mask their definitions if unicode is not enabled


+ 2
- 2
users/bbaserdem/bb-macro.h View File

@ -100,10 +100,10 @@ enum userspace_unicodemap {
#endif
// Tap dance stuff
#ifdef AUDIO_ENABLE
#ifdef TAP_DANCE_ENABLE
enum {
#ifdef AUDIO_ENABLE
TD_AUDIO_TEMPO,
#endif
};
#endif
#endif

+ 14
- 24
users/bbaserdem/config.h View File

@ -30,6 +30,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
#define NO_PRINT
#endif
// Split transport settings
#ifdef SPLIT_KEYBOARD
#define SPLIT_TRANSPORT_MIRROR
// #define SPLIT_LAYER_STATE_ENABLE
// #define SPLIT_MODS_ENABLE
#ifdef WPM_ENABLE
// #define SPLIT_WPM_ENABLE
#endif
#endif
// Unicode entry mode
#ifdef UNICODEMAP_ENABLE
#define UNICODE_SELECTED_MODES UC_LNX
@ -59,15 +70,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Backlight settings
#ifdef BACKLIGHT_ENABLE
// Turn on breathing only if audio is not enabled, due to hardware stuff
#ifndef AUDIO_ENABLE
#define BACKLIGHT_BREATHING
#define BREATHING_PERIOD 5
#endif
#define BACKLIGHT_BREATHING
#define BREATHING_PERIOD 5
#endif
// Enable RGB LED sleep mode
#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
#ifdef RGB_MATRIX_ENABLE
#define RGB_DISABLE_WHEN_USB_SUSPENDED true
#endif
@ -99,24 +107,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#endif
// For underglow light
#ifdef RGBLIGHT_ENABLE
// Enable animations
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
// Enable layer switching code
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 10
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
// If these are not defined; just default to entire board for layer
#define RGBLIGHT_LEFT_BEG 0
#define RGBLIGHT_LEFT_NUM RGBLED_NUM
#define RGBLIGHT_RIGHT_BEG 0
#define RGBLIGHT_RIGHT_NUM RGBLED_NUM
#endif
// For perkey leds
#ifdef RGB_MATRIX_ENABLE
// Start using this mode


+ 2
- 2
users/bbaserdem/rules.mk View File

@ -12,13 +12,12 @@
# Common compilation flags
EXTRAFLAGS += -flto # Used to make code smaller
#LTO_ENABLE = yes
LTO_ENABLE = yes
# These should be enabled in all boards
MOUSEKEY_ENABLE = yes # Mouse emulation keys
EXTRAKEY_ENABLE = yes # OS signals like volume control
UNICODEMAP_ENABLE = yes # Used for unicode character emulation
TAP_DANCE_ENABLE = yes # Tap dance keys; i don't use tap dance but I use tap-hold
# These should be disabled in all boards
BOOTMAGIC_ENABLE = no # Access to EEPROM settings, not needed
@ -34,6 +33,7 @@ API_SYSEX_ENABLE = no # Allows OS to send signals.
BLUETOOTH_ENABLE = no # For bluetooth
KEY_LOCK_ENABLE = no # Allows locking any key. Not used in general
RGBLIGHT_ENABLE = no # LED strip, but there is RGB_MATRIX instead
TAP_DANCE_ENABLE = no # Tap dance keys; i don't use tap dance
# These features can be enabled on ARM boards; disabled for AVR due to space
# NKRO_ENABLE = no # Default is 6KRO which is plenty


Write Preview
Loading…
Cancel
Save