sporq/qmk-firmware
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:
zvecr
2022-11-22 02:48:11 +00:00
parent 08805cada0 06a3801a27
commit ab17d34dbd
100 changed files with 1756 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
View File

@@ -1,4 +1,3 @@
{
"keyboard_name": "Dilemma (3x5+2) Assembled"
}

68
keyboards/bastardkb/dilemma/3x5_2/info.json
View File

@@ -6,40 +6,40 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
{"label":"L00", "x":0, "y":0},
{"label":"L01", "x":1, "y":0},
{"label":"L02", "x":2, "y":0},
{"label":"L03", "x":3, "y":0},
{"label":"L04", "x":4, "y":0},
{"label":"R00", "x":11, "y":0},
{"label":"R01", "x":12, "y":0},
{"label":"R02", "x":13, "y":0},
{"label":"R03", "x":14, "y":0},
{"label":"R04", "x":15, "y":0},
{"label":"L10", "x":0, "y":1},
{"label":"L11", "x":1, "y":1},
{"label":"L12", "x":2, "y":1},
{"label":"L13", "x":3, "y":1},
{"label":"L14", "x":4, "y":1},
{"label":"R10", "x":11, "y":1},
{"label":"R11", "x":12, "y":1},
{"label":"R12", "x":13, "y":1},
{"label":"R13", "x":14, "y":1},
{"label":"R14", "x":15, "y":1},
{"label":"L20", "x":0, "y":2},
{"label":"L21", "x":1, "y":2},
{"label":"L22", "x":2, "y":2},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2},
{"label":"R20", "x":11, "y":2},
{"label":"R21", "x":12, "y":2},
{"label":"R22", "x":13, "y":2},
{"label":"R23", "x":14, "y":2},
{"label":"R24", "x":15, "y":2},
{"label":"L30", "x":4, "y":3},
{"label":"L32", "x":5, "y":3},
{"label":"R32", "x":10, "y":3},
{"label":"R30", "x":11, "y":3}
{ "label": "L00", "x": 0, "y": 0 },
{ "label": "L01", "x": 1, "y": 0 },
{ "label": "L02", "x": 2, "y": 0 },
{ "label": "L03", "x": 3, "y": 0 },
{ "label": "L04", "x": 4, "y": 0 },
{ "label": "R00", "x": 11, "y": 0 },
{ "label": "R01", "x": 12, "y": 0 },
{ "label": "R02", "x": 13, "y": 0 },
{ "label": "R03", "x": 14, "y": 0 },
{ "label": "R04", "x": 15, "y": 0 },
{ "label": "L10", "x": 0, "y": 1 },
{ "label": "L11", "x": 1, "y": 1 },
{ "label": "L12", "x": 2, "y": 1 },
{ "label": "L13", "x": 3, "y": 1 },
{ "label": "L14", "x": 4, "y": 1 },
{ "label": "R10", "x": 11, "y": 1 },
{ "label": "R11", "x": 12, "y": 1 },
{ "label": "R12", "x": 13, "y": 1 },
{ "label": "R13", "x": 14, "y": 1 },
{ "label": "R14", "x": 15, "y": 1 },
{ "label": "L20", "x": 0, "y": 2 },
{ "label": "L21", "x": 1, "y": 2 },
{ "label": "L22", "x": 2, "y": 2 },
{ "label": "L23", "x": 3, "y": 2 },
{ "label": "L24", "x": 4, "y": 2 },
{ "label": "R20", "x": 11, "y": 2 },
{ "label": "R21", "x": 12, "y": 2 },
{ "label": "R22", "x": 13, "y": 2 },
{ "label": "R23", "x": 14, "y": 2 },
{ "label": "R24", "x": 15, "y": 2 },
{ "label": "L30", "x": 4, "y": 3 },
{ "label": "L32", "x": 5, "y": 3 },
{ "label": "R32", "x": 10, "y": 3 },
{ "label": "R30", "x": 11, "y": 3 }
]
}
}

48
keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
View File

@@ -21,52 +21,6 @@
# define DYNAMIC_KEYMAP_LAYER_COUNT 6
#endif // VIA_ENABLE
/* Disable unused features. */
#define NO_ACTION_ONESHOT
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/**
* \brief Enable rapid switch from tap to hold.
*
* Note that a side-effect of this setting is to disable auto-repeat when
* pressing key twice, except for one-shot keys.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
*/
#define TAPPING_FORCE_HOLD
/*
* Tap-or-Hold decision modes.
*
* Note that the following flags behave differently when combined (ie. when 2 or
* more are enabled).
*
* See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
* decision modes.
*/
/**
* \brief Faster tap-hold trigger.
*
* Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
* With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
*/
#define PERMISSIVE_HOLD
/**
* \brief Prevent normal rollover on alphas from accidentally triggering mods.
*
@@ -76,8 +30,6 @@
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
* With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
*/
#define IGNORE_MOD_TAP_INTERRUPT