resolve conflivt
This commit is contained in:
committed by
github-actions[bot]
parent
e479e74fbe
commit
0bc3b35901
@@ -422,7 +422,6 @@ parse_config:
|
|||||||
QUES: "?"
|
QUES: "?"
|
||||||
zmk_remove_keycode_prefix: []
|
zmk_remove_keycode_prefix: []
|
||||||
zmk_keycode_map:
|
zmk_keycode_map:
|
||||||
<<<<<<< HEAD
|
|
||||||
# Modifiers
|
# Modifiers
|
||||||
LCTRL: $$mdi:apple-keyboard-control$$
|
LCTRL: $$mdi:apple-keyboard-control$$
|
||||||
LALT: $$mdi:apple-keyboard-option$$
|
LALT: $$mdi:apple-keyboard-option$$
|
||||||
@@ -446,12 +445,6 @@ parse_config:
|
|||||||
PG_UP: $$mdi:transfer-up$$
|
PG_UP: $$mdi:transfer-up$$
|
||||||
PG_DN: $$mdi:transfer-down$$
|
PG_DN: $$mdi:transfer-down$$
|
||||||
|
|
||||||
|
|
||||||
C_VOL_UP: Vol Up
|
|
||||||
C_VOL_DN: Vol Down
|
|
||||||
C_AL_CALC: Calc
|
|
||||||
|
|
||||||
# ESC: Esc
|
|
||||||
ESC: $$mdi:keyboard-esc$$
|
ESC: $$mdi:keyboard-esc$$
|
||||||
TAB: $$mdi:keyboard-tab$$
|
TAB: $$mdi:keyboard-tab$$
|
||||||
SPACE: $$mdi:keyboard-space$$
|
SPACE: $$mdi:keyboard-space$$
|
||||||
@@ -480,251 +473,70 @@ parse_config:
|
|||||||
BT_SEL: $$mdi:bluetooth-connect$$
|
BT_SEL: $$mdi:bluetooth-connect$$
|
||||||
|
|
||||||
# Symbols
|
# Symbols
|
||||||
AMPERSAND: "&"
|
|
||||||
AMPS: "&"
|
AMPS: "&"
|
||||||
|
AMPERSAND: "&"
|
||||||
APOS: "'"
|
APOS: "'"
|
||||||
APOSTROPHE: "'"
|
APOSTROPHE: "'"
|
||||||
||||||| 6290dee
|
|
||||||
C_VOL_UP: Vol Up
|
|
||||||
C_VOL_DN: Vol Down
|
|
||||||
C_AL_CALC: Calc
|
|
||||||
LCTRL: Ctrl
|
|
||||||
RCTRL: Ctrl
|
|
||||||
LALT: Alt
|
|
||||||
RALT: Alt
|
|
||||||
LGUI: Gui
|
|
||||||
RGUI: Gui
|
|
||||||
LSHFT: Shift
|
|
||||||
RSHFT: Shift
|
|
||||||
ESC: Esc
|
|
||||||
SPACE: ␣
|
|
||||||
BSPC: ⌫
|
|
||||||
RET: ⏎
|
|
||||||
TAB: ↹
|
|
||||||
DEL: ⌦
|
|
||||||
PG_UP: Page Up
|
|
||||||
PG_DN: Page Down
|
|
||||||
INS: Insert
|
|
||||||
HOME: Home
|
|
||||||
END: End
|
|
||||||
CAPS: Caps Lock
|
|
||||||
PSCRN: Print Scrn
|
|
||||||
PAUSE_BREAK: Pause Break
|
|
||||||
UP: ↑
|
|
||||||
DOWN: ↓
|
|
||||||
LEFT: ←
|
|
||||||
RIGHT: →
|
|
||||||
C_PP: ⏯
|
|
||||||
C_NEXT: ⏭️
|
|
||||||
C_PREV: ⏮️
|
|
||||||
APOS: "'"
|
|
||||||
APOSTROPHE: "'"
|
|
||||||
=======
|
|
||||||
# Symbols
|
|
||||||
EXCLAMATION: "!"
|
|
||||||
EXCL: "!"
|
|
||||||
AT_SIGN: "@"
|
|
||||||
AT: "@"
|
|
||||||
HASH: "#"
|
|
||||||
POUND: "#"
|
|
||||||
DOLLAR: $
|
|
||||||
DLLR: $
|
|
||||||
PERCENT: "%"
|
|
||||||
PRCNT: "%"
|
|
||||||
CARET: ^
|
|
||||||
AMPERSAND: "&"
|
|
||||||
AMPS: "&"
|
|
||||||
>>>>>>> 45eeb5190bd770f17493466a21991d913b3833c8
|
|
||||||
ASTERISK: "*"
|
ASTERISK: "*"
|
||||||
ASTRK: "*"
|
ASTRK: "*"
|
||||||
STAR: "*"
|
AT: "@"
|
||||||
LEFT_PARENTHESIS: (
|
AT_SIGN: "@"
|
||||||
LPAR: (
|
BACKSLASH: \
|
||||||
RIGHT_PARENTHESIS: )
|
BSLH: \
|
||||||
RPAR: )
|
CARET: ^
|
||||||
EQUAL:
|
|
||||||
tap: "="
|
|
||||||
shifted: "+"
|
|
||||||
PLUS: +
|
|
||||||
MINUS:
|
|
||||||
tap: "-"
|
|
||||||
shifted: "_"
|
|
||||||
UNDERSCORE: _
|
|
||||||
UNDER: _
|
|
||||||
SLASH:
|
|
||||||
tap: "/"
|
|
||||||
shifted: "?"
|
|
||||||
FSLH:
|
|
||||||
tap: "/"
|
|
||||||
shifted: "?"
|
|
||||||
QUESTION: "?"
|
|
||||||
QMARK: "?"
|
|
||||||
BACKSLASH:
|
|
||||||
tap: '\'
|
|
||||||
shifted: "|"
|
|
||||||
BSLH:
|
|
||||||
tap: '\'
|
|
||||||
shifted: "|"
|
|
||||||
PIPE: "|"
|
|
||||||
NON_US_BACKSLASH: \
|
|
||||||
PIPE2: "|"
|
|
||||||
NON_US_BSLH: "|"
|
|
||||||
SEMICOLON:
|
|
||||||
tap: ";"
|
|
||||||
shifted: ":"
|
|
||||||
SEMI:
|
|
||||||
tap: ";"
|
|
||||||
shifted: ":"
|
|
||||||
COLON: ":"
|
COLON: ":"
|
||||||
SINGLE_QUOTE:
|
COMMA: ","
|
||||||
tap: "'"
|
DLLR: $
|
||||||
shifted: '"'
|
DOLLAR: $
|
||||||
SQT:
|
DOT: .
|
||||||
tap: "'"
|
|
||||||
shifted: '"'
|
|
||||||
APOSTROPHE: <
|
|
||||||
APOS: .
|
|
||||||
DOUBLE_QUOTES: '"'
|
DOUBLE_QUOTES: '"'
|
||||||
DQT: '"'
|
DQT: '"'
|
||||||
|
EQUAL: "="
|
||||||
LESS_THAN: <
|
EXCL: "!"
|
||||||
LT: <
|
EXCLAMATION: "!"
|
||||||
DOT:
|
FSLH: /
|
||||||
tap: "."
|
GRAVE: "`"
|
||||||
shifted: ">"
|
|
||||||
COMMA:
|
|
||||||
tap: ","
|
|
||||||
shifted: "<"
|
|
||||||
GREATER_THAN: ">"
|
GREATER_THAN: ">"
|
||||||
GT: ">"
|
GT: ">"
|
||||||
LEFT_BRACKET:
|
HASH: "#"
|
||||||
tap: "["
|
LBKT: "["
|
||||||
shifted: "{"
|
|
||||||
LBKT:
|
|
||||||
tap: "["
|
|
||||||
shifted: "{"
|
|
||||||
LEFT_BRACE: "{"
|
|
||||||
LBRC: "{"
|
LBRC: "{"
|
||||||
RIGHT_BRACKET:
|
LEFT_BRACE: "{"
|
||||||
tap: "]"
|
LEFT_BRACKET: "["
|
||||||
shifted: "}"
|
LEFT_PARENTHESIS: (
|
||||||
RBKT:
|
LESS_THAN: <
|
||||||
tap: "]"
|
LPAR: (
|
||||||
shifted: "}"
|
LT: <
|
||||||
RIGHT_BRACE: "}"
|
MINUS: "-"
|
||||||
RBRC: "}"
|
NON_US_BACKSLASH: \
|
||||||
GRAVE:
|
NON_US_BSLH: "|"
|
||||||
tap: "`"
|
|
||||||
shifted: "~"
|
|
||||||
TILDE: "~"
|
|
||||||
NON_US_HASH: "#"
|
NON_US_HASH: "#"
|
||||||
NUHS: "#"
|
NUHS: "#"
|
||||||
|
PERCENT: "%"
|
||||||
|
PERIOD: .
|
||||||
|
PIPE: "|"
|
||||||
|
PIPE2: "|"
|
||||||
|
PLUS: +
|
||||||
|
POUND: "#"
|
||||||
|
PRCNT: "%"
|
||||||
|
QMARK: "?"
|
||||||
|
QUESTION: "?"
|
||||||
|
RBKT: "]"
|
||||||
|
RBRC: "}"
|
||||||
|
RIGHT_BRACE: "}"
|
||||||
|
RIGHT_BRACKET: "]"
|
||||||
|
RIGHT_PARENTHESIS: )
|
||||||
|
RPAR: )
|
||||||
|
SEMI: ;
|
||||||
|
SEMICOLON: ;
|
||||||
|
SINGLE_QUOTE: "'"
|
||||||
|
SLASH: /
|
||||||
|
SQT: "'"
|
||||||
|
STAR: "*"
|
||||||
|
TILDE: "~"
|
||||||
TILDE2: "~"
|
TILDE2: "~"
|
||||||
|
UNDER: _
|
||||||
# Numbers
|
UNDERSCORE: _
|
||||||
N1:
|
|
||||||
tap: 1
|
|
||||||
shifted: "!"
|
|
||||||
N2:
|
|
||||||
tap: 2
|
|
||||||
shifted: "@"
|
|
||||||
N3:
|
|
||||||
tap: 3
|
|
||||||
shifted: "#"
|
|
||||||
N4:
|
|
||||||
tap: 4
|
|
||||||
shifted: "$"
|
|
||||||
N5:
|
|
||||||
tap: 5
|
|
||||||
shifted: "%"
|
|
||||||
N6:
|
|
||||||
tap: 6
|
|
||||||
shifted: "^"
|
|
||||||
N7:
|
|
||||||
tap: 7
|
|
||||||
shifted: "&"
|
|
||||||
N8:
|
|
||||||
tap: 8
|
|
||||||
shifted: "*"
|
|
||||||
N9:
|
|
||||||
tap: 9
|
|
||||||
shifted: "("
|
|
||||||
N0:
|
|
||||||
tap: 0
|
|
||||||
shifted: ")"
|
|
||||||
|
|
||||||
# Modifiers
|
|
||||||
LCTRL: $$mdi:apple-keyboard-control$$
|
|
||||||
LALT: $$mdi:apple-keyboard-option$$
|
|
||||||
LSHIFT: $$mdi:apple-keyboard-shift$$
|
|
||||||
LSHFT: $$mdi:apple-keyboard-shift$$
|
|
||||||
LCMD: $$mdi:apple-keyboard-command$$
|
|
||||||
RCTRL: $$mdi:apple-keyboard-control$$
|
|
||||||
RALT: $$mdi:apple-keyboard-option$$
|
|
||||||
RSHIFT: $$mdi:apple-keyboard-shift$$
|
|
||||||
RSHFT: $$mdi:apple-keyboard-shift$$
|
|
||||||
RCMD: $$mdi:apple-keyboard-command$$
|
|
||||||
LS(LC(LALT)): $$mdi:triangle$$ # Meh
|
|
||||||
|
|
||||||
# Arrows
|
|
||||||
UP: $$mdi:arrow-up-bold$$
|
|
||||||
DOWN: $$mdi:arrow-down-bold$$
|
|
||||||
LEFT: $$mdi:arrow-left-bold$$
|
|
||||||
RIGHT: $$mdi:arrow-right-bold$$
|
|
||||||
PG_UP: $$mdi:transfer-up$$
|
|
||||||
PG_DN: $$mdi:transfer-down$$
|
|
||||||
|
|
||||||
# Whitespace
|
|
||||||
ENTER:
|
|
||||||
type: enter
|
|
||||||
tap: $$mdi:keyboard-return$$
|
|
||||||
ESC: $$mdi:keyboard-esc$$
|
|
||||||
TAB: $$mdi:keyboard-tab$$
|
|
||||||
LS(TAB): $$mdi:keyboard-tab-reverse$$
|
|
||||||
SPACE: $$mdi:keyboard-space$$
|
|
||||||
BACKSPACE:
|
|
||||||
type: backspace
|
|
||||||
tap: $$mdi:backspace$$
|
|
||||||
BSPC:
|
|
||||||
type: backspace
|
|
||||||
tap: $$mdi:backspace$$
|
|
||||||
DELETE: $$mdi:backspace-reverse-outline$$
|
|
||||||
DEL: $$mdi:backspace-reverse-outline$$
|
|
||||||
|
|
||||||
# Locks
|
|
||||||
CAPSLOCK: $$mdi:apple-keyboard-caps$$
|
|
||||||
CAPS: $$mdi:apple-keyboard-caps$$
|
|
||||||
|
|
||||||
# Sound
|
|
||||||
C_MUTE: $$mdi:volume-off$$
|
|
||||||
C_VOL_UP: $$mdi:volume-high$$
|
|
||||||
C_VOL_DN: $$mdi:volume-low$$
|
|
||||||
|
|
||||||
# Media
|
|
||||||
C_NEXT: $$mdi:skip-next$$
|
|
||||||
C_PREV: $$mdi:skip-previous$$
|
|
||||||
C_PP: $$mdi:play-pause$$
|
|
||||||
|
|
||||||
# Bluetooth
|
|
||||||
BT_CLR: $$mdi:bluetooth-off$$
|
|
||||||
BT_SEL: $$mdi:bluetooth-connect$$
|
|
||||||
|
|
||||||
# Settings
|
|
||||||
C_BRI_UP: $$mdi:brightness-5$$
|
|
||||||
C_BRI_DN: $$mdi:brightness-7$$
|
|
||||||
|
|
||||||
# System
|
|
||||||
C_POWER: $$mdi:power-standby$$
|
|
||||||
C_AL_LOCK: $$mdi:lock$$
|
|
||||||
K_CANCEL: $$mdi:close-box$$
|
|
||||||
|
|
||||||
# Zoom
|
|
||||||
RG(RS(A)):
|
|
||||||
tap: $$mdi:microphone$$
|
|
||||||
hold: zoom
|
|
||||||
RG(RS(V)):
|
|
||||||
tap: $$mdi:video$$
|
|
||||||
hold: zoom
|
|
||||||
zmk_combos:
|
zmk_combos:
|
||||||
combo_tab:
|
combo_tab:
|
||||||
draw_separate: true
|
draw_separate: true
|
||||||
|
|||||||
@@ -27,12 +27,12 @@
|
|||||||
<svg id="mdi:backspace-outline">
|
<svg id="mdi:backspace-outline">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-outline" viewBox="0 0 24 24"><path d="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" /></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-outline" viewBox="0 0 24 24"><path d="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" /></svg>
|
||||||
</svg>
|
</svg>
|
||||||
<svg id="mdi:backspace-reverse-outline">
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-reverse-outline" viewBox="0 0 24 24"><path d="M5,15.59L6.41,17L10,13.41L13.59,17L15,15.59L11.41,12L15,8.41L13.59,7L10,10.59L6.41,7L5,8.41L8.59,12L5,15.59M2,3A2,2 0 0,0 0,5V19A2,2 0 0,0 2,21H17C17.69,21 18.23,20.64 18.59,20.11L24,12L18.59,3.88C18.23,3.35 17.69,3 17,3H2M2,5H17L21.72,12L17,19H2V5Z" /></svg>
|
|
||||||
</svg>
|
|
||||||
<svg id="mdi:keyboard-esc">
|
<svg id="mdi:keyboard-esc">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-esc" viewBox="0 0 24 24"><path d="M1 7H7V9H3V11H7V13H3V15H7V17H1V7M11 7H15V9H11V11H13C14.11 11 15 11.9 15 13V15C15 16.11 14.11 17 13 17H9V15H13V13H11C9.9 13 9 12.11 9 11V9C9 7.9 9.9 7 11 7M19 7H21C22.11 7 23 7.9 23 9V10H21V9H19V15H21V14H23V15C23 16.11 22.11 17 21 17H19C17.9 17 17 16.11 17 15V9C17 7.9 17.9 7 19 7Z" /></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-esc" viewBox="0 0 24 24"><path d="M1 7H7V9H3V11H7V13H3V15H7V17H1V7M11 7H15V9H11V11H13C14.11 11 15 11.9 15 13V15C15 16.11 14.11 17 13 17H9V15H13V13H11C9.9 13 9 12.11 9 11V9C9 7.9 9.9 7 11 7M19 7H21C22.11 7 23 7.9 23 9V10H21V9H19V15H21V14H23V15C23 16.11 22.11 17 21 17H19C17.9 17 17 16.11 17 15V9C17 7.9 17.9 7 19 7Z" /></svg>
|
||||||
</svg>
|
</svg>
|
||||||
|
<svg id="mdi:keyboard-return">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-return" viewBox="0 0 24 24"><path d="M19,7V11H5.83L9.41,7.41L8,6L2,12L8,18L9.41,16.58L5.83,13H21V7H19Z" /></svg>
|
||||||
|
</svg>
|
||||||
<svg id="mdi:keyboard-space">
|
<svg id="mdi:keyboard-space">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-space" viewBox="0 0 24 24"><path d="M3 15H5V19H19V15H21V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V15Z" /></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-space" viewBox="0 0 24 24"><path d="M3 15H5V19H19V15H21V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V15Z" /></svg>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -365,11 +365,10 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(756, 105)" class="key keypos-22">
|
<g transform="translate(756, 105)" class="key keypos-22">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">;</text>
|
<text x="0" y="0" class="key tap">;</text>
|
||||||
<text x="0" y="-24" class="key shifted">:</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(812, 105)" class="key keypos-23">
|
<g transform="translate(812, 105)" class="key keypos-23">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">RET</text>
|
<use href="#mdi:keyboard-return" xlink:href="#mdi:keyboard-return" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-return"/>
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(28, 161)" class="key keypos-24">
|
<g transform="translate(28, 161)" class="key keypos-24">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -406,17 +405,14 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(644, 140)" class="key keypos-32">
|
<g transform="translate(644, 140)" class="key keypos-32">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">,</text>
|
<text x="0" y="0" class="key tap">,</text>
|
||||||
<text x="0" y="-24" class="key shifted"><</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(700, 147)" class="key keypos-33">
|
<g transform="translate(700, 147)" class="key keypos-33">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">.</text>
|
<text x="0" y="0" class="key tap">.</text>
|
||||||
<text x="0" y="-24" class="key shifted">></text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(756, 161)" class="key keypos-34">
|
<g transform="translate(756, 161)" class="key keypos-34">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">/</text>
|
<text x="0" y="0" class="key tap">/</text>
|
||||||
<text x="0" y="-24" class="key shifted">?</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(812, 161)" class="key keypos-35">
|
<g transform="translate(812, 161)" class="key keypos-35">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -460,56 +456,46 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(84, 49)" class="key keypos-1">
|
<g transform="translate(84, 49)" class="key keypos-1">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">1</text>
|
<text x="0" y="0" class="key tap">1</text>
|
||||||
<text x="0" y="-24" class="key shifted">!</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(140, 35)" class="key keypos-2">
|
<g transform="translate(140, 35)" class="key keypos-2">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">2</text>
|
<text x="0" y="0" class="key tap">2</text>
|
||||||
<text x="0" y="-24" class="key shifted">@</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(196, 28)" class="key keypos-3">
|
<g transform="translate(196, 28)" class="key keypos-3">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">3</text>
|
<text x="0" y="0" class="key tap">3</text>
|
||||||
<text x="0" y="-24" class="key shifted">#</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(252, 35)" class="key keypos-4">
|
<g transform="translate(252, 35)" class="key keypos-4">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">4</text>
|
<text x="0" y="0" class="key tap">4</text>
|
||||||
<text x="0" y="-24" class="key shifted">$</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(308, 42)" class="key keypos-5">
|
<g transform="translate(308, 42)" class="key keypos-5">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">5</text>
|
<text x="0" y="0" class="key tap">5</text>
|
||||||
<text x="0" y="-24" class="key shifted">%</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(532, 42)" class="key keypos-6">
|
<g transform="translate(532, 42)" class="key keypos-6">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">6</text>
|
<text x="0" y="0" class="key tap">6</text>
|
||||||
<text x="0" y="-24" class="key shifted">^</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(588, 35)" class="key keypos-7">
|
<g transform="translate(588, 35)" class="key keypos-7">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">7</text>
|
<text x="0" y="0" class="key tap">7</text>
|
||||||
<text x="0" y="-24" class="key shifted">&</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(644, 28)" class="key keypos-8">
|
<g transform="translate(644, 28)" class="key keypos-8">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">8</text>
|
<text x="0" y="0" class="key tap">8</text>
|
||||||
<text x="0" y="-24" class="key shifted">*</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(700, 35)" class="key keypos-9">
|
<g transform="translate(700, 35)" class="key keypos-9">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">9</text>
|
<text x="0" y="0" class="key tap">9</text>
|
||||||
<text x="0" y="-24" class="key shifted">(</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(756, 49)" class="key keypos-10">
|
<g transform="translate(756, 49)" class="key keypos-10">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">0</text>
|
<text x="0" y="0" class="key tap">0</text>
|
||||||
<text x="0" y="-24" class="key shifted">)</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(812, 49)" class="key keypos-11">
|
<g transform="translate(812, 49)" class="key keypos-11">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<use href="#mdi:backspace-reverse-outline" xlink:href="#mdi:backspace-reverse-outline" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:backspace-reverse-outline"/>
|
<text x="0" y="0" class="key tap">DELETE</text>
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(28, 105)" class="key keypos-12">
|
<g transform="translate(28, 105)" class="key keypos-12">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -556,7 +542,7 @@ rect.held, rect.combo.held {
|
|||||||
</g>
|
</g>
|
||||||
<g transform="translate(812, 105)" class="key keypos-23">
|
<g transform="translate(812, 105)" class="key keypos-23">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">RET</text>
|
<use href="#mdi:keyboard-return" xlink:href="#mdi:keyboard-return" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-return"/>
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(28, 161)" class="key keypos-24">
|
<g transform="translate(28, 161)" class="key keypos-24">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -673,11 +659,10 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(756, 49)" class="key keypos-10">
|
<g transform="translate(756, 49)" class="key keypos-10">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">=</text>
|
<text x="0" y="0" class="key tap">=</text>
|
||||||
<text x="0" y="-24" class="key shifted">+</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(812, 49)" class="key keypos-11">
|
<g transform="translate(812, 49)" class="key keypos-11">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<use href="#mdi:backspace-reverse-outline" xlink:href="#mdi:backspace-reverse-outline" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:backspace-reverse-outline"/>
|
<text x="0" y="0" class="key tap">DELETE</text>
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(28, 105)" class="key keypos-12">
|
<g transform="translate(28, 105)" class="key keypos-12">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -686,7 +671,6 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(84, 105)" class="key keypos-13">
|
<g transform="translate(84, 105)" class="key keypos-13">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">`</text>
|
<text x="0" y="0" class="key tap">`</text>
|
||||||
<text x="0" y="-24" class="key shifted">~</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(140, 91)" class="key keypos-14">
|
<g transform="translate(140, 91)" class="key keypos-14">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -699,7 +683,6 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(252, 91)" class="key keypos-16">
|
<g transform="translate(252, 91)" class="key keypos-16">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">[</text>
|
<text x="0" y="0" class="key tap">[</text>
|
||||||
<text x="0" y="-24" class="key shifted">{</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(308, 98)" class="key keypos-17">
|
<g transform="translate(308, 98)" class="key keypos-17">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -712,7 +695,6 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(588, 91)" class="key keypos-19">
|
<g transform="translate(588, 91)" class="key keypos-19">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">]</text>
|
<text x="0" y="0" class="key tap">]</text>
|
||||||
<text x="0" y="-24" class="key shifted">}</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(644, 84)" class="key keypos-20">
|
<g transform="translate(644, 84)" class="key keypos-20">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -721,7 +703,6 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(700, 91)" class="key keypos-21">
|
<g transform="translate(700, 91)" class="key keypos-21">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">\</text>
|
<text x="0" y="0" class="key tap">\</text>
|
||||||
<text x="0" y="-24" class="key shifted">|</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(756, 105)" class="key keypos-22">
|
<g transform="translate(756, 105)" class="key keypos-22">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -729,7 +710,7 @@ rect.held, rect.combo.held {
|
|||||||
</g>
|
</g>
|
||||||
<g transform="translate(812, 105)" class="key keypos-23">
|
<g transform="translate(812, 105)" class="key keypos-23">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">RET</text>
|
<use href="#mdi:keyboard-return" xlink:href="#mdi:keyboard-return" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-return"/>
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(28, 161)" class="key keypos-24">
|
<g transform="translate(28, 161)" class="key keypos-24">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -747,7 +728,6 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(252, 147)" class="key keypos-28">
|
<g transform="translate(252, 147)" class="key keypos-28">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">'</text>
|
<text x="0" y="0" class="key tap">'</text>
|
||||||
<text x="0" y="-24" class="key shifted">"</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(308, 154)" class="key keypos-29">
|
<g transform="translate(308, 154)" class="key keypos-29">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
@@ -760,7 +740,6 @@ rect.held, rect.combo.held {
|
|||||||
<g transform="translate(588, 147)" class="key keypos-31">
|
<g transform="translate(588, 147)" class="key keypos-31">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
<text x="0" y="0" class="key tap">-</text>
|
<text x="0" y="0" class="key tap">-</text>
|
||||||
<text x="0" y="-24" class="key shifted">_</text>
|
|
||||||
</g>
|
</g>
|
||||||
<g transform="translate(644, 140)" class="key keypos-32">
|
<g transform="translate(644, 140)" class="key keypos-32">
|
||||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 35 KiB |
@@ -1,9 +1,10 @@
|
|||||||
layout: {qmk_keyboard: corne_rotated, layout_name: LAYOUT_split_3x6_3}
|
layout: {qmk_keyboard: corne_rotated, layout_name: LAYOUT_split_3x6_3}
|
||||||
layers:
|
layers:
|
||||||
default: [↹, Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, ENTER, '$$mdi:apple-keyboard-shift$$',
|
default: ['$$mdi:keyboard-tab$$', Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, '$$mdi:keyboard-return$$',
|
||||||
Z, X, C, V, B, N, M, ',', ., /, '$$mdi:apple-keyboard-shift$$', '$$mdi:apple-keyboard-command$$', lower, ␣, ␣, raise, '$$mdi:apple-keyboard-option$$']
|
'$$mdi:apple-keyboard-shift$$', Z, X, C, V, B, N, M, ',', ., /, '$$mdi:apple-keyboard-shift$$', '$$mdi:apple-keyboard-command$$', lower, '$$mdi:keyboard-space$$',
|
||||||
|
'$$mdi:keyboard-space$$', raise, '$$mdi:apple-keyboard-option$$']
|
||||||
lower:
|
lower:
|
||||||
- ESCAPE
|
- $$mdi:keyboard-esc$$
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
- '3'
|
- '3'
|
||||||
@@ -18,42 +19,42 @@ layers:
|
|||||||
- $$mdi:apple-keyboard-control$$
|
- $$mdi:apple-keyboard-control$$
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
- Ctl+Sft+↹
|
- Ctl+Sft+$$mdi:keyboard-tab$$
|
||||||
- Ctl+↹
|
- Ctl+$$mdi:keyboard-tab$$
|
||||||
- Gui+Sft+J
|
- Gui+Sft+J
|
||||||
- LEFT ARROW
|
- $$mdi:arrow-left-bold$$
|
||||||
- DOWN ARROW
|
- $$mdi:arrow-down-bold$$
|
||||||
- UP ARROW
|
- $$mdi:arrow-up-bold$$
|
||||||
- RIGHT ARROW
|
- $$mdi:arrow-right-bold$$
|
||||||
- ''
|
- ''
|
||||||
- ENTER
|
- $$mdi:keyboard-return$$
|
||||||
- $$mdi:apple-keyboard-shift$$
|
- $$mdi:apple-keyboard-shift$$
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
- Gui+Alt+␣
|
- Gui+Alt+$$mdi:keyboard-space$$
|
||||||
- Vol Down
|
- $$mdi:volume-low$$
|
||||||
- Vol Up
|
- $$mdi:volume-high$$
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
- $$mdi:apple-keyboard-shift$$
|
- $$mdi:apple-keyboard-shift$$
|
||||||
- $$mdi:apple-keyboard-command$$
|
- $$mdi:apple-keyboard-command$$
|
||||||
- {t: lower, type: held}
|
- {t: lower, type: held}
|
||||||
- ␣
|
- $$mdi:keyboard-space$$
|
||||||
- ␣
|
- $$mdi:keyboard-space$$
|
||||||
- raise
|
- raise
|
||||||
- $$mdi:apple-keyboard-option$$
|
- $$mdi:apple-keyboard-option$$
|
||||||
raise:
|
raise:
|
||||||
- ESCAPE
|
- $$mdi:keyboard-esc$$
|
||||||
- '!'
|
- '!'
|
||||||
- '@'
|
- '@'
|
||||||
- '#'
|
- '#'
|
||||||
- $
|
- $
|
||||||
- '%'
|
- '%'
|
||||||
- ^
|
- ^
|
||||||
- AMPERSAND
|
- '&'
|
||||||
- '*'
|
- '*'
|
||||||
- +
|
- +
|
||||||
- '='
|
- '='
|
||||||
@@ -69,7 +70,7 @@ layers:
|
|||||||
- '}'
|
- '}'
|
||||||
- \
|
- \
|
||||||
- '|'
|
- '|'
|
||||||
- ENTER
|
- $$mdi:keyboard-return$$
|
||||||
- $$mdi:apple-keyboard-shift$$
|
- $$mdi:apple-keyboard-shift$$
|
||||||
- ''
|
- ''
|
||||||
- ''
|
- ''
|
||||||
@@ -84,7 +85,7 @@ layers:
|
|||||||
- $$mdi:apple-keyboard-shift$$
|
- $$mdi:apple-keyboard-shift$$
|
||||||
- $$mdi:apple-keyboard-command$$
|
- $$mdi:apple-keyboard-command$$
|
||||||
- lower
|
- lower
|
||||||
- ␣
|
- $$mdi:keyboard-space$$
|
||||||
- ␣
|
- $$mdi:keyboard-space$$
|
||||||
- {t: raise, type: held}
|
- {t: raise, type: held}
|
||||||
- $$mdi:apple-keyboard-option$$
|
- $$mdi:apple-keyboard-option$$
|
||||||
|
|||||||
Reference in New Issue
Block a user