Merge remote-tracking branch 'upstream/develop'

7 files changed, 22 insertions, 32 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