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

This commit is contained in:
QMK Bot 2022-09-26 23:45:03 +00:00
commit f9ff674cee
3 changed files with 14 additions and 11 deletions

View File

@ -1,14 +1,17 @@
{ {
"manufacturer": "keyquest", "manufacturer": "keyquest",
"keyboard_name": "Enclave-1", "keyboard_name": "Enclave-1",
"maintainer": "the keyquest team", "maintainer": "keyquesttech",
"usb": { "usb": {
"vid": "0x1117", "vid": "0x1117",
"pid": "0x0E0E", "pid": "0x0E0E",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_3x3"
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_ortho_3x3": {
"layout": [ "layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 },

View File

@ -25,25 +25,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* M7 M8 M9 * M7 M8 M9
* *
*/ */
[0] = LAYOUT( [0] = LAYOUT_ortho_3x3(
KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,
C(KC_C), C(KC_V), G(KC_V), C(KC_C), C(KC_V), G(KC_V),
KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN, MO(1) KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, MO(2), _______ _______, MO(2), _______
), ),
[2] = LAYOUT( [2] = LAYOUT_ortho_3x3(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
MO(3), _______, _______ MO(3), _______, _______
), ),
[3] = LAYOUT( [3] = LAYOUT_ortho_3x3(
RGB_TOG, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_TOG, RGB_MODE_PLAIN, RGB_MODE_BREATHE,
RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_GRADIENT, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_GRADIENT,
_______, _______, _______ _______, _______, _______

View File

@ -24,25 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* M7 M8 M9 * M7 M8 M9
* *
*/ */
[0] = LAYOUT( [0] = LAYOUT_ortho_3x3(
KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,
KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,
_______, _______, _______ _______, _______, _______
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
[2] = LAYOUT( [2] = LAYOUT_ortho_3x3(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
[3] = LAYOUT( [3] = LAYOUT_ortho_3x3(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______ _______, _______, _______