mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-23 00:47:02 +06:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
4e50de3a4b
|
@ -23,8 +23,11 @@
|
|||
"pid": "0x0001",
|
||||
"vid": "0x4243"
|
||||
},
|
||||
"layout_aliases": {
|
||||
"LAYOUT": "LAYOUT_ortho_3x3"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"LAYOUT_ortho_3x3": {
|
||||
"layout": [
|
||||
{ "matrix": [0, 0], "x": 0, "y": 0 },
|
||||
{ "matrix": [0, 1], "x": 1, "y": 0 },
|
||||
|
|
|
@ -16,12 +16,12 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT( /* Base */
|
||||
[0] = LAYOUT_ortho_3x3( /* Base */
|
||||
KC_1, KC_2, KC_3,
|
||||
KC_4, KC_5, KC_6,
|
||||
KC_VOLD, KC_VOLU, MO(1)
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
[1] = LAYOUT_ortho_3x3(
|
||||
KC_7, KC_8, KC_9,
|
||||
KC_0, KC_MINUS, KC_PLUS,
|
||||
RESET, KC_AT , KC_TRNS
|
||||
|
|
|
@ -16,22 +16,22 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT( /* Base */
|
||||
[0] = LAYOUT_ortho_3x3( /* Base */
|
||||
KC_1, KC_2, KC_3,
|
||||
KC_4, KC_5, KC_6,
|
||||
KC_VOLD, KC_VOLU, MO(1)
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
[1] = LAYOUT_ortho_3x3(
|
||||
KC_7, KC_8, KC_9,
|
||||
KC_0, KC_MINUS, KC_PLUS,
|
||||
RESET, KC_AT , KC_TRNS
|
||||
),
|
||||
[2] = LAYOUT(
|
||||
[2] = LAYOUT_ortho_3x3(
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[3] = LAYOUT(
|
||||
[3] = LAYOUT_ortho_3x3(
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS
|
||||
|
|
|
@ -23,8 +23,11 @@
|
|||
"pid": "0x0002",
|
||||
"vid": "0x4243"
|
||||
},
|
||||
"layout_aliases": {
|
||||
"LAYOUT": "LAYOUT_ortho_3x3"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"LAYOUT_ortho_3x3": {
|
||||
"layout": [
|
||||
{ "matrix": [0, 0], "x": 0, "y": 0 },
|
||||
{ "matrix": [0, 1], "x": 1, "y": 0 },
|
||||
|
|
|
@ -16,12 +16,12 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT( /* Base */
|
||||
[0] = LAYOUT_ortho_3x3( /* Base */
|
||||
KC_1, KC_2, KC_3,
|
||||
KC_4, KC_5, KC_6,
|
||||
KC_VOLD, KC_VOLU, MO(1)
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
[1] = LAYOUT_ortho_3x3(
|
||||
KC_7, KC_8, KC_9,
|
||||
KC_0, KC_MINUS, KC_PLUS,
|
||||
RESET, KC_AT , KC_TRNS
|
||||
|
|
|
@ -16,22 +16,22 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT( /* Base */
|
||||
[0] = LAYOUT_ortho_3x3( /* Base */
|
||||
KC_1, KC_2, KC_3,
|
||||
KC_4, KC_5, KC_6,
|
||||
KC_VOLD, KC_VOLU, MO(1)
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
[1] = LAYOUT_ortho_3x3(
|
||||
KC_7, KC_8, KC_9,
|
||||
KC_0, KC_MINUS, KC_PLUS,
|
||||
RESET, KC_AT , KC_TRNS
|
||||
),
|
||||
[2] = LAYOUT(
|
||||
[2] = LAYOUT_ortho_3x3(
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[3] = LAYOUT(
|
||||
[3] = LAYOUT_ortho_3x3(
|
||||
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