summaryrefslogtreecommitdiff
path: root/keyboards/tzarc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tzarc')
-rw-r--r--keyboards/tzarc/djinn/config.h16
-rw-r--r--keyboards/tzarc/djinn/info.json18
-rw-r--r--keyboards/tzarc/djinn/rev1/config.h6
-rw-r--r--keyboards/tzarc/djinn/rev1/info.json4
-rw-r--r--keyboards/tzarc/djinn/rev2/config.h5
-rw-r--r--keyboards/tzarc/djinn/rev2/info.json3
-rw-r--r--keyboards/tzarc/djinn/rules.mk2
-rw-r--r--keyboards/tzarc/ghoul/config.h1
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/config.h5
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/halconf.h2
-rw-r--r--keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h4
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/config.h1
-rw-r--r--keyboards/tzarc/ghoul/rev1/stm32/rules.mk1
-rw-r--r--keyboards/tzarc/ghoul/rules.mk2
14 files changed, 29 insertions, 41 deletions
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index 005784b98d..e8b2abc1f6 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -1,21 +1,6 @@
// Copyright 2018-2022 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#include "config_common.h"
-
-// Encoders -- right-side is reversed
-#define ENCODERS_PAD_A \
- { C14 }
-#define ENCODERS_PAD_B \
- { C15 }
-#define ENCODERS_PAD_A_RIGHT \
- { C15 }
-#define ENCODERS_PAD_B_RIGHT \
- { C14 }
-
-#ifndef ENCODER_RESOLUTION
-# define ENCODER_RESOLUTION 2
-#endif // ENCODER_RESOLUTION
// Bootloader
#define STM32_BOOTLOADER_DUAL_BANK TRUE
@@ -50,7 +35,6 @@
#endif // LCD_ACTIVITY_TIMEOUT
// Backlight driver (to control LCD backlight)
-#define BACKLIGHT_LEVELS 4
#define BACKLIGHT_PWM_DRIVER PWMD17
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 959663a6d6..19f5e52060 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -9,7 +9,6 @@
"build": {
"lto": true
},
- "debounce": 5,
"features": {
"audio": true,
"backlight": true,
@@ -31,11 +30,24 @@
"cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"]
},
"backlight": {
- "pin": "A7"
+ "pin": "A7",
+ "levels": 4
},
"split": {
"enabled": true,
- "main": "pin"
+ "main": "pin",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
+ ]
+ }
+ }
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C14", "pin_b": "C15", "resolution": 2}
+ ]
},
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/tzarc/djinn/rev1/config.h b/keyboards/tzarc/djinn/rev1/config.h
index 6f001cbd0c..5ced700323 100644
--- a/keyboards/tzarc/djinn/rev1/config.h
+++ b/keyboards/tzarc/djinn/rev1/config.h
@@ -2,11 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-// Limit the backlight brightness
-#ifndef BACKLIGHT_LIMIT_VAL
-# define BACKLIGHT_LIMIT_VAL 144
-#endif // BACKLIGHT_LIMIT_VAL
-
// Split configuration
#define SPLIT_HAND_PIN B11
#ifdef USE_PLUG_DETECT_PIN
@@ -14,7 +9,6 @@
#endif
#define SERIAL_USART_DRIVER SD3
#define SERIAL_USART_TX_PAL_MODE 7
-#define SOFT_SERIAL_PIN B9
#ifndef SERIAL_USART_SPEED
# define SERIAL_USART_SPEED 640000
#endif // SERIAL_USART_SPEED
diff --git a/keyboards/tzarc/djinn/rev1/info.json b/keyboards/tzarc/djinn/rev1/info.json
index 73ddbe9e41..65b9eb2eab 100644
--- a/keyboards/tzarc/djinn/rev1/info.json
+++ b/keyboards/tzarc/djinn/rev1/info.json
@@ -2,7 +2,11 @@
"usb": {
"device_version": "1.0.0"
},
+ "backlight": {
+ "max_brightness": 144
+ },
"split": {
+ "soft_serial_pin": "B9",
"usb_detect": {
"enabled": true
}
diff --git a/keyboards/tzarc/djinn/rev2/config.h b/keyboards/tzarc/djinn/rev2/config.h
index b0deb6d991..02224e4fc6 100644
--- a/keyboards/tzarc/djinn/rev2/config.h
+++ b/keyboards/tzarc/djinn/rev2/config.h
@@ -2,11 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-// Limit the backlight brightness
-#ifndef BACKLIGHT_LIMIT_VAL
-# define BACKLIGHT_LIMIT_VAL 144
-#endif // BACKLIGHT_LIMIT_VAL
-
// Split configuration
#define SPLIT_HAND_PIN B9
#define USB_VBUS_PIN B12
diff --git a/keyboards/tzarc/djinn/rev2/info.json b/keyboards/tzarc/djinn/rev2/info.json
index e9b151cb93..22cafa74ae 100644
--- a/keyboards/tzarc/djinn/rev2/info.json
+++ b/keyboards/tzarc/djinn/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "2.0.0"
},
+ "backlight": {
+ "max_brightness": 144
+ },
"split": {
"usb_detect": {
"enabled": false
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index 2f343a5a9d..9b81a4bfaf 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -2,8 +2,6 @@ CUSTOM_MATRIX = lite
SERIAL_DRIVER = usart
-BACKLIGHT_DRIVER = pwm
-
WS2812_DRIVER = pwm
CIE1931_CURVE = yes
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index 57068ef6cb..e08b8beee3 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "config_common.h"
// Matrix
#define MATRIX_SHIFT_REGISTER_COUNT 5
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
index c428b26606..1a101d5dc4 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/config.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
@@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "config_common.h"
// Matrix configuration
#define SPI_MATRIX_CHIP_SELECT_PIN GP21
@@ -28,8 +27,8 @@
#define RGB_ENABLE_PIN GP6
// ADC Configuration
-#define ADC_RESOLUTION ? ? ? // ADC_CFGR1_RES_12BIT // TBD when RP2040 has analog support
-#define ADC_SATURATION ? ? ? // ((1 << 12) - 1) // TBD when RP2040 has analog support
+#define ADC_RESOLUTION 12
+#define ADC_SATURATION ((1 << 12) - 1)
#define ADC_CURRENT_PIN GP26
#define ADC_VOLTAGE_PIN GP27
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
index a22be02412..73389ef1b1 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-//#define HAL_USE_ADC TRUE
+#define HAL_USE_ADC TRUE
#define HAL_USE_SPI TRUE
#include_next <halconf.h>
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
index abd4e19f7c..19d7f9be0e 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
@@ -5,8 +5,8 @@
#include_next <mcuconf.h>
// Used for RGB
-//#undef RP_ADC_USE_ADC1
-//#define RP_ADC_USE_ADC1 TRUE
+#undef RP_ADC_USE_ADC1
+#define RP_ADC_USE_ADC1 TRUE
// Used for EEPROM
#undef RP_SPI_USE_SPI0
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
index b9059f1837..53a370437d 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/config.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "config_common.h"
// Matrix configuration
#define SPI_MATRIX_CHIP_SELECT_PIN C4
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
index 69d4b426e1..c1285e300c 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
+++ b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
@@ -1,2 +1 @@
WS2812_DRIVER = pwm
-SRC += analog.c
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index a56726860d..a18cf56fce 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -5,3 +5,5 @@ QUANTUM_PAINTER_DRIVERS = ssd1351_spi
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
+
+SRC += analog.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:49:09 +0000