aboutsummaryrefslogtreecommitdiff
path: root/keyboards/tzarc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tzarc')
-rw-r--r--keyboards/tzarc/djinn/config.h6
-rw-r--r--keyboards/tzarc/djinn/djinn.c4
-rw-r--r--keyboards/tzarc/djinn/djinn_portscan_matrix.c9
-rw-r--r--keyboards/tzarc/djinn/djinn_split_sync.c2
-rw-r--r--keyboards/tzarc/djinn/djinn_usbpd.c2
-rw-r--r--keyboards/tzarc/djinn/info.json4
-rw-r--r--keyboards/tzarc/djinn/rev1/keyboard.json (renamed from keyboards/tzarc/djinn/rev1/info.json)0
-rw-r--r--keyboards/tzarc/djinn/rev1/rules.mk1
-rw-r--r--keyboards/tzarc/djinn/rev2/keyboard.json (renamed from keyboards/tzarc/djinn/rev2/info.json)0
-rw-r--r--keyboards/tzarc/djinn/rev2/rules.mk1
-rw-r--r--keyboards/tzarc/djinn/rules.mk2
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json (renamed from keyboards/tzarc/ghoul/rev1/rp2040/info.json)0
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/rules.mk0
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/config.h4
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/keyboard.json (renamed from keyboards/tzarc/ghoul/rev1/stm32/info.json)0
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/rules.mk0
16 files changed, 16 insertions, 19 deletions
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index 74bb00edc2..24357b6a35 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -39,9 +39,9 @@
#define WS2812_PWM_DRIVER PWMD20
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 3
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 1
-#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM20_UP
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 1
+#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM20_UP
// Audio configuration
#define AUDIO_PIN A5
diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index 17e5833ee9..8d6e2ec92e 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -1,12 +1,10 @@
// Copyright 2018-2023 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
+#include "djinn.h"
#include <string.h>
-#include "quantum.h"
#include <hal_pal.h>
-#include "djinn.h"
#include "serial.h"
#include "split_util.h"
-#include "qp.h"
painter_device_t lcd;
diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
index cb73c47def..63f480be27 100644
--- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c
+++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
@@ -1,7 +1,5 @@
// Copyright 2018-2022 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "quantum.h"
-#include <hal_pal.h>
#include "djinn.h"
#define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15
@@ -34,6 +32,8 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) {
}
}
+static void dummy_vt_callback(virtual_timer_t *vtp, void *p) {}
+
void matrix_init_custom(void) {
for (int i = 0; i < MATRIX_ROWS; ++i) {
setPinInputHigh(row_pins[i]);
@@ -41,6 +41,11 @@ void matrix_init_custom(void) {
for (int i = 0; i < MATRIX_COLS; ++i) {
setPinInputHigh(col_pins[i]);
}
+
+ // Start a virtual timer so we'll still get periodic wakeups, now that USB SOF doesn't wake up the main loop
+ static virtual_timer_t vt;
+ chVTObjectInit(&vt);
+ chVTSetContinuous(&vt, TIME_MS2I(10), dummy_vt_callback, NULL);
}
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c
index 8b10e88b4b..3a2a8a4ff3 100644
--- a/keyboards/tzarc/djinn/djinn_split_sync.c
+++ b/keyboards/tzarc/djinn/djinn_split_sync.c
@@ -1,7 +1,5 @@
// Copyright 2018-2023 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include <string.h>
-#include "quantum.h"
#include "transactions.h"
#include "split_util.h"
#include "djinn.h"
diff --git a/keyboards/tzarc/djinn/djinn_usbpd.c b/keyboards/tzarc/djinn/djinn_usbpd.c
index 7a56f92b8e..e4e75f20d8 100644
--- a/keyboards/tzarc/djinn/djinn_usbpd.c
+++ b/keyboards/tzarc/djinn/djinn_usbpd.c
@@ -1,7 +1,5 @@
// Copyright 2018-2022 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include <string.h>
-#include "quantum.h"
#include "djinn.h"
const char* usbpd_str(usbpd_allowance_t allowance) {
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 64ed1da690..be0710ebef 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -23,7 +23,6 @@
"nkro": true,
"quantum_painter": true,
"rgb_matrix": true,
- "unicode": false,
"usbpd": true,
"wpm": true
},
@@ -32,6 +31,9 @@
"rows": ["B13", "B14", "B15", "C6", "C7", "C8"],
"cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"]
},
+ "audio": {
+ "driver": "pwm_software"
+ },
"backlight": {
"pin": "A7",
"levels": 4
diff --git a/keyboards/tzarc/djinn/rev1/info.json b/keyboards/tzarc/djinn/rev1/keyboard.json
index a0422dea93..a0422dea93 100644
--- a/keyboards/tzarc/djinn/rev1/info.json
+++ b/keyboards/tzarc/djinn/rev1/keyboard.json
diff --git a/keyboards/tzarc/djinn/rev1/rules.mk b/keyboards/tzarc/djinn/rev1/rules.mk
deleted file mode 100644
index f468872849..0000000000
--- a/keyboards/tzarc/djinn/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Placeholder to make the build system work.
diff --git a/keyboards/tzarc/djinn/rev2/info.json b/keyboards/tzarc/djinn/rev2/keyboard.json
index 33db91971e..33db91971e 100644
--- a/keyboards/tzarc/djinn/rev2/info.json
+++ b/keyboards/tzarc/djinn/rev2/keyboard.json
diff --git a/keyboards/tzarc/djinn/rev2/rules.mk b/keyboards/tzarc/djinn/rev2/rules.mk
deleted file mode 100644
index f468872849..0000000000
--- a/keyboards/tzarc/djinn/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Placeholder to make the build system work.
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index 5a4589a86f..78912d16d0 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -4,8 +4,6 @@ SERIAL_DRIVER = usart
CIE1931_CURVE = yes
-AUDIO_DRIVER = pwm_software
-
QUANTUM_PAINTER_DRIVERS = ili9341_spi
SRC += \
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json
index 3c2c5ec4e6..3c2c5ec4e6 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/info.json
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
+++ /dev/null
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
index 1dbc164039..a835b341db 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/config.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -28,8 +28,8 @@
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
#define RGB_ENABLE_PIN C0
// ADC Configuration
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/keyboard.json
index cb0e20dfc5..cb0e20dfc5 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/info.json
+++ b/keyboards/tzarc/ghoul/rev1/stm32/keyboard.json
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
+++ /dev/null