summaryrefslogtreecommitdiffstats
path: root/keyboards/vertex/arc60h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/vertex/arc60h')
-rw-r--r--keyboards/vertex/arc60h/arc60h.c18
-rw-r--r--keyboards/vertex/arc60h/arc60h.h36
-rw-r--r--keyboards/vertex/arc60h/config.h5
-rw-r--r--keyboards/vertex/arc60h/info.json139
-rw-r--r--keyboards/vertex/arc60h/rules.mk1
5 files changed, 76 insertions, 123 deletions
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/arc60h.h b/keyboards/vertex/arc60h/arc60h.h
deleted file mode 100644
index d82886a20f..0000000000
--- a/keyboards/vertex/arc60h/arc60h.h
+++ /dev/null
@@ -1,36 +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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K43, K46, K4B, K4C, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
- { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, ___, K4E } \
-}
diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h
index 1795f9b2ee..9f9ed0cdb3 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
@@ -33,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
#define RGBLED_NUM 9
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json
index 9cd38dd907..bdee577569 100644
--- a/keyboards/vertex/arc60h/info.json
+++ b/keyboards/vertex/arc60h/info.json
@@ -8,74 +8,87 @@
"pid": "0x9770",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B15",
+ "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": {
"LAYOUT_all": {
"layout": [
- {"x": 0, "y": 0 },
- {"x": 1, "y": 0 },
- {"x": 2, "y": 0 },
- {"x": 3, "y": 0 },
- {"x": 4, "y": 0 },
- {"x": 5, "y": 0 },
- {"x": 6, "y": 0 },
- {"x": 7, "y": 0 },
- {"x": 8, "y": 0 },
- {"x": 9, "y": 0 },
- {"x": 10, "y": 0 },
- {"x": 11, "y": 0 },
- {"x": 12, "y": 0 },
- {"x": 13, "y": 0 },
- {"x": 14, "y": 0 },
- {"x": 0, "y": 1, "w": 1.5 },
- {"x": 1.5, "y": 1 },
- {"x": 2.5, "y": 1 },
- {"x": 3.5, "y": 1 },
- {"x": 4.5, "y": 1 },
- {"x": 5.5, "y": 1 },
- {"x": 6.5, "y": 1 },
- {"x": 7.5, "y": 1 },
- {"x": 8.5, "y": 1 },
- {"x": 9.5, "y": 1 },
- {"x": 10.5, "y": 1 },
- {"x": 11.5, "y": 1 },
- {"x": 12.5, "y": 1 },
- {"x": 13.5, "y": 1, "w": 1.5 },
- {"x": 0, "y": 2, "w": 1.75 },
- {"x": 1.75, "y": 2 },
- {"x": 2.75, "y": 2 },
- {"x": 3.75, "y": 2 },
- {"x": 4.75, "y": 2 },
- {"x": 5.75, "y": 2 },
- {"x": 6.75, "y": 2 },
- {"x": 7.75, "y": 2 },
- {"x": 8.75, "y": 2 },
- {"x": 9.75, "y": 2 },
- {"x": 10.75, "y": 2 },
- {"x": 11.75, "y": 2 },
- {"x": 12.75, "y": 2, "w": 2.25 },
- {"x": 0, "y": 3, "w": 1.25 },
- {"x": 1.25, "y": 3 },
- {"x": 2.25, "y": 3 },
- {"x": 3.25, "y": 3 },
- {"x": 4.25, "y": 3 },
- {"x": 5.25, "y": 3 },
- {"x": 6.25, "y": 3 },
- {"x": 7.25, "y": 3 },
- {"x": 8.25, "y": 3 },
- {"x": 9.25, "y": 3 },
- {"x": 10.25, "y": 3 },
- {"x": 11.25, "y": 3 },
- {"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": 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": 13.5, "y": 4, "w": 1.5 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 14], "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
[cgit] Unable to lock slot /tmp/cgit/f2000000.lock: Permission denied (13)