keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2023-01-13 22:21:11 +00:00
commit 6f575fb23b
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
keyboards/planck/keymaps/gitdrik/config.h
View File

@ -1,4 +1,4 @@
/* Original code probably copyright 2015-2017 Jack Humbert
/* Copyright 2015-2021 Jack Humbert
*
* 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
@ -14,18 +14,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Passed along from planck default to Finnish SFS 5966 by gitdrik, 2020. */
/* Passed along from planck default to Finnish SFS 5966 by gitdrik, 2020-2023. */
#pragma once
#ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(PLANCK_SOUND)
// #define STARTUP_SONG SONG(NO_SOUND)
# define STARTUP_SONG SONG(NO_SOUND)
//# define STARTUP_SONG SONG(PLANCK_SOUND)
//# define AUDIO_INIT_DELAY // Get startup_song to actually play
#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
SONG(COLEMAK_SOUND), \
SONG(DVORAK_SOUND) \
}
# define DEFAULT_LAYER_SONGS \
{ SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
#endif
/*
@ -51,3 +50,4 @@
// Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4

46
keyboards/planck/keymaps/gitdrik/keymap.c
View File

@ -1,4 +1,4 @@
/* Copyright 2015-2017 Jack Humbert
/* Copyright 2015-2021 Jack Humbert
*
* 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
@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Modified from planck default to Finnish SFS 5966 by gitdrik, 2020. */
/* Modified from planck default to Finnish SFS 5966 by gitdrik, 2020-2023. */
#include QMK_KEYBOARD_H
#include "muse.h"
@ -38,35 +38,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Å |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | A | S | D | F | G | H | J | K | L | Ö | Ä |
* | Ctrl | A | S | D | F | G | H | J | K | L | Ö | Ä |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Ctrl | Shift| X | C | V | B | N | M | , | . | Shift| Enter|
* | Esc | Shift| X | C | V | B | N | M | , | . | Shift| Enter|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Z | GUI | Alt |Left2 | Left |BkSpc | Spc |Right |Rghter| < | - | / |
* | Z | GUI | Alt |Left2 | Left |BkSpc | Spc |Right |Rghter| \ | - | / |
* `-----------------------------------------------------------------------------------'
*/
[_BASE] = LAYOUT_planck_grid(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LCTL, KC_LSFT, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_ENT ,
KC_Z, KC_LGUI, KC_LALT, LEFTER, LEFT, KC_BSPC, KC_SPC, RIGHT, RIGHTER, KC_NUBS, KC_SLSH, LSFT(KC_7)
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
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_ESC, KC_LSFT, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_ENT ,
KC_Z, KC_LGUI, KC_LALT, LEFTER, LEFT, KC_BSPC, KC_SPC, RIGHT, RIGHTER, RALT(KC_MINS), KC_SLSH, KC_PSLS
),
/* Left
* ,-----------------------------------------------------------------------------------.
* | Tab | F10 | F9 | F8 | F7 | { | } | 7 | 8 | 9 | ^ | = |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | F11 | F6 | F5 | F4 | ( | ) | 4 | 5 | 6 | + | * |
* | RCtrl| F11 | F6 | F5 | F4 | ( | ) | 4 | 5 | 6 | + | * |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | RCtrl| Shift| F3 | F2 | F1 | [ | ] | 1 | 2 | 3 | Shift| Enter|
* | Esc | Shift| F3 | F2 | F1 | [ | ] | 1 | 2 | 3 | Shift| Enter|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | F12 | GUI | Alt |Lefter| Left |BkSpc | Spc |Right | 0 | , | - | / |
* `-----------------------------------------------------------------------------------'
*/
[_LEFT] = LAYOUT_planck_grid(
KC_TRNS, KC_F10, KC_F9, KC_F8, KC_F7, RALT(KC_7), RALT(KC_0), KC_7, KC_8, KC_9, LSFT(KC_RBRC), LSFT(KC_0),
KC_TRNS, KC_F11, KC_F6, KC_F5, KC_F4, LSFT(KC_8), LSFT(KC_9), KC_4, KC_5, KC_6, KC_PPLS, KC_PAST,
KC_RCTL, KC_TRNS, KC_F3, KC_F2, KC_F1, RALT(KC_8), RALT(KC_9), KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
KC_RCTL, KC_F11, KC_F6, KC_F5, KC_F4, LSFT(KC_8), LSFT(KC_9), KC_4, KC_5, KC_6, KC_PPLS, KC_PAST,
KC_TRNS, KC_TRNS, KC_F3, KC_F2, KC_F1, RALT(KC_8), RALT(KC_9), KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_COMM, KC_PMNS, KC_PSLS
),
@ -74,36 +74,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-----------------------------------------------------------------------------------.
* | Tab | ◌̄ | ◌̈ | ◌́ | ◌̀ | ◌̃ | ◌̆ | Home | Up | End | Ins | PgUp |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | @ | $ | ° | & | # | % | Left | Down | Right| Del | PgDn |
* | RCtrl| @ | $ | ° | & | # | % | Left | Down | Right| Del | PgDn |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | RCtrl| Shift| ” | « | » | ‚ „ | ‰ |PlayPs| << | >> | Shift| Enter|
* | Esc | Shift| ” | « | » | ‚ „ | ‰ |PlayPs| << | >> | Shift| Enter|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | “ | GUI | Alt |Lefter| |BkSpc | Spc |Right |Rghter| Vol- | Vol+ | Mute |
* `-----------------------------------------------------------------------------------'
*/
[_RIGHT] = LAYOUT_planck_grid(
KC_TRNS, RALT(LSFT(KC_RBRC)), KC_RBRC, KC_EQL , LSFT(KC_EQL), RALT(KC_RBRC), RALT(KC_NUHS), KC_HOME, KC_UP, KC_END , KC_INS , KC_PGUP,
KC_TRNS, RALT(KC_2), RALT(KC_4), RALT(LSFT(KC_0)), LSFT(KC_6), LSFT(KC_3), LSFT(KC_5), KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_PGDN,
KC_RCTL, KC_TRNS, RALT(LSFT(KC_2)), RALT(LSFT(KC_4)), RALT(LSFT(KC_3)), RALT(KC_6), RALT(KC_5), KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
RALT(LSFT(KC_5)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE
KC_RCTL, RALT(KC_2), RALT(KC_4), RALT(LSFT(KC_0)), LSFT(KC_6), LSFT(KC_3), LSFT(KC_5), KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_PGDN,
KC_TRNS, KC_TRNS, RALT(LSFT(KC_2)), RALT(LSFT(KC_4)), RALT(LSFT(KC_3)), RALT(KC_6), RALT(KC_5), KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
RALT(LSFT(KC_5)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE
),
/* Lefter
* ,-----------------------------------------------------------------------------------.
* | Tab | § ½ | " | € | | þ Þ | ¡ | ! | ı | œ Œ | ◌̛ ◌̉ | ◌̋ ◌̊ |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | ə Ə | ß ẞ | ð Ð | ' | | | | ĸ | ◌̵ | ø Ø | æ Æ |
* | Ctrl | ə Ə | ß ẞ | ð Ð | ' | < | > | | ĸ | ◌̵ | ø Ø | æ Æ |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Ctrl | Shift| × · | ◌̧ ◌̨ | | \ | ŋ Ŋ | µ — | ’ ‘ | ◌̣ ◌̇ | Shift| Enter|
* | Esc | Shift| × · | ◌̧ ◌̨ | | | ŋ Ŋ | µ — | ’ ‘ | ◌̣ ◌̇ | Shift| Enter|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | ʒ Ʒ | GUI | Alt |Lefter| | BkSpc| NbSp | |Rghter| | | – ◌̦ | ? |
* `-----------------------------------------------------------------------------------'
*/
[_LEFTER] = LAYOUT_planck_grid(
KC_TRNS, KC_GRV, LSFT(KC_2), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(LSFT(KC_1)), LSFT(KC_1), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_LBRC),
KC_TRNS, RALT(KC_A),RALT(KC_S), RALT(KC_D), KC_NUHS, RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), RALT(KC_L), RALT(KC_SCLN), RALT(KC_QUOT),
KC_TRNS, KC_TRNS, RALT(KC_X), RALT(KC_EQL), RALT(KC_V), RALT(KC_MINS), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), KC_TRNS, KC_TRNS,
RALT(KC_Z),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RALT(KC_BSPC), RALT(KC_SPC), KC_TRNS, KC_TRNS, RALT(KC_NUBS), RALT(KC_SLSH), LSFT(KC_MINS)
KC_TRNS, RALT(KC_A),RALT(KC_S), RALT(KC_D), KC_NUHS, KC_NUBS, LSFT(KC_NUBS), RALT(KC_J), RALT(KC_K), RALT(KC_L), RALT(KC_SCLN), RALT(KC_QUOT),
KC_TRNS, KC_TRNS, RALT(KC_X), RALT(KC_EQL), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), KC_TRNS, KC_TRNS,
RALT(KC_Z),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RALT(KC_BSPC), RALT(KC_SPC), KC_TRNS, KC_TRNS, RALT(KC_NUBS), RALT(KC_SLSH), LSFT(KC_MINS)
),
/* Righter

2
keyboards/planck/keymaps/gitdrik/readme.md
View File

@ -1 +1 @@
# Finnish SFS 5966 layout by gitdrik 2020.
# Finnish SFS 5966 layout by gitdrik 2020-2023.