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

This commit is contained in:
QMK Bot 2023-06-20 15:39:43 +00:00
commit 7830982781
6 changed files with 188 additions and 0 deletions

View File

@ -0,0 +1,92 @@
{
"manufacturer": "Automata02",
"keyboard_name": "Alisaie",
"maintainer": "qmk",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["B6", "F0", "F1", "F4", "F5", "B5", "B7", "D3", "D2", "D1", "D0", "B3", "B2", "B0"],
"rows": ["E6", "F6", "D5", "D4", "B1"]
},
"processor": "atmega32u4",
"usb": {
"device_version": "0.0.1",
"pid": "0x2012",
"vid": "0xBABE"
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "&", "matrix": [0, 7], "x": 8.5, "y": 0},
{"label": "*", "matrix": [0, 8], "x": 9.5, "y": 0},
{"label": "(", "matrix": [0, 9], "x": 10.5, "y": 0},
{"label": ")", "matrix": [0, 10], "x": 11.5, "y": 0},
{"label": "_", "matrix": [0, 11], "x": 12.5, "y": 0},
{"label": "+", "matrix": [0, 12], "x": 13.5, "y": 0},
{"label": "Del", "matrix": [0, 13], "x": 14.5, "y": 0},
{"label": "Backspace", "matrix": [1, 0], "x": 15.5, "y": 0},
{"label": "Tab", "matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 7], "x": 8, "y": 1},
{"label": "U", "matrix": [1, 8], "x": 9, "y": 1},
{"label": "I", "matrix": [1, 9], "x": 10, "y": 1},
{"label": "O", "matrix": [1, 10], "x": 11, "y": 1},
{"label": "P", "matrix": [1, 11], "x": 12, "y": 1},
{"label": "{", "matrix": [1, 12], "x": 13, "y": 1},
{"label": "}", "matrix": [1, 13], "x": 14, "y": 1},
{"label": "|", "matrix": [2, 0], "x": 15, "y": 1, "w": 1.5},
{"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 7], "x": 8.25, "y": 2},
{"label": "J", "matrix": [2, 8], "x": 9.25, "y": 2},
{"label": "K", "matrix": [2, 9], "x": 10.25, "y": 2},
{"label": "L", "matrix": [2, 10], "x": 11.25, "y": 2},
{"label": ":", "matrix": [2, 11], "x": 12.25, "y": 2},
{"label": "\"", "matrix": [2, 12], "x": 13.25, "y": 2},
{"label": "Enter", "matrix": [3, 0], "x": 14.25, "y": 2, "w": 2.25},
{"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "B", "matrix": [3, 7], "x": 7.75, "y": 3},
{"label": "N", "matrix": [3, 8], "x": 8.75, "y": 3},
{"label": "M", "matrix": [3, 9], "x": 9.75, "y": 3},
{"label": "<", "matrix": [3, 10], "x": 10.75, "y": 3},
{"label": ">", "matrix": [3, 11], "x": 11.75, "y": 3},
{"label": "?", "matrix": [3, 12], "x": 12.75, "y": 3},
{"label": "Shift", "matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.75},
{"label": "Fn", "matrix": [4, 0], "x": 15.5, "y": 3},
{"label": "Ctrl", "matrix": [4, 1], "x": 0, "y": 4, "w": 1.25},
{"label": "Win", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
{"label": "K408", "matrix": [4, 8], "x": 5, "y": 4, "w": 2.25},
{"label": "K409", "matrix": [4, 9], "x": 7.75, "y": 4, "w": 2.75},
{"label": "Alt", "matrix": [4, 11], "x": 10.5, "y": 4, "w": 1.25},
{"label": "Win", "matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
]
}
}
}

View File

@ -0,0 +1,35 @@
/*
Copyright 2022 Automata
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_GRV, KC_RALT, KC_RCTL
),
[1] = LAYOUT(
_______, 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_DEL,
_______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_UP, KC_MNXT, _______,
_______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LEFT, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, KC_PSCR, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1,35 @@
/*
Copyright 2022 Automata
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_GRV, KC_RALT, KC_RCTL
),
[1] = LAYOUT(
QK_BOOT, 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_DEL,
_______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_UP, KC_MNXT, _______,
_______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LEFT, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, KC_PSCR, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1 @@
VIA_ENABLE = yes

View File

@ -0,0 +1,24 @@
# Alisaie
![Alisaie layout](https://i.imgur.com/0YsrKvw.png)
A 60% alice like keyboard sharing the same footprint and 8 degree alpha rotation as Meridian but with a tsangan bottom row.
* Keyboard Maintainer: [Automata02](https://github.com/Automata02/)
* Hardware Supported: Alisaie PCB version 0.0.4b
Make example for this keyboard (after setting up your build environment):
make automata02/alisaie:default
Flashing example for this keyboard:
make automata02/alisaie:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
## Bootloader
Enter the bootloader:
* **Physical reset button**: Briefly press the button on the backside of the PCB located bellow the Y keyswitch.

View File

@ -0,0 +1 @@
# This file intentionally left blank