locker98/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:
QMK Bot 2023-09-07 20:53:59 +00:00
commit ddb737e716
2 changed files with 11 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
keyboards/cipulot/ec_theca/info.json
View File

@ -23,98 +23,15 @@
},
"vid": "0x6369"
},
"layout_aliases": {
"LAYOUT_all": "LAYOUT_tkl_ansi",
"LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
},
"community_layouts": [
"tkl_ansi",
"tkl_ansi_tsangan"
],
"layouts": {
"LAYOUT_all": {
"layout": [
{ "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
{ "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
{ "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
{ "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
{ "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
{ "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
{ "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
{ "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
{ "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
{ "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
{ "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
{ "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
{ "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
{ "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
{ "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
{ "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
{ "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
{ "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
{ "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
{ "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
{ "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
{ "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
{ "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
{ "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
{ "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
{ "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
{ "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
{ "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
{ "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
{ "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
{ "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
{ "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
{ "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
{ "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
{ "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
{ "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
{ "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
{ "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
{ "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
{ "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
{ "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
{ "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
{ "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
{ "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
{ "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
{ "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
{ "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
{ "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
{ "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
{ "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
{ "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
{ "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
{ "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
{ "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
{ "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
{ "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
{ "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
{ "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
{ "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
{ "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
{ "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
{ "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
{ "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
{ "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
{ "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
{ "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
{ "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
{ "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
{ "label": "5,0", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "5,1", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
{ "label": "5,2", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
{ "label": "5,5", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 },
{ "label": "5,10", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
{ "label": "5,11", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
{ "label": "5,12", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
{ "label": "5,13", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
{ "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
{ "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
{ "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_tkl_ansi": {
"layout": [
{ "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
@ -296,7 +213,7 @@
{ "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_tkl_ansi_tsangan_wkl": {
"LAYOUT_tkl_ansi_wkl": {
"layout": [
{ "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },

4
keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
View File

@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
[0] = LAYOUT_tkl_ansi_tsangan_wkl(
[0] = LAYOUT_tkl_ansi_wkl(
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, 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_INS, KC_HOME, 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_DEL, KC_END, KC_PGDN,
@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
[1] = LAYOUT_tkl_ansi_tsangan_wkl(
[1] = LAYOUT_tkl_ansi_wkl(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,