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

This commit is contained in:
Drashna Jael're
2022-08-14 01:54:23 -07:00
145 changed files with 789 additions and 471 deletions
-7
View File
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEC17
#define DEVICE_VER 0x0002
#define MANUFACTURER 2Moons
#define PRODUCT Slice
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9
File diff suppressed because one or more lines are too long
@@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEC15
#define DEVICE_VER 0x0002
#define MANUFACTURER 2Moons
#define PRODUCT Slice RGB
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9
File diff suppressed because one or more lines are too long
@@ -18,8 +18,6 @@
#pragma once
#include "config_common.h"
/* Key matrix configuration. */
#define MATRIX_ROWS 8 // Rows are doubled-up.
#define MATRIX_COLS 5
@@ -1,6 +1,8 @@
{
"url": "https://bastardkb.com/charybdis-nano",
"manufacturer": "Bastard Keyboards",
"usb": {
"vid": "0xA8F8",
"pid": "0x1832",
},
"layouts": {
@@ -18,8 +18,6 @@
#pragma once
#include "config_common.h"
/* Key matrix configuration. */
#define MATRIX_ROWS 10 // Rows are doubled-up.
#define MATRIX_COLS 6
@@ -1,6 +1,8 @@
{
"url": "https://bastardkb.com/charybdis",
"manufacturer": "Bastard Keyboards",
"usb": {
"vid": "0xA8F8",
"pid": "0x1833",
},
"layouts": {
-6
View File
@@ -19,12 +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 0xFEED
#define PRODUCT_ID 0x09f5
#define MANUFACTURER chemicalwill
#define PRODUCT bear_face
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
+10
View File
@@ -0,0 +1,10 @@
{
"keyboard_name": "bear_face",
"manufacturer": "chemicalwill",
"url": "https://github.com/chemicalwill/bear_face_pcb",
"maintainer": "chemicalwill",
"usb": {
"vid": "0xFEED",
"pid": "0x09F5"
}
}
-19
View File
@@ -1,19 +0,0 @@
/*
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
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/>.
*/
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0100
+3 -3
View File
@@ -1,7 +1,7 @@
{
"keyboard_name": "bear_face",
"url": "https://github.com/chemicalwill/bear_face_pcb",
"maintainer": "chemicalwill",
"usb": {
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT_83_ansi": {
"layout": [
-19
View File
@@ -1,19 +0,0 @@
/*
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
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/>.
*/
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0200
+3 -3
View File
@@ -1,7 +1,7 @@
{
"keyboard_name": "bear_face",
"url": "https://github.com/chemicalwill/bear_face_pcb",
"maintainer": "chemicalwill",
"usb": {
"device_version": "2.0.0"
},
"layouts": {
"LAYOUT_83_ansi": {
"layout": [
-6
View File
@@ -17,12 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x626D // BeMeier
#define PRODUCT_ID 0x656B // ErgonomicKeyboard
#define MANUFACTURER Bemeier
#define PRODUCT BMEK
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
+6 -1
View File
@@ -1,7 +1,12 @@
{
"keyboard_name": "bmek",
"keyboard_name": "BMEK",
"manufacturer": "Bemeier",
"url": "https://github.com/Bemeier/bmek",
"maintainer": "Bemeier",
"usb": {
"vid": "0x626D",
"pid": "0x656B"
},
"layouts": {
"LAYOUT_all": {
"layout": [
-2
View File
@@ -17,8 +17,6 @@
#include "config_common.h"
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS \
{ D4, D7, B6, B4, B7 }
#define MATRIX_COL_PINS \
+5
View File
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}
-2
View File
@@ -17,8 +17,6 @@
#include "config_common.h"
#define DEVICE_VER 0x0002
#define MATRIX_ROW_PINS \
{ F4, F5, D7, B5, B4 }
#define MATRIX_COL_PINS \
+5
View File
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}
-2
View File
@@ -17,8 +17,6 @@
#include "config_common.h"
#define DEVICE_VER 0x0003
#define MATRIX_ROW_PINS \
{ F1, B4, B5, D6, D7 }
#define MATRIX_COL_PINS \
+5
View File
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.3"
}
}
-7
View File
@@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xBC42
#define PRODUCT_ID 0x0042
#define DEVICE_VER 0x0100
#define MANUFACTURER Biacco42
#define PRODUCT Ergo42
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8
@@ -1,7 +1,13 @@
{
"keyboard_name": "Ergo42",
"manufacturer": "Biacco42",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xBC42",
"pid": "0x0042",
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT_ortho_4x14": {
"layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"L06", "x":6, "y":0}, {"label":"R00", "x":8, "y":0}, {"label":"R01", "x":9, "y":0}, {"label":"R02", "x":10, "y":0}, {"label":"R03", "x":11, "y":0}, {"label":"R04", "x":12, "y":0}, {"label":"R05", "x":13, "y":0}, {"label":"R06", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"L16", "x":6, "y":1}, {"label":"R10", "x":8, "y":1}, {"label":"R11", "x":9, "y":1}, {"label":"R12", "x":10, "y":1}, {"label":"R13", "x":11, "y":1}, {"label":"R14", "x":12, "y":1}, {"label":"R15", "x":13, "y":1}, {"label":"R16", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"L26", "x":6, "y":2}, {"label":"R20", "x":8, "y":2}, {"label":"R21", "x":9, "y":2}, {"label":"R22", "x":10, "y":2}, {"label":"R23", "x":11, "y":2}, {"label":"R24", "x":12, "y":2}, {"label":"R25", "x":13, "y":2}, {"label":"R26", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"L36", "x":6, "y":3}, {"label":"R30", "x":8, "y":3}, {"label":"R31", "x":9, "y":3}, {"label":"R32", "x":10, "y":3}, {"label":"R33", "x":11, "y":3}, {"label":"R34", "x":12, "y":3}, {"label":"R35", "x":13, "y":3}, {"label":"R36", "x":14, "y":3}]
+77
View File
@@ -0,0 +1,77 @@
/*
Copyright 2020 Cole Smith <cole@boadsource.xyz>
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
#include "config_common.h"
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8
#define MATRIX_COLS 5
#define MATRIX_ROW_PINS \
{ B2, B6, B4, B5 }
// wiring of each half
#define MATRIX_COL_PINS \
{ F4, F5, F6, F7, B1 }
#define USE_SERIAL
#define SOFT_SERIAL_PIN D2
/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST
/* number of backlight levels */
// #define BACKLIGHT_LEVELS 3
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* 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
/* ws2812 RGB LED */
#define RGB_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 12 // Number of LEDs
# define RGBLED_SPLIT \
{ 6, 6 }
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
#endif
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
// #define NO_DEBUG
/* disable print */
// #define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-3
View File
@@ -1,8 +1,5 @@
#pragma once
/* USB Device descriptor parameter */
#define DEVICE_VER 0x2019
#undef MATRIX_ROWS
#undef MATRIX_COLS
/* key matrix size */
+3 -7
View File
@@ -1,9 +1,5 @@
{
"keyboard_name": "Boston Meetup 2019",
"url": "",
"maintainer": "qmk",
"layouts": {
"LAYOUT": {
"layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}] }
}
"usb": {
"device_version": "20.1.9"
}
}
-6
View File
@@ -19,12 +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 0xFB30
#define PRODUCT_ID 0x26BE
#define MANUFACTURER ishtob
#define PRODUCT Boston Meetup Board
//#define AUDIO_VOICES
//#define BACKLIGHT_PIN B7
+14
View File
@@ -0,0 +1,14 @@
{
"keyboard_name": "Boston Meetup Board",
"manufacturer": "ishtob",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xFB30",
"pid": "0x26BE"
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}] }
}
}
-7
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 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER Bathroom Epiphanies
#define PRODUCT frosty_flake
/*
* Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies
* Ported from the Bathroom Epiphanies TMK Firmware:
@@ -1,7 +1,13 @@
{
"keyboard_name": "Frosty Flake",
"manufacturer": "Bathroom Epiphanies",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6050
#define DEVICE_VER 0x0104
#define MANUFACTURER Filco
#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2013
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
@@ -0,0 +1,3 @@
{
"keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013"
}
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6050
#define DEVICE_VER 0x0104
#define MANUFACTURER Filco
#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2015
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
@@ -0,0 +1,3 @@
{
"keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2015"
}
+6 -1
View File
@@ -1,7 +1,12 @@
{
"keyboard_name": "Pegasus Hoof",
"manufacturer": "Filco",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x6050",
"device_version": "1.0.4"
},
"layouts": {
"LAYOUT": {
"layout": [
-7
View File
@@ -3,13 +3,6 @@
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0xB077
#define DEVICE_VER 0x0001
#define MANUFACTURER crehmann
#define PRODUCT Buzzard
/* key matrix size */
/* Rows are doubled up */
#define MATRIX_ROWS 8
@@ -1,7 +1,13 @@
{
"keyboard_name": "Buzzard",
"manufacturer": "crehmann",
"url": "https://github.com/crehmann/buzzard",
"maintainer": "crehmann",
"usb": {
"vid": "0xFEED",
"pid": "0xB077",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+6
View File
@@ -1,7 +1,13 @@
{
"keyboard_name": "CANARY60RGB",
"manufacturer": "CANARY",
"url": "",
"maintainer": "tuananhnguyen204",
"usb": {
"vid": "0x4341",
"pid": "0x0621",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
-7
View File
@@ -15,13 +15,6 @@
*/
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4341
#define PRODUCT_ID 0x0621
#define DEVICE_VER 0x0001
#define MANUFACTURER CANARY
#define PRODUCT CANARY60RGB
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
-6
View File
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xCA04
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
@@ -1,21 +0,0 @@
/*
Copyright 2021 Andrew Kannan
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 PRODUCT_ID 0xDB62
#define PRODUCT DB60 Hotswap
@@ -0,0 +1,6 @@
{
"keyboard_name": "DB60 Hotswap",
"usb": {
"pid": "0xDB62"
}
}
File diff suppressed because one or more lines are too long
-21
View File
@@ -1,21 +0,0 @@
/*
Copyright 2021 Andrew Kannan
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 PRODUCT_ID 0xDB60
#define PRODUCT DB60
+6
View File
@@ -0,0 +1,6 @@
{
"keyboard_name": "DB60",
"usb": {
"pid": "0xDB60"
}
}
-21
View File
@@ -1,21 +0,0 @@
/*
Copyright 2021 Andrew Kannan
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 PRODUCT_ID 0xDB61
#define PRODUCT DB60v2
+6
View File
@@ -0,0 +1,6 @@
{
"keyboard_name": "DB60v2",
"usb": {
"pid": "0xDB61"
}
}
@@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* LSE clock */
#define STM32_LSECLK 32768
/* USB Device descriptor parameter */
#define VENDOR_ID 0xCA04
#define PRODUCT_ID 0x57F5
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Satisfaction75
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
@@ -0,0 +1,11 @@
{
"keyboard_name": "Satisfaction75",
"manufacturer": "CannonKeys",
"url": "",
"maintainer": "Cannon Keys",
"usb": {
"vid": "0xCA04",
"pid": "0x57F5",
"device_version": "0.0.1"
}
}

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