g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-09-27 01:54:07 +00:00
parent 3788d4c879 045170a958
commit ce0cd17a13
4 changed files with 86 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/keyten/aperture/aperture.h
View File

@ -20,7 +20,7 @@
#define XXX KC_NO #define XXX KC_NO
/* LAYOUT_all /* LAYOUT_65_ansi_blocker_tsangan_split_bs
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
@ -33,7 +33,7 @@
* │40 │41 │42 │46 │4A │ │4C │4D │4E │ * │40 │41 │42 │46 │4A │ │4C │4D │4E │
* └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘ * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
*/ */
#define LAYOUT_all( \ #define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \

153
keyboards/keyten/aperture/info.json
View File

@ -1,89 +1,92 @@
{ {
"keyboard_name": "Aperture", "keyboard_name": "Aperture",
"manufacturer": "Bizunow", "manufacturer": "Bizunow",
"url": "", "url": "",
"maintainer": "keyten", "maintainer": "key10iq",
"usb": { "usb": {
"vid": "0xEB69", "vid": "0xEB69",
"pid": "0x6501", "pid": "0x6501",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
},
"community_layouts": ["65_ansi_blocker_tsangan_split_bs"],
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
"layout": [ "layout": [
{"x":0, "y":0}, {"x":0, "y":0},
{"x":1, "y":0}, {"x":1, "y":0},
{"x":2, "y":0}, {"x":2, "y":0},
{"x":3, "y":0}, {"x":3, "y":0},
{"x":4, "y":0}, {"x":4, "y":0},
{"x":5, "y":0}, {"x":5, "y":0},
{"x":6, "y":0}, {"x":6, "y":0},
{"x":7, "y":0}, {"x":7, "y":0},
{"x":8, "y":0}, {"x":8, "y":0},
{"x":9, "y":0}, {"x":9, "y":0},
{"x":10, "y":0}, {"x":10, "y":0},
{"x":11, "y":0}, {"x":11, "y":0},
{"x":12, "y":0}, {"x":12, "y":0},
{"x":13, "y":0}, {"x":13, "y":0},
{"x":14, "y":0}, {"x":14, "y":0},
{"x":15, "y":0}, {"x":15, "y":0},
{"x":0, "y":1, "w":1.5}, {"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"x":1.5, "y":1},
{"x":2.5, "y":1}, {"x":2.5, "y":1},
{"x":3.5, "y":1}, {"x":3.5, "y":1},
{"x":4.5, "y":1}, {"x":4.5, "y":1},
{"x":5.5, "y":1}, {"x":5.5, "y":1},
{"x":6.5, "y":1}, {"x":6.5, "y":1},
{"x":7.5, "y":1}, {"x":7.5, "y":1},
{"x":8.5, "y":1}, {"x":8.5, "y":1},
{"x":9.5, "y":1}, {"x":9.5, "y":1},
{"x":10.5, "y":1}, {"x":10.5, "y":1},
{"x":11.5, "y":1}, {"x":11.5, "y":1},
{"x":12.5, "y":1}, {"x":12.5, "y":1},
{"x":13.5, "y":1, "w":1.5}, {"x":13.5, "y":1, "w":1.5},
{"x":15, "y":1}, {"x":15, "y":1},
{"x":0, "y":2, "w":1.75}, {"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2}, {"x":1.75, "y":2},
{"x":2.75, "y":2}, {"x":2.75, "y":2},
{"x":3.75, "y":2}, {"x":3.75, "y":2},
{"x":4.75, "y":2}, {"x":4.75, "y":2},
{"x":5.75, "y":2}, {"x":5.75, "y":2},
{"x":6.75, "y":2}, {"x":6.75, "y":2},
{"x":7.75, "y":2}, {"x":7.75, "y":2},
{"x":8.75, "y":2}, {"x":8.75, "y":2},
{"x":9.75, "y":2}, {"x":9.75, "y":2},
{"x":10.75, "y":2}, {"x":10.75, "y":2},
{"x":11.75, "y":2}, {"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25}, {"x":12.75, "y":2, "w":2.25},
{"x":15, "y":2}, {"x":15, "y":2},
{"x":0, "y":3, "w":2.25}, {"x":0, "y":3, "w":2.25},
{"x":2.25, "y":3}, {"x":2.25, "y":3},
{"x":3.25, "y":3}, {"x":3.25, "y":3},
{"x":4.25, "y":3}, {"x":4.25, "y":3},
{"x":5.25, "y":3}, {"x":5.25, "y":3},
{"x":6.25, "y":3}, {"x":6.25, "y":3},
{"x":7.25, "y":3}, {"x":7.25, "y":3},
{"x":8.25, "y":3}, {"x":8.25, "y":3},
{"x":9.25, "y":3}, {"x":9.25, "y":3},
{"x":10.25, "y":3}, {"x":10.25, "y":3},
{"x":11.25, "y":3}, {"x":11.25, "y":3},
{"x":12.25, "y":3, "w":1.75}, {"x":12.25, "y":3, "w":1.75},
{"x":14, "y":3}, {"x":14, "y":3},
{"x":15, "y":3}, {"x":15, "y":3},
{"x":0, "y":4, "w":1.5}, {"x":0, "y":4, "w":1.5},
{"x":1.5, "y":4}, {"x":1.5, "y":4},
{"x":2.5, "y":4, "w":1.5}, {"x":2.5, "y":4, "w":1.5},
{"x":4, "y":4, "w":7}, {"x":4, "y":4, "w":7},
{"x":11, "y":4, "w":1.5}, {"x":11, "y":4, "w":1.5},
{"x":13, "y":4}, {"x":13, "y":4},
{"x":14, "y":4}, {"x":14, "y":4},
{"x":15, "y":4} {"x":15, "y":4}
] ]
} }
} }
} }

4
keyboards/keyten/aperture/keymaps/default/keymap.c
View File

@ -18,14 +18,14 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
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_BSLS, KC_HOME, 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_BSLS, KC_HOME,
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_BSPC, 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_BSPC, 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_DEL, 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_DEL, KC_PGDN,
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, MO(1), 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, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_all( [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
_______, 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

8
keyboards/keyten/aperture/keymaps/via/keymap.c
View File

@ -18,28 +18,28 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
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_BSLS, KC_HOME, 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_BSLS, KC_HOME,
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_BSPC, 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_BSPC, 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_DEL, 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_DEL, KC_PGDN,
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, MO(1), 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, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_all( [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
_______, 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______), _______, _______, _______, _______, _______, _______, _______, _______),
[2] = LAYOUT_all( [2] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______), _______, _______, _______, _______, _______, _______, _______, _______),
[3] = LAYOUT_all( [3] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,