summaryrefslogtreecommitdiff
path: root/keyboards/tzarc/ghoul
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tzarc/ghoul')
-rw-r--r--keyboards/tzarc/ghoul/ghoul.c2
-rw-r--r--keyboards/tzarc/ghoul/info.json89
-rw-r--r--keyboards/tzarc/ghoul/keymaps/default/keymap.c2
-rw-r--r--keyboards/tzarc/ghoul/rev1/info.json80
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/config.h1
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/info.json10
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/rules.mk1
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/config.h1
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/info.json10
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/rules.mk1
-rw-r--r--keyboards/tzarc/ghoul/rules.mk1
11 files changed, 98 insertions, 100 deletions
diff --git a/keyboards/tzarc/ghoul/ghoul.c b/keyboards/tzarc/ghoul/ghoul.c
index aceb24764b..a97399110c 100644
--- a/keyboards/tzarc/ghoul/ghoul.c
+++ b/keyboards/tzarc/ghoul/ghoul.c
@@ -1,6 +1,6 @@
// Copyright 2018-2022 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-3.0-or-later
-#include QMK_KEYBOARD_H
+#include "quantum.h"
#include "analog.h"
#include "spi_master.h"
diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
index 14e833c5b2..fe6de66470 100644
--- a/keyboards/tzarc/ghoul/info.json
+++ b/keyboards/tzarc/ghoul/info.json
@@ -15,9 +15,12 @@
"quantum_painter": true,
"rgb_matrix": true
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"matrix_pins": {
- "rows": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"],
- "cols": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"]
+ "rows": ["NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"],
+ "cols": ["NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
},
"usb": {
"vid": "0x1209",
@@ -26,47 +29,47 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "W", "matrix": [0, 4], "w": 1, "x": 1, "y": 0 },
- { "label": "E", "matrix": [1, 0], "w": 1, "x": 2, "y": 0 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 3, "y": 0 },
- { "label": "T", "matrix": [2, 0], "w": 1, "x": 4, "y": 0 },
- { "label": "kEC", "matrix": [5, 0], "w": 1, "x": 5.5, "y": 0 },
- { "label": "Y", "matrix": [2, 4], "w": 1, "x": 7, "y": 0 },
- { "label": "U", "matrix": [3, 0], "w": 1, "x": 8, "y": 0 },
- { "label": "I", "matrix": [3, 4], "w": 1, "x": 9, "y": 0 },
- { "label": "O", "matrix": [4, 0], "w": 1, "x": 10, "y": 0 },
- { "label": "P", "matrix": [4, 4], "w": 1, "x": 11, "y": 0 },
- { "label": "A", "matrix": [0, 1], "w": 1, "x": 0, "y": 1 },
- { "label": "S", "matrix": [0, 5], "w": 1, "x": 1, "y": 1 },
- { "label": "D", "matrix": [1, 1], "w": 1, "x": 2, "y": 1 },
- { "label": "F", "matrix": [1, 5], "w": 1, "x": 3, "y": 1 },
- { "label": "G", "matrix": [2, 1], "w": 1, "x": 4, "y": 1 },
- { "label": "H", "matrix": [2, 5], "w": 1, "x": 7, "y": 1 },
- { "label": "J", "matrix": [3, 1], "w": 1, "x": 8, "y": 1 },
- { "label": "K", "matrix": [3, 5], "w": 1, "x": 9, "y": 1 },
- { "label": "L", "matrix": [4, 1], "w": 1, "x": 10, "y": 1 },
- { "label": ";", "matrix": [4, 5], "w": 1, "x": 11, "y": 1 },
- { "label": "Z", "matrix": [0, 2], "w": 1, "x": 0, "y": 2 },
- { "label": "X", "matrix": [0, 6], "w": 1, "x": 1, "y": 2 },
- { "label": "C", "matrix": [1, 2], "w": 1, "x": 2, "y": 2 },
- { "label": "V", "matrix": [1, 6], "w": 1, "x": 3, "y": 2 },
- { "label": "B", "matrix": [2, 2], "w": 1, "x": 4, "y": 2 },
- { "label": "N", "matrix": [2, 6], "w": 1, "x": 7, "y": 2 },
- { "label": "M", "matrix": [3, 2], "w": 1, "x": 8, "y": 2 },
- { "label": ",", "matrix": [3, 6], "w": 1, "x": 9, "y": 2 },
- { "label": ".", "matrix": [4, 2], "w": 1, "x": 10, "y": 2 },
- { "label": "/", "matrix": [4, 6], "w": 1, "x": 11, "y": 2 },
- { "label": "Ctrl", "matrix": [0, 3], "w": 1, "x": 0, "y": 3 },
- { "label": "Alt", "matrix": [0, 7], "w": 1, "x": 1, "y": 3 },
- { "label": "Super", "matrix": [1, 3], "w": 1, "x": 2, "y": 3 },
- { "label": "Lower", "matrix": [1, 7], "w": 1, "x": 3, "y": 3 },
- { "label": "Space", "matrix": [2, 3], "w": 1, "x": 4, "y": 3 },
- { "label": "Space", "matrix": [2, 7], "w": 1, "x": 7, "y": 3 },
- { "label": "Raise", "matrix": [3, 3], "w": 1, "x": 8, "y": 3 },
- { "label": "←", "matrix": [3, 7], "w": 1, "x": 9, "y": 3 },
- { "label": "↓", "matrix": [4, 3], "w": 1, "x": 10, "y": 3 },
- { "label": "↑", "matrix": [4, 7], "w": 1, "x": 11, "y": 3 }
+ {"label": "Q", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "W", "matrix": [0, 4], "x": 1, "y": 0},
+ {"label": "E", "matrix": [1, 0], "x": 2, "y": 0},
+ {"label": "R", "matrix": [1, 4], "x": 3, "y": 0},
+ {"label": "T", "matrix": [2, 0], "x": 4, "y": 0},
+ {"label": "kEC", "matrix": [5, 0], "x": 5.5, "y": 0},
+ {"label": "Y", "matrix": [2, 4], "x": 7, "y": 0},
+ {"label": "U", "matrix": [3, 0], "x": 8, "y": 0},
+ {"label": "I", "matrix": [3, 4], "x": 9, "y": 0},
+ {"label": "O", "matrix": [4, 0], "x": 10, "y": 0},
+ {"label": "P", "matrix": [4, 4], "x": 11, "y": 0},
+ {"label": "A", "matrix": [0, 1], "x": 0, "y": 1},
+ {"label": "S", "matrix": [0, 5], "x": 1, "y": 1},
+ {"label": "D", "matrix": [1, 1], "x": 2, "y": 1},
+ {"label": "F", "matrix": [1, 5], "x": 3, "y": 1},
+ {"label": "G", "matrix": [2, 1], "x": 4, "y": 1},
+ {"label": "H", "matrix": [2, 5], "x": 7, "y": 1},
+ {"label": "J", "matrix": [3, 1], "x": 8, "y": 1},
+ {"label": "K", "matrix": [3, 5], "x": 9, "y": 1},
+ {"label": "L", "matrix": [4, 1], "x": 10, "y": 1},
+ {"label": ";", "matrix": [4, 5], "x": 11, "y": 1},
+ {"label": "Z", "matrix": [0, 2], "x": 0, "y": 2},
+ {"label": "X", "matrix": [0, 6], "x": 1, "y": 2},
+ {"label": "C", "matrix": [1, 2], "x": 2, "y": 2},
+ {"label": "V", "matrix": [1, 6], "x": 3, "y": 2},
+ {"label": "B", "matrix": [2, 2], "x": 4, "y": 2},
+ {"label": "N", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "M", "matrix": [3, 2], "x": 8, "y": 2},
+ {"label": ",", "matrix": [3, 6], "x": 9, "y": 2},
+ {"label": ".", "matrix": [4, 2], "x": 10, "y": 2},
+ {"label": "/", "matrix": [4, 6], "x": 11, "y": 2},
+ {"label": "Ctrl", "matrix": [0, 3], "x": 0, "y": 3},
+ {"label": "Alt", "matrix": [0, 7], "x": 1, "y": 3},
+ {"label": "Super", "matrix": [1, 3], "x": 2, "y": 3},
+ {"label": "Lower", "matrix": [1, 7], "x": 3, "y": 3},
+ {"label": "Space", "matrix": [2, 3], "x": 4, "y": 3},
+ {"label": "Space", "matrix": [2, 7], "x": 7, "y": 3},
+ {"label": "Raise", "matrix": [3, 3], "x": 8, "y": 3},
+ {"label": "←", "matrix": [3, 7], "x": 9, "y": 3},
+ {"label": "↓", "matrix": [4, 3], "x": 10, "y": 3},
+ {"label": "↑", "matrix": [4, 7], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/tzarc/ghoul/keymaps/default/keymap.c b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
index 920af658c4..57010c3a7b 100644
--- a/keyboards/tzarc/ghoul/keymaps/default/keymap.c
+++ b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// clang-format on
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
[_LOWER] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
[_RAISE] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
diff --git a/keyboards/tzarc/ghoul/rev1/info.json b/keyboards/tzarc/ghoul/rev1/info.json
index 7612fc1147..b5219fe5fb 100644
--- a/keyboards/tzarc/ghoul/rev1/info.json
+++ b/keyboards/tzarc/ghoul/rev1/info.json
@@ -4,46 +4,46 @@
},
"rgb_matrix": {
"layout": [
- { "flags": 4, "matrix": [2, 3], "x": 81, "y": 64 },
- { "flags": 4, "matrix": [1, 7], "x": 61, "y": 64 },
- { "flags": 4, "matrix": [1, 3], "x": 40, "y": 64 },
- { "flags": 4, "matrix": [0, 7], "x": 20, "y": 64 },
- { "flags": 4, "matrix": [0, 3], "x": 0, "y": 64 },
- { "flags": 4, "matrix": [0, 2], "x": 0, "y": 42 },
- { "flags": 4, "matrix": [0, 6], "x": 20, "y": 42 },
- { "flags": 4, "matrix": [1, 2], "x": 40, "y": 42 },
- { "flags": 4, "matrix": [1, 6], "x": 61, "y": 42 },
- { "flags": 4, "matrix": [2, 2], "x": 81, "y": 42 },
- { "flags": 4, "matrix": [2, 1], "x": 81, "y": 21 },
- { "flags": 4, "matrix": [1, 5], "x": 61, "y": 21 },
- { "flags": 4, "matrix": [1, 1], "x": 40, "y": 21 },
- { "flags": 4, "matrix": [0, 5], "x": 20, "y": 21 },
- { "flags": 4, "matrix": [0, 1], "x": 0, "y": 21 },
- { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
- { "flags": 4, "matrix": [0, 4], "x": 20, "y": 0 },
- { "flags": 4, "matrix": [1, 0], "x": 40, "y": 0 },
- { "flags": 4, "matrix": [1, 4], "x": 61, "y": 0 },
- { "flags": 4, "matrix": [2, 0], "x": 81, "y": 0 },
- { "flags": 4, "matrix": [2, 4], "x": 142, "y": 0 },
- { "flags": 4, "matrix": [3, 0], "x": 162, "y": 0 },
- { "flags": 4, "matrix": [3, 4], "x": 183, "y": 0 },
- { "flags": 4, "matrix": [4, 0], "x": 203, "y": 0 },
- { "flags": 4, "matrix": [4, 4], "x": 224, "y": 0 },
- { "flags": 4, "matrix": [4, 5], "x": 224, "y": 21 },
- { "flags": 4, "matrix": [4, 1], "x": 203, "y": 21 },
- { "flags": 4, "matrix": [3, 5], "x": 183, "y": 21 },
- { "flags": 4, "matrix": [3, 1], "x": 162, "y": 21 },
- { "flags": 4, "matrix": [2, 5], "x": 142, "y": 21 },
- { "flags": 4, "matrix": [2, 6], "x": 142, "y": 42 },
- { "flags": 4, "matrix": [3, 2], "x": 162, "y": 42 },
- { "flags": 4, "matrix": [3, 6], "x": 183, "y": 42 },
- { "flags": 4, "matrix": [4, 2], "x": 203, "y": 42 },
- { "flags": 4, "matrix": [4, 6], "x": 224, "y": 42 },
- { "flags": 4, "matrix": [4, 7], "x": 224, "y": 64 },
- { "flags": 4, "matrix": [4, 3], "x": 203, "y": 64 },
- { "flags": 4, "matrix": [3, 7], "x": 183, "y": 64 },
- { "flags": 4, "matrix": [3, 3], "x": 162, "y": 64 },
- { "flags": 4, "matrix": [2, 7], "x": 142, "y": 64 }
+ {"flags": 4, "matrix": [2, 3], "x": 81, "y": 64},
+ {"flags": 4, "matrix": [1, 7], "x": 61, "y": 64},
+ {"flags": 4, "matrix": [1, 3], "x": 40, "y": 64},
+ {"flags": 4, "matrix": [0, 7], "x": 20, "y": 64},
+ {"flags": 4, "matrix": [0, 3], "x": 0, "y": 64},
+ {"flags": 4, "matrix": [0, 2], "x": 0, "y": 42},
+ {"flags": 4, "matrix": [0, 6], "x": 20, "y": 42},
+ {"flags": 4, "matrix": [1, 2], "x": 40, "y": 42},
+ {"flags": 4, "matrix": [1, 6], "x": 61, "y": 42},
+ {"flags": 4, "matrix": [2, 2], "x": 81, "y": 42},
+ {"flags": 4, "matrix": [2, 1], "x": 81, "y": 21},
+ {"flags": 4, "matrix": [1, 5], "x": 61, "y": 21},
+ {"flags": 4, "matrix": [1, 1], "x": 40, "y": 21},
+ {"flags": 4, "matrix": [0, 5], "x": 20, "y": 21},
+ {"flags": 4, "matrix": [0, 1], "x": 0, "y": 21},
+ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+ {"flags": 4, "matrix": [0, 4], "x": 20, "y": 0},
+ {"flags": 4, "matrix": [1, 0], "x": 40, "y": 0},
+ {"flags": 4, "matrix": [1, 4], "x": 61, "y": 0},
+ {"flags": 4, "matrix": [2, 0], "x": 81, "y": 0},
+ {"flags": 4, "matrix": [2, 4], "x": 142, "y": 0},
+ {"flags": 4, "matrix": [3, 0], "x": 162, "y": 0},
+ {"flags": 4, "matrix": [3, 4], "x": 183, "y": 0},
+ {"flags": 4, "matrix": [4, 0], "x": 203, "y": 0},
+ {"flags": 4, "matrix": [4, 4], "x": 224, "y": 0},
+ {"flags": 4, "matrix": [4, 5], "x": 224, "y": 21},
+ {"flags": 4, "matrix": [4, 1], "x": 203, "y": 21},
+ {"flags": 4, "matrix": [3, 5], "x": 183, "y": 21},
+ {"flags": 4, "matrix": [3, 1], "x": 162, "y": 21},
+ {"flags": 4, "matrix": [2, 5], "x": 142, "y": 21},
+ {"flags": 4, "matrix": [2, 6], "x": 142, "y": 42},
+ {"flags": 4, "matrix": [3, 2], "x": 162, "y": 42},
+ {"flags": 4, "matrix": [3, 6], "x": 183, "y": 42},
+ {"flags": 4, "matrix": [4, 2], "x": 203, "y": 42},
+ {"flags": 4, "matrix": [4, 6], "x": 224, "y": 42},
+ {"flags": 4, "matrix": [4, 7], "x": 224, "y": 64},
+ {"flags": 4, "matrix": [4, 3], "x": 203, "y": 64},
+ {"flags": 4, "matrix": [3, 7], "x": 183, "y": 64},
+ {"flags": 4, "matrix": [3, 3], "x": 162, "y": 64},
+ {"flags": 4, "matrix": [2, 7], "x": 142, "y": 64}
]
}
}
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
index 39b587bab0..616d4ab84a 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/config.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
@@ -22,7 +22,6 @@
#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN GP2
// RGB configuration
-#define RGB_DI_PIN GP13
#define RGB_ENABLE_PIN GP6
// ADC Configuration
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/info.json
index 57b4cb772f..3c2c5ec4e6 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/info.json
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/info.json
@@ -5,11 +5,11 @@
"bootloader_instructions": "Hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.",
"encoder": {
"rotary": [
- {
- "pin_a": "GP8",
- "pin_b": "GP5",
- "resolution": 2
- }
+ {"pin_a": "GP8", "pin_b": "GP5", "resolution": 2}
]
+ },
+ "ws2812": {
+ "pin": "GP13",
+ "driver": "vendor"
}
}
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
index 12c9f77d5e..1dbc164039 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/config.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -25,7 +25,6 @@
#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN A4
// RGB configuration
-#define RGB_DI_PIN C6
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/info.json
index 11dcde90c9..cb0e20dfc5 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/info.json
+++ b/keyboards/tzarc/ghoul/rev1/stm32/info.json
@@ -3,13 +3,13 @@
"processor": "STM32F405",
"bootloader": "stm32-dfu",
"bootloader_instructions": "Press the 5 keys on the bottom row of the left side, or hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.",
+ "ws2812": {
+ "pin": "C6",
+ "driver": "pwm"
+ },
"encoder": {
"rotary": [
- {
- "pin_a": "B10",
- "pin_b": "B1",
- "resolution": 2
- }
+ {"pin_a": "B10", "pin_b": "B1", "resolution": 2}
]
}
}
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
index c1285e300c..e69de29bb2 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
+++ b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = pwm
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index a18cf56fce..10630d80cf 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,6 +1,5 @@
CUSTOM_MATRIX = lite
EEPROM_DRIVER = spi
-RGB_MATRIX_DRIVER = WS2812
QUANTUM_PAINTER_DRIVERS = ssd1351_spi
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 18:31:22 +0000