summaryrefslogtreecommitdiff
path: root/keyboards/quarkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/quarkeys')
-rw-r--r--keyboards/quarkeys/z40/config.h5
-rw-r--r--keyboards/quarkeys/z40/info.json11
-rw-r--r--keyboards/quarkeys/z40/rules.mk1
-rw-r--r--keyboards/quarkeys/z60/hotswap/config.h6
-rw-r--r--keyboards/quarkeys/z60/hotswap/hotswap.c15
-rw-r--r--keyboards/quarkeys/z60/hotswap/info.json8
-rw-r--r--keyboards/quarkeys/z60/solder/config.h7
-rw-r--r--keyboards/quarkeys/z60/solder/info.json8
-rw-r--r--keyboards/quarkeys/z60/solder/solder.c15
-rw-r--r--keyboards/quarkeys/z67/hotswap/config.h6
-rw-r--r--keyboards/quarkeys/z67/hotswap/hotswap.c15
-rw-r--r--keyboards/quarkeys/z67/hotswap/info.json8
-rw-r--r--keyboards/quarkeys/z67/solder/config.h6
-rw-r--r--keyboards/quarkeys/z67/solder/info.json8
-rw-r--r--keyboards/quarkeys/z67/solder/solder.c15
15 files changed, 43 insertions, 91 deletions
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index 1ca7a35849..2f70b1e53b 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -14,11 +14,6 @@
#pragma once
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { E6, B3, C7, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B5, B4, D7, D6, D0, B1, B0 }
-#define RGB_DI_PIN F1
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 47
#define RGB_MATRIX_KEYPRESSES // Reacts to Keypresses
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 57159669a4..bde8a576b9 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -8,6 +8,17 @@
"pid": "0x2801",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
+ "rows": ["E6", "B3", "C7", "C6"]
+ },
+ "ws2812": {
+ "pin": "F1"
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/quarkeys/z40/rules.mk b/keyboards/quarkeys/z40/rules.mk
index 89107d24a8..4554ab2970 100644
--- a/keyboards/quarkeys/z40/rules.mk
+++ b/keyboards/quarkeys/z40/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable this and unable RGB_MATRIX_ENABLE to use RGB light effect
RGB_MATRIX_ENABLE = yes # Enable this and unable RGBLIGHT_ENABLE to use RGB Matrix effect
-RGB_MATRIX_DRIVER = WS2812 # Comment out this line when RGBLIGHTING is enabled
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index b23030ad5c..d1456a07f8 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,12 +14,6 @@
#pragma once
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
-
-#define RGB_DI_PIN D6
#define RGBLED_NUM 80
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z60/hotswap/hotswap.c b/keyboards/quarkeys/z60/hotswap/hotswap.c
deleted file mode 100644
index b45286e8ba..0000000000
--- a/keyboards/quarkeys/z60/hotswap/hotswap.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-/ Copyright 2022 quarkeys
-/ 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/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index c142c01b7e..3924726711 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -8,6 +8,14 @@
"pid": "0x3C02",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "ws2812": {
+ "pin": "D6"
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index a66ebdd550..bf95108da3 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,13 +14,6 @@
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
-
-#define RGB_DI_PIN D6
#define RGBLED_NUM 77
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index e5ec227c7e..daffbb0220 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -8,6 +8,14 @@
"pid": "0x3C01",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "ws2812": {
+ "pin": "D6"
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/quarkeys/z60/solder/solder.c b/keyboards/quarkeys/z60/solder/solder.c
deleted file mode 100644
index 1aacc5168e..0000000000
--- a/keyboards/quarkeys/z60/solder/solder.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-/ Copyright 2022 quarkeys
-/ 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/>.
-*/
-
-#include "solder.h"
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index 3e3ce2b0a2..2b4eb0f8e4 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -14,12 +14,6 @@
#pragma once
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
-
-#define RGB_DI_PIN F0
#define RGBLED_NUM 77
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z67/hotswap/hotswap.c b/keyboards/quarkeys/z67/hotswap/hotswap.c
deleted file mode 100644
index b45286e8ba..0000000000
--- a/keyboards/quarkeys/z67/hotswap/hotswap.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-/ Copyright 2022 quarkeys
-/ 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/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json
index c31a37325d..5daf2e0d16 100644
--- a/keyboards/quarkeys/z67/hotswap/info.json
+++ b/keyboards/quarkeys/z67/hotswap/info.json
@@ -8,6 +8,14 @@
"pid": "0x4102",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
+ "rows": ["B0", "B1", "B2", "B3", "F7"]
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index 18ed997500..a4c6bd7153 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -14,12 +14,6 @@
#pragma once
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B5, B4 }
-
-#define RGB_DI_PIN F0
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json
index af8c81f9d2..4e0e697fd9 100644
--- a/keyboards/quarkeys/z67/solder/info.json
+++ b/keyboards/quarkeys/z67/solder/info.json
@@ -8,6 +8,14 @@
"pid": "0x4101",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"],
+ "rows": ["B0", "B1", "B2", "B3", "F7"]
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/quarkeys/z67/solder/solder.c b/keyboards/quarkeys/z67/solder/solder.c
deleted file mode 100644
index 1aacc5168e..0000000000
--- a/keyboards/quarkeys/z67/solder/solder.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-/ Copyright 2022 quarkeys
-/ 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/>.
-*/
-
-#include "solder.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 14:54:02 +0000