summaryrefslogtreecommitdiff
path: root/keyboards/vertex
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/vertex')
-rw-r--r--keyboards/vertex/angler2/angler2.c17
-rw-r--r--keyboards/vertex/angler2/config.h16
-rw-r--r--keyboards/vertex/angler2/info.json5
-rw-r--r--keyboards/vertex/arc60/arc60.c18
-rw-r--r--keyboards/vertex/arc60/config.h4
-rw-r--r--keyboards/vertex/arc60/info.json5
-rw-r--r--keyboards/vertex/arc60h/arc60h.c18
-rw-r--r--keyboards/vertex/arc60h/config.h4
-rw-r--r--keyboards/vertex/arc60h/info.json12
-rw-r--r--keyboards/vertex/arc60h/rules.mk1
10 files changed, 20 insertions, 80 deletions
diff --git a/keyboards/vertex/angler2/angler2.c b/keyboards/vertex/angler2/angler2.c
deleted file mode 100644
index a6a4d21372..0000000000
--- a/keyboards/vertex/angler2/angler2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Vertex <xiaoxuxk@yeah.net>
- *
- * 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 "angler2.h"
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
index fc71e667b8..768474ba26 100644
--- a/keyboards/vertex/angler2/config.h
+++ b/keyboards/vertex/angler2/config.h
@@ -16,22 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B2, F0, D5, D1, D2 }
-#define MATRIX_COL_PINS { F5, F6, F7, E2, C7, C6, B6, F1, B5, B4, D7, D6, D4, D3, D0, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN E6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 3716ddbede..ebb2609fcc 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -8,6 +8,11 @@
"pid": "0x408F",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "E2", "C7", "C6", "B6", "F1", "B5", "B4", "D7", "D6", "D4", "D3", "D0", "B1"],
+ "rows": ["F4", "B2", "F0", "D5", "D1", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B0",
"scroll_lock": "B7",
diff --git a/keyboards/vertex/arc60/arc60.c b/keyboards/vertex/arc60/arc60.c
deleted file mode 100644
index d8fc41b794..0000000000
--- a/keyboards/vertex/arc60/arc60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 vertex
- *
- * 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 "arc60.h"
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index 633843021f..5cbee6426f 100644
--- a/keyboards/vertex/arc60/config.h
+++ b/keyboards/vertex/arc60/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index bfb8e4fc3a..60758ac3b8 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -8,6 +8,11 @@
"pid": "0x8370",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"],
+ "rows": ["B10", "B1", "B0", "A7", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C13",
"on_state": 0
diff --git a/keyboards/vertex/arc60h/arc60h.c b/keyboards/vertex/arc60h/arc60h.c
deleted file mode 100644
index 2ef6bb3ff4..0000000000
--- a/keyboards/vertex/arc60h/arc60h.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 vertex
- *
- * 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 "arc60h.h"
diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h
index 1795f9b2ee..650d910089 100644
--- a/keyboards/vertex/arc60h/config.h
+++ b/keyboards/vertex/arc60h/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
#define LED_CAPS_LOCK_PIN C13
#define LED_PIN_ON_STATE 0
diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json
index 9cd38dd907..a319f3c376 100644
--- a/keyboards/vertex/arc60h/info.json
+++ b/keyboards/vertex/arc60h/info.json
@@ -8,6 +8,14 @@
"pid": "0x9770",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "spi"
+ },
+ "matrix_pins": {
+ "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"],
+ "rows": ["B10", "B1", "B0", "A7", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
@@ -70,11 +78,11 @@
{"x": 12.25, "y": 3, "w": 1.75 },
{"x": 14, "y": 3 },
{"x": 0, "y": 4, "w": 1.5 },
- {"x": 1.5, "y": 4, "w": 1 },
+ {"x": 1.5, "y": 4 },
{"x": 2.5, "y": 4, "w": 1.5 },
{"x": 4, "y": 4, "w": 7 },
{"x": 11, "y": 4, "w": 1.5 },
- {"x": 12.5, "y": 4, "w": 1 },
+ {"x": 12.5, "y": 4 },
{"x": 13.5, "y": 4, "w": 1.5 }
]
}
diff --git a/keyboards/vertex/arc60h/rules.mk b/keyboards/vertex/arc60h/rules.mk
index 94b0fb2aa9..8e6bc896a6 100644
--- a/keyboards/vertex/arc60h/rules.mk
+++ b/keyboards/vertex/arc60h/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 21:28:06 +0000