summaryrefslogtreecommitdiff
path: root/keyboards/z12
diff options
context:
space:
mode:
authorInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
committerInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
commit6afdd9d74da250e47ac64d6690bd19d037045e99 (patch)
tree661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/z12
parent93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff)
parent1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff)
downloadqmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz
qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/z12')
-rw-r--r--keyboards/z12/config.h8
-rw-r--r--keyboards/z12/info.json6
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/z12/config.h b/keyboards/z12/config.h
index 68aff7acf7..57b31e7c8b 100644
--- a/keyboards/z12/config.h
+++ b/keyboards/z12/config.h
@@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7A74
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER zigotica
-#define PRODUCT z12
-
#define ENCODERS_PAD_A { B5, B6 }
#define ENCODERS_PAD_B { B4, B2 }
@@ -41,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ F6, F5, F4, NO_PIN } \
}
-#define UNUSED_PINS
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json
index 2395401e47..7aa53d9a5c 100644
--- a/keyboards/z12/info.json
+++ b/keyboards/z12/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "z12",
+ "manufacturer": "zigotica",
"url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z12",
"maintainer": "@zigotica",
+ "usb": {
+ "vid": "0x7A74",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [