keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: minimize merge conflicts

Browse Source
This commit is contained in:
honorless 2023-06-27 10:30:47 -04:00
parent dbba42ecb3
commit c25be1da6c
No known key found for this signature in database
GPG Key ID: 1B48A311ABE8DA4D
8 changed files with 740 additions and 737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/kbdcraft/adam64/info.json
View File

@ -1,5 +1,4 @@
{
"keyboard_name": "Adam64",
"manufacturer": "KBDCRAFT",
"url": "https://kbdcraft.store/products/adam",
@ -136,7 +135,6 @@
{"flags": 4, "matrix": [4, 13], "x": 208, "y": 40}
]
},
"community_layouts": [ "64_ansi" ],
"layouts": {
"LAYOUT_64_ansi": {
"layout": [

2
keyboards/kbdcraft/adam64/keymaps/default/keymap.c
View File

@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_DEL,
KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG
)
};

10
keyboards/wuque/tata80/wk/config.h
View File

@ -15,17 +15,7 @@
*/
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
#define FORCE_NKRO

193
keyboards/wuque/tata80/wk/info.json
View File

@ -6,8 +6,14 @@
"usb": {
"vid": "0x2365",
"pid": "0x0168",
"device_version": "0.0.1"
"device_version": "0.0.1",
"force_nkro": true
},
"matrix_pins": {
"cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
"rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"indicators": {
@ -16,99 +22,108 @@
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
{ "label": "F2", "x": 2.25, "y": 0 },
{ "label": "F3", "x": 3.25, "y": 0 },
{ "label": "F4", "x": 4.25, "y": 0 },
{ "label": "F5", "x": 5.5, "y": 0 },
{ "label": "F6", "x": 6.5, "y": 0 },
{ "label": "F7", "x": 7.5, "y": 0 },
{ "label": "F8", "x": 8.5, "y": 0 },
{ "label": "F9", "x": 9.75, "y": 0 },
{ "label": "F10", "x": 10.75, "y": 0 },
{ "label": "F11", "x": 11.75, "y": 0 },
{ "label": "F12", "x": 12.75, "y": 0 },
{ "label": "F13", "x": 14, "y": 0 },
{ "label": "Print", "x": 15.25, "y": 0 },
{ "label": "Scroll", "x": 16.25, "y": 0 },
{ "label": "Pause", "x": 17.25, "y": 0 },
{"matrix": [0, 0], "x": 0, "y": 0},
{ "label": "~", "x": 0, "y": 1.25 },
{ "label": "1", "x": 1, "y": 1.25 },
{ "label": "2", "x": 2, "y": 1.25 },
{ "label": "3", "x": 3, "y": 1.25 },
{ "label": "4", "x": 4, "y": 1.25 },
{ "label": "5", "x": 5, "y": 1.25 },
{ "label": "6", "x": 6, "y": 1.25 },
{ "label": "7", "x": 7, "y": 1.25 },
{ "label": "8", "x": 8, "y": 1.25 },
{ "label": "9", "x": 9, "y": 1.25 },
{ "label": "0", "x": 10, "y": 1.25 },
{ "label": "-", "x": 11, "y": 1.25 },
{ "label": "=", "x": 12, "y": 1.25 },
{ "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
{ "label": "Insert", "x": 15.25, "y": 1.25 },
{ "label": "Home", "x": 16.25, "y": 1.25 },
{ "label": "PageUp", "x": 17.25, "y": 1.25 },
{"matrix": [0, 1], "x": 1.25, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{ "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 2.25 },
{ "label": "W", "x": 2.5, "y": 2.25 },
{ "label": "E", "x": 3.5, "y": 2.25 },
{ "label": "R", "x": 4.5, "y": 2.25 },
{ "label": "T", "x": 5.5, "y": 2.25 },
{ "label": "Y", "x": 6.5, "y": 2.25 },
{ "label": "U", "x": 7.5, "y": 2.25 },
{ "label": "I", "x": 8.5, "y": 2.25 },
{ "label": "O", "x": 9.5, "y": 2.25 },
{ "label": "P", "x": 10.5, "y": 2.25 },
{ "label": "[", "x": 11.5, "y": 2.25 },
{ "label": "]", "x": 12.5, "y": 2.25 },
{ "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
{ "label": "Delete", "x": 15.25, "y": 2.25 },
{ "label": "End", "x": 16.25, "y": 2.25 },
{ "label": "PageDown", "x": 17.25, "y": 2.25 },
{"matrix": [0, 5], "x": 5.5, "y": 0},
{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 7], "x": 7.5, "y": 0},
{"matrix": [0, 8], "x": 8.5, "y": 0},
{ "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 3.25 },
{ "label": "S", "x": 2.75, "y": 3.25 },
{ "label": "D", "x": 3.75, "y": 3.25 },
{ "label": "F", "x": 4.75, "y": 3.25 },
{ "label": "G", "x": 5.75, "y": 3.25 },
{ "label": "H", "x": 6.75, "y": 3.25 },
{ "label": "J", "x": 7.75, "y": 3.25 },
{ "label": "K", "x": 8.75, "y": 3.25 },
{ "label": "L", "x": 9.75, "y": 3.25 },
{ "label": ";", "x": 10.75, "y": 3.25 },
{ "label": "'", "x": 11.75, "y": 3.25 },
{ "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
{"matrix": [0, 9], "x": 9.75, "y": 0},
{"matrix": [0, 10], "x": 10.75, "y": 0},
{"matrix": [0, 11], "x": 11.75, "y": 0},
{"matrix": [0, 12], "x": 12.75, "y": 0},
{ "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
{ "label": "Z", "x": 2.25, "y": 4.25 },
{ "label": "X", "x": 3.25, "y": 4.25 },
{ "label": "C", "x": 4.25, "y": 4.25 },
{ "label": "V", "x": 5.25, "y": 4.25 },
{ "label": "B", "x": 6.25, "y": 4.25 },
{ "label": "N", "x": 7.25, "y": 4.25 },
{ "label": "M", "x": 8.25, "y": 4.25 },
{ "label": ",", "x": 9.25, "y": 4.25 },
{ "label": ".", "x": 10.25, "y": 4.25 },
{ "label": "/", "x": 11.25, "y": 4.25 },
{ "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
{ "label": "\u2191", "x": 16.25, "y": 4.25 },
{"matrix": [0, 13], "x": 14, "y": 0},
{ "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
{ "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 }
{"matrix": [0, 14], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.25, "y": 0},
{"matrix": [0, 16], "x": 17.25, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25},
{"matrix": [1, 2], "x": 2, "y": 1.25},
{"matrix": [1, 3], "x": 3, "y": 1.25},
{"matrix": [1, 4], "x": 4, "y": 1.25},
{"matrix": [1, 5], "x": 5, "y": 1.25},
{"matrix": [1, 6], "x": 6, "y": 1.25},
{"matrix": [1, 7], "x": 7, "y": 1.25},
{"matrix": [1, 8], "x": 8, "y": 1.25},
{"matrix": [1, 9], "x": 9, "y": 1.25},
{"matrix": [1, 10], "x": 10, "y": 1.25},
{"matrix": [1, 11], "x": 11, "y": 1.25},
{"matrix": [1, 12], "x": 12, "y": 1.25},
{"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
{"matrix": [1, 14], "x": 15.25, "y": 1.25},
{"matrix": [1, 15], "x": 16.25, "y": 1.25},
{"matrix": [1, 16], "x": 17.25, "y": 1.25},
{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 2.25},
{"matrix": [2, 2], "x": 2.5, "y": 2.25},
{"matrix": [2, 3], "x": 3.5, "y": 2.25},
{"matrix": [2, 4], "x": 4.5, "y": 2.25},
{"matrix": [2, 5], "x": 5.5, "y": 2.25},
{"matrix": [2, 6], "x": 6.5, "y": 2.25},
{"matrix": [2, 7], "x": 7.5, "y": 2.25},
{"matrix": [2, 8], "x": 8.5, "y": 2.25},
{"matrix": [2, 9], "x": 9.5, "y": 2.25},
{"matrix": [2, 10], "x": 10.5, "y": 2.25},
{"matrix": [2, 11], "x": 11.5, "y": 2.25},
{"matrix": [2, 12], "x": 12.5, "y": 2.25},
{"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
{"matrix": [2, 14], "x": 15.25, "y": 2.25},
{"matrix": [2, 15], "x": 16.25, "y": 2.25},
{"matrix": [2, 16], "x": 17.25, "y": 2.25},
{"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
{"matrix": [3, 1], "x": 1.75, "y": 3.25},
{"matrix": [3, 2], "x": 2.75, "y": 3.25},
{"matrix": [3, 3], "x": 3.75, "y": 3.25},
{"matrix": [3, 4], "x": 4.75, "y": 3.25},
{"matrix": [3, 5], "x": 5.75, "y": 3.25},
{"matrix": [3, 6], "x": 6.75, "y": 3.25},
{"matrix": [3, 7], "x": 7.75, "y": 3.25},
{"matrix": [3, 8], "x": 8.75, "y": 3.25},
{"matrix": [3, 9], "x": 9.75, "y": 3.25},
{"matrix": [3, 10], "x": 10.75, "y": 3.25},
{"matrix": [3, 11], "x": 11.75, "y": 3.25},
{"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
{"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
{"matrix": [4, 2], "x": 2.25, "y": 4.25},
{"matrix": [4, 3], "x": 3.25, "y": 4.25},
{"matrix": [4, 4], "x": 4.25, "y": 4.25},
{"matrix": [4, 5], "x": 5.25, "y": 4.25},
{"matrix": [4, 6], "x": 6.25, "y": 4.25},
{"matrix": [4, 7], "x": 7.25, "y": 4.25},
{"matrix": [4, 8], "x": 8.25, "y": 4.25},
{"matrix": [4, 9], "x": 9.25, "y": 4.25},
{"matrix": [4, 10], "x": 10.25, "y": 4.25},
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
{"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
{"matrix": [4, 15], "x": 16.25, "y": 4.25},
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
{"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
{"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
{"matrix": [5, 14], "x": 15.25, "y": 5.25},
{"matrix": [5, 15], "x": 16.25, "y": 5.25},
{"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
}
}