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-03 22:13:54 +00:00
commit d664fbac28
227 changed files with 704 additions and 825 deletions
Download patch file Download diff file Expand all files Collapse all files

7
keyboards/salicylic_acid3/7splus/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 0x04D8
#define PRODUCT_ID 0xEAE7
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT 7splus
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_COLS 8

6
keyboards/salicylic_acid3/7splus/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "7splus",
"manufacturer": "Salicylic_Acid",
"url": "https://salicylic-acid3.hatenablog.com/",
"maintainer": "Salicylic_acid3",
"usb": {
"vid": "0x04D8",
"pid": "0xEAE7",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/salicylic_acid3/ajisai74/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 0x04D8
#define PRODUCT_ID 0xEB54
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT ajisai74
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9

6
keyboards/salicylic_acid3/ajisai74/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "ajisai74",
"manufacturer": "Salicylic_Acid",
"url": "https://salicylic-acid3.hatenablog.com/",
"maintainer": "Salicylic_acid3",
"usb": {
"vid": "0x04D8",
"pid": "0xEB54",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/salicylic_acid3/ergoarrows/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 0x04D8
#define PRODUCT_ID 0xEA54
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT ergoarrows
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 7

6
keyboards/salicylic_acid3/ergoarrows/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "ergoarrows",
"manufacturer": "Salicylic_Acid",
"url": "https://salicylic-acid3.hatenablog.com/",
"maintainer": "Salicylic_acid3",
"usb": {
"vid": "0x04D8",
"pid": "0xEA54",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/salicylic_acid3/nafuda/config.h
View file

@ -20,13 +20,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 0x3060
#define DEVICE_VER 0x0012
#define MANUFACTURER Salicylic_Acid
#define PRODUCT nafuda
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3

6
keyboards/salicylic_acid3/nafuda/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "nafuda",
"manufacturer": "Salicylic_Acid",
"url": "https://salicylic-acid3.hatenablog.com/",
"maintainer": "Salicylic_acid3",
"usb": {
"vid": "0xFEED",
"pid": "0x3060",
"device_version": "0.1.2"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/salicylic_acid3/nknl7en/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 0x04D8
#define PRODUCT_ID 0xEA56
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT nknl7en
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9

6
keyboards/salicylic_acid3/nknl7en/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "nknl7en",
"manufacturer": "Salicylic_Acid",
"url": "https://salicylic-acid3.hatenablog.com/",
"maintainer": "Salicylic_acid3",
"usb": {
"vid": "0x04D8",
"pid": "0xEA56",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/salicylic_acid3/nknl7jp/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 0x04D8
#define PRODUCT_ID 0xEA55
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT nknl7jp
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9

6
keyboards/salicylic_acid3/nknl7jp/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "nknl7jp",
"manufacturer": "Salicylic_Acid",
"url": "https://salicylic-acid3.hatenablog.com/",
"maintainer": "Salicylic_acid3",
"usb": {
"vid": "0x04D8",
"pid": "0xEA55",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/sam/s80/config.h
View file

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x534D
#define PRODUCT_ID 0x3830
#define DEVICE_VER 0x0001
#define MANUFACTURER Sam
#define PRODUCT s80
/* key matrix size */
#define MATRIX_ROWS 11
#define MATRIX_COLS 9

8
keyboards/sam/s80/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "s80 wkl",
"keyboard_name": "s8",
"manufacturer": "Sam",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x534D",
"pid": "0x3830",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/sam/sg81m/config.h
View file

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x534D //SM
#define PRODUCT_ID 0x3831 //81
#define DEVICE_VER 0x0001
#define MANUFACTURER Sam
#define PRODUCT SG81M
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 14

8
keyboards/sam/sg81m/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "sam sg81m",
"keyboard_name": "SG81M",
"manufacturer": "Sam",
"url": "",
"maintainer": "CMMS-Freather",
"usb": {
"vid": "0x534D",
"pid": "0x3831",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_7u_space": {
"layout": [

7
keyboards/sanctified/dystopia/config.h
View file

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x5357 // "SW"
#define PRODUCT_ID 0x0001 // First public keyboard
#define DEVICE_VER 0x0001 // Version 1
#define MANUFACTURER Sanctified.Works
#define PRODUCT Dystopia
/* Key Matrix Size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14

6
keyboards/sanctified/dystopia/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Dystopia",
"manufacturer": "Sanctified.Works",
"url": "",
"maintainer": "Sanctified",
"usb": {
"vid": "0x5357",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_bs": {
"layout": [

7
keyboards/sandwich/keeb68/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 0xFEED
#define PRODUCT_ID 0x0000
#define DEVICE_VER 0x0001
#define MANUFACTURER sandwich
#define PRODUCT Keeb68 (Patron Saint Edition)
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14

8
keyboards/sandwich/keeb68/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Keeb68 (PSE)",
"keyboard_name": "Keeb68 (Patron Saint Edition)",
"manufacturer": "sandwich",
"url": "",
"maintainer": "SandwichRising",
"usb": {
"vid": "0xFEED",
"pid": "0x0000",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_65_ansi": {
"layout": [

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