megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
QMK Bot 2023-09-13 21:55:21 +00:00
parent 5a69d3006a c6841a51de
commit 36b4e290c8
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
keyboards/jaykeeb/sebelas/info.json
View file

@ -47,6 +47,12 @@
"pid": "0x0767", "pid": "0x0767",
"vid": "0x414C" "vid": "0x414C"
}, },
"layout_aliases": {
"LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
"LAYOUT_65_ansi_blocker_split_bs": "LAYOUT_ansi_blocker_split_bs",
"LAYOUT_65_ansi_blocker_tsangan": "LAYOUT_ansi_blocker_tsangan",
"LAYOUT_65_ansi_blocker_tsangan_split_bs": "LAYOUT_ansi_blocker_tsangan_split_bs"
},
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [
@ -124,7 +130,7 @@
{"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
] ]
}, },
"LAYOUT_65_ansi_blocker": { "LAYOUT_ansi_blocker": {
"layout": [ "layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@ -198,7 +204,7 @@
{"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
] ]
}, },
"LAYOUT_65_ansi_blocker_split_bs": { "LAYOUT_ansi_blocker_split_bs": {
"layout": [ "layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@ -273,7 +279,7 @@
{"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
] ]
}, },
"LAYOUT_65_ansi_blocker_tsangan": { "LAYOUT_ansi_blocker_tsangan": {
"layout": [ "layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@ -346,7 +352,7 @@
{"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
] ]
}, },
"LAYOUT_65_ansi_blocker_tsangan_split_bs": { "LAYOUT_ansi_blocker_tsangan_split_bs": {
"layout": [ "layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@ -421,4 +427,4 @@
] ]
} }
} }
} }

4
keyboards/jaykeeb/sebelas/keymaps/default/keymap.c
View file

@ -4,7 +4,7 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker( [0] = LAYOUT_ansi_blocker(
KC_ESC, 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_BSPC, KC_ESC, 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_BSPC,
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_RBRC, KC_BSLS, KC_PGUP, 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_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT_65_ansi_blocker( [1] = LAYOUT_ansi_blocker(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

4
keyboards/jaykeeb/sebelas/keymaps/via/keymap.c
View file

@ -4,7 +4,7 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker( [0] = LAYOUT_ansi_blocker(
KC_ESC, 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_BSPC, KC_ESC, 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_BSPC,
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_RBRC, KC_BSLS, KC_PGUP, 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_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT_65_ansi_blocker( [1] = LAYOUT_ansi_blocker(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,