mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-29 14:40:38 +00:00
Apply suggestions from code review
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
This commit is contained in:
parent
36941fc6ee
commit
c46aef5845
@ -19,4 +19,3 @@
|
|||||||
#define HAL_USE_SPI TRUE
|
#define HAL_USE_SPI TRUE
|
||||||
|
|
||||||
#include_next <halconf.h>
|
#include_next <halconf.h>
|
||||||
|
|
||||||
|
@ -46,84 +46,11 @@
|
|||||||
"pid": "0x5335",
|
"pid": "0x5335",
|
||||||
"device_version": "0.0.1"
|
"device_version": "0.0.1"
|
||||||
},
|
},
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
|
||||||
|
},
|
||||||
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
|
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT": {
|
|
||||||
"layout": [
|
|
||||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
|
||||||
{"matrix": [0, 1], "x": 1, "y": 0},
|
|
||||||
{"matrix": [0, 2], "x": 2, "y": 0},
|
|
||||||
{"matrix": [0, 3], "x": 3, "y": 0},
|
|
||||||
{"matrix": [0, 4], "x": 4, "y": 0},
|
|
||||||
{"matrix": [0, 5], "x": 5, "y": 0},
|
|
||||||
{"matrix": [0, 6], "x": 6, "y": 0},
|
|
||||||
{"matrix": [0, 7], "x": 7, "y": 0},
|
|
||||||
{"matrix": [0, 8], "x": 8, "y": 0},
|
|
||||||
{"matrix": [0, 9], "x": 9, "y": 0},
|
|
||||||
{"matrix": [0, 10], "x": 10, "y": 0},
|
|
||||||
{"matrix": [0, 11], "x": 11, "y": 0},
|
|
||||||
{"matrix": [0, 12], "x": 12, "y": 0},
|
|
||||||
{"matrix": [2, 12], "x": 13, "y": 0},
|
|
||||||
{"matrix": [0, 13], "x": 14, "y": 0},
|
|
||||||
{"matrix": [0, 14], "x": 15, "y": 0},
|
|
||||||
|
|
||||||
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
|
|
||||||
{"matrix": [1, 1], "x": 1.5, "y": 1},
|
|
||||||
{"matrix": [1, 2], "x": 2.5, "y": 1},
|
|
||||||
{"matrix": [1, 3], "x": 3.5, "y": 1},
|
|
||||||
{"matrix": [1, 4], "x": 4.5, "y": 1},
|
|
||||||
{"matrix": [1, 5], "x": 5.5, "y": 1},
|
|
||||||
{"matrix": [1, 6], "x": 6.5, "y": 1},
|
|
||||||
{"matrix": [1, 7], "x": 7.5, "y": 1},
|
|
||||||
{"matrix": [1, 8], "x": 8.5, "y": 1},
|
|
||||||
{"matrix": [1, 9], "x": 9.5, "y": 1},
|
|
||||||
{"matrix": [1, 10], "x": 10.5, "y": 1},
|
|
||||||
{"matrix": [1, 11], "x": 11.5, "y": 1},
|
|
||||||
{"matrix": [1, 12], "x": 12.5, "y": 1},
|
|
||||||
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
|
|
||||||
{"matrix": [1, 14], "x": 15, "y": 1},
|
|
||||||
|
|
||||||
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
|
|
||||||
{"matrix": [2, 1], "x": 1.75, "y": 2},
|
|
||||||
{"matrix": [2, 2], "x": 2.75, "y": 2},
|
|
||||||
{"matrix": [2, 3], "x": 3.75, "y": 2},
|
|
||||||
{"matrix": [2, 4], "x": 4.75, "y": 2},
|
|
||||||
{"matrix": [2, 5], "x": 5.75, "y": 2},
|
|
||||||
{"matrix": [2, 6], "x": 6.75, "y": 2},
|
|
||||||
{"matrix": [2, 7], "x": 7.75, "y": 2},
|
|
||||||
{"matrix": [2, 8], "x": 8.75, "y": 2},
|
|
||||||
{"matrix": [2, 9], "x": 9.75, "y": 2},
|
|
||||||
{"matrix": [2, 10], "x": 10.75, "y": 2},
|
|
||||||
{"matrix": [2, 11], "x": 11.75, "y": 2},
|
|
||||||
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
|
|
||||||
{"matrix": [2, 14], "x": 15, "y": 2},
|
|
||||||
|
|
||||||
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
|
|
||||||
{"matrix": [3, 2], "x": 2.25, "y": 3},
|
|
||||||
{"matrix": [3, 3], "x": 3.25, "y": 3},
|
|
||||||
{"matrix": [3, 4], "x": 4.25, "y": 3},
|
|
||||||
{"matrix": [3, 5], "x": 5.25, "y": 3},
|
|
||||||
{"matrix": [3, 6], "x": 6.25, "y": 3},
|
|
||||||
{"matrix": [3, 7], "x": 7.25, "y": 3},
|
|
||||||
{"matrix": [3, 8], "x": 8.25, "y": 3},
|
|
||||||
{"matrix": [3, 9], "x": 9.25, "y": 3},
|
|
||||||
{"matrix": [3, 10], "x": 10.25, "y": 3},
|
|
||||||
{"matrix": [3, 11], "x": 11.25, "y": 3},
|
|
||||||
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
|
|
||||||
{"matrix": [3, 13], "x": 14, "y": 3},
|
|
||||||
{"matrix": [3, 14], "x": 15, "y": 3},
|
|
||||||
|
|
||||||
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
|
|
||||||
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
|
|
||||||
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
|
|
||||||
{"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
|
|
||||||
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
|
|
||||||
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
|
|
||||||
{"matrix": [4, 12], "x": 13, "y": 4},
|
|
||||||
{"matrix": [4, 13], "x": 14, "y": 4},
|
|
||||||
{"matrix": [4, 14], "x": 15, "y": 4}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"LAYOUT_65_ansi_blocker": {
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||||
|
@ -17,21 +17,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
// └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
|
// └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
|
||||||
|
|
||||||
|
|
||||||
[0] = LAYOUT(
|
[0] = LAYOUT_all(
|
||||||
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_BSPC, KC_DEL,
|
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_BSPC, KC_DEL,
|
||||||
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,
|
||||||
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_END,
|
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_END,
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
),
|
),
|
||||||
[1] = LAYOUT(
|
[1] = LAYOUT_all(
|
||||||
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_TRNS, KC_DEL, KC_TRNS,
|
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_TRNS, KC_DEL, KC_TRNS,
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
MO(2) , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
MO(2) , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT
|
||||||
),
|
),
|
||||||
[2] = LAYOUT(
|
[2] = LAYOUT_all(
|
||||||
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
|
Loading…
Reference in New Issue
Block a user