mkbd65/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-08-20 00:56:45 +00:00
commit 454891e583
550 changed files with 1689 additions and 1819 deletions
Download patch file Download diff file Expand all files Collapse all files

10
keyboards/jadookb/jkb65/config.h
View file

@ -18,19 +18,9 @@
#include "config_common.h"
#define VENDOR_ID 0x4A4B
#define PRODUCT_ID 0xEF6A
#define DEVICE_VER 0x0001
#define MANUFACTURER JadooKB
#define PRODUCT JKB65 RGB
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN F0

6
keyboards/jadookb/jkb65/info.json
View file

@ -1,7 +1,11 @@
{
"keyboard_name": "jkb65",
"manufacturer": "JadooKB",
"url": "https://jadookb.com/",
"maintainer": "Wizard-GG",
"usb": {
"vid": "0x4A4B",
"pid": "0xEF6A"
},
"layouts": {
"LAYOUT_67_ansi": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]

20
keyboards/jadookb/jkb65/r1/config.h Normal file
View file

@ -0,0 +1,20 @@
/* Copyright 2022 Wizad-GG
*
* 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/>.
*/
#pragma once
#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }

6
keyboards/jadookb/jkb65/r1/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "JKB65 RGB R1",
"usb": {
"device_version": "0.0.1"
}
}

0
keyboards/jadookb/jkb65/r1/rules.mk Normal file
View file

9
keyboards/jadookb/jkb65/r2/config.h
View file

@ -16,12 +16,5 @@
#pragma once
#undef DEVICE_VER
#define DEVICE_VER 0x0002
#undef PRODUCT
#define PRODUCT JKB65 RGB R2
#undef MATRIX_COL_PINS
#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
#define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }

6
keyboards/jadookb/jkb65/r2/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "JKB65 RGB R2",
"usb": {
"device_version": "0.0.2"
}
}

0
keyboards/jadookb/jkb65/r2/rules.mk Normal file
View file

2
keyboards/jadookb/jkb65/rules.mk
View file

@ -19,3 +19,5 @@ AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
DEFAULT_FOLDER = jadookb/jkb65/r1

7
keyboards/jian/handwired/config.h
View file

@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC0DE
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0010
#define MANUFACTURER KgOfHedgehogs
#define PRODUCT Huma
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 4

6
keyboards/jian/handwired/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Huma",
"usb": {
"device_version": "0.1.0"
}
}

6
keyboards/jian/info.json
View file

@ -1,7 +1,11 @@
{
"keyboard_name": "jian",
"manufacturer": "KgOfHedgehogs",
"url": "t.me/s/kgofhedgehogs",
"maintainer": "KGOH",
"usb": {
"vid": "0xC0DE",
"pid": "0x1337"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/jian/nsrev2/config.h
View file

@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC0DE
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0210
#define MANUFACTURER KgOfHedgehogs
#define PRODUCT Huma
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

6
keyboards/jian/nsrev2/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Huma",
"usb": {
"device_version": "2.1.0"
}
}

7
keyboards/jian/rev1/config.h
View file

@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC0DE
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0100
#define MANUFACTURER KgOfHedgehogs
#define PRODUCT Jian
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

6
keyboards/jian/rev1/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Jian",
"usb": {
"device_version": "1.0.0"
}
}

7
keyboards/jian/rev2/config.h
View file

@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC0DE
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0200
#define MANUFACTURER KgOfHedgehogs
#define PRODUCT Jian
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

6
keyboards/jian/rev2/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Jian",
"usb": {
"device_version": "2.0.0"
}
}

8
keyboards/jorne/rev1/config.h
View file

@ -2,14 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4753
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER joric
#define PRODUCT Jorne Keyboard
/* key matrix size */
/* Rows are doubled up */
#define MATRIX_ROWS 8

246
keyboards/jorne/rev1/info.json Normal file
View file

@ -0,0 +1,246 @@
{
"keyboard_name": "Jorne",
"manufacturer": "joric",
"url": "https://github.com/joric/jorne/wiki",
"maintainer": "joric",
"usb": {
"vid": "0x4753",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
{
"label": "GUI",
"x": 0,
"y": 2.13
},
{
"label": "~",
"x": 1,
"y": 1.38
},
{
"label": "Q",
"x": 2,
"y": 1.38
},
{
"label": "W",
"x": 3,
"y": 1.13
},
{
"label": "E",
"x": 4,
"y": 1
},
{
"label": "R",
"x": 5,
"y": 1.13
},
{
"label": "T",
"x": 6,
"y": 1.25
},
{
"label": "Y",
"x": 10.5,
"y": 1.25
},
{
"label": "U",
"x": 11.5,
"y": 1.125
},
{
"label": "I",
"x": 12.5,
"y": 1
},
{
"label": "O",
"x": 13.5,
"y": 1.125
},
{
"label": "P",
"x": 14.5,
"y": 1.375
},
{
"label": "{[",
"x": 15.5,
"y": 1.375
},
{
"label": "}]",
"x": 16.5,
"y": 2.13
},
{
"label": "Ctrl",
"x": 1,
"y": 2.38
},
{
"label": "A",
"x": 2,
"y": 2.38
},
{
"label": "S",
"x": 3,
"y": 2.13
},
{
"label": "D",
"x": 4,
"y": 2
},
{
"label": "F",
"x": 5,
"y": 2.13
},
{
"label": "G",
"x": 6,
"y": 2.25
},
{
"label": "H",
"x": 10.5,
"y": 2.25
},
{
"label": "J",
"x": 11.5,
"y": 2.13
},
{
"label": "K",
"x": 12.5,
"y": 2
},
{
"label": "L",
"x": 13.5,
"y": 2.125
},
{
"label": ":;",
"x": 14.5,
"y": 2.375
},
{
"label": "\"'",
"x": 15.5,
"y": 2.375
},
{
"label": "Alt",
"x": 1,
"y": 3.38
},
{
"label": "Z",
"x": 2,
"y": 3.38
},
{
"label": "X",
"x": 3,
"y": 3.13
},
{
"label": "C",
"x": 4,
"y": 3
},
{
"label": "V",
"x": 5,
"y": 3.13
},
{
"label": "B",
"x": 6,
"y": 3.25
},
{
"label": "N",
"x": 10.5,
"y": 3.25
},
{
"label": "M",
"x": 11.5,
"y": 3.13
},
{
"label": "<,",
"x": 12.5,
"y": 3
},
{
"label": ">.",
"x": 13.5,
"y": 3.13
},
{
"label": "?/",
"x": 14.5,
"y": 3.38
},
{
"label": "|\\",
"x": 15.5,
"y": 3.38
},
{
"label": "Rise",
"x": 5,
"y": 5
},
{
"label": "Space",
"x": 6,
"y": 5
},
{
"label": "Lower",
"x": 7,
"y": 4.5,
"h": 1.5
},
{
"label": "Lower",
"x": 9.5,
"y": 4.5,
"h": 1.5
},
{
"label": "Bcs",
"x": 10.5,
"y": 5
},
{
"label": "Rise",
"x": 11.5,
"y": 5
}
]
}
}
}

Some files were not shown because too many files have changed in this diff Show more