sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fauxpark
2022-08-20 10:55:40 +10:00
parent eceed6c50b 201f1a8f47
commit 61689ae609
550 changed files with 1689 additions and 1819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
keyboards/salicylic_acid3/7skb/rev1/config.h
View File

@@ -18,13 +18,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 0xEB5F
#define DEVICE_VER 0x0007
#define MANUFACTURER Salicylic_Acid
#define PRODUCT 7skb
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8

6
keyboards/salicylic_acid3/7skb/info.json → keyboards/salicylic_acid3/7skb/rev1/info.json
View File

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

7
keyboards/salicylic_acid3/getta25/rev1/config.h
View File

@@ -18,13 +18,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 0x3060
#define DEVICE_VER 0x0013
#define MANUFACTURER Salicylic_Acid
#define PRODUCT getta25
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 6

8
keyboards/salicylic_acid3/getta25/info.json → keyboards/salicylic_acid3/getta25/rev1/info.json
View File

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

7
keyboards/salicylic_acid3/jisplit89/rev1/config.h
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 0xEB4F
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT jisplit89
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_COLS 8

6
keyboards/salicylic_acid3/jisplit89/info.json → keyboards/salicylic_acid3/jisplit89/rev1/info.json
View File

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

7
keyboards/salicylic_acid3/naked48/rev1/config.h
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 0xE8BA
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT naked48
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 12

8
keyboards/salicylic_acid3/naked48/info.json → keyboards/salicylic_acid3/naked48/rev1/info.json
View File

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

7
keyboards/salicylic_acid3/naked60/rev1/config.h
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 0xEB5C
#define DEVICE_VER 0x0001
#define MANUFACTURER Salicylic_Acid
#define PRODUCT naked60
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 12

8
keyboards/salicylic_acid3/naked60/info.json → keyboards/salicylic_acid3/naked60/rev1/info.json
View File

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

7
keyboards/salicylic_acid3/naked64/rev1/config.h
View File

@@ -18,13 +18,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 0x3060
#define DEVICE_VER 0x0003
#define MANUFACTURER Salicylic_Acid
#define PRODUCT naked64
/* key matrix size */
#define MATRIX_ROWS 16
#define MATRIX_COLS 8

8
keyboards/salicylic_acid3/naked64/info.json → keyboards/salicylic_acid3/naked64/rev1/info.json
View File

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

7
keyboards/salicylic_acid3/setta21/rev1/config.h
View File

@@ -18,13 +18,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 0x3060
#define DEVICE_VER 0x0011
#define MANUFACTURER Salicylic_Acid
#define PRODUCT setta21
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 6

6
keyboards/salicylic_acid3/setta21/info.json → keyboards/salicylic_acid3/setta21/rev1/info.json
View File

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