summaryrefslogtreecommitdiffstats
path: root/keyboards/mechlovin/adelais
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-26 09:45:12 +1100
committerGitHub <noreply@github.com>2023-02-26 09:45:12 +1100
commit7e0299117b389b1c7fcdfa2f20891ba2287ea771 (patch)
tree00bb5bb7b3b73a9de365d1839ba7d41240d439f1 /keyboards/mechlovin/adelais
parent314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 (diff)
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/mechlovin/adelais')
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/info.json5
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/config.h5
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/info.json5
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json7
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json7
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json7
10 files changed, 31 insertions, 21 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 9611ed6744..d9d75a4b9e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -91,8 +91,4 @@
#define RGB_MATRIX_DISABLE_KEYCODES
-#define ENCODERS_PAD_A { A4 }
-#define ENCODERS_PAD_B { A3 }
-#define ENCODER_RESOLUTION 4
-
#define TAP_CODE_DELAY 10
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index b83a4828e3..7dcd0f1765 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -3,6 +3,11 @@
"usb": {
"pid": "0xAEC2"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A4", "pin_b": "A3"}
+ ]
+ },
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index faf032647f..7457fd50a7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -113,9 +113,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
-#ifdef ENCODER_ENABLE
-#define ENCODERS_PAD_A { B12 }
-#define ENCODERS_PAD_B { B13 }
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
-#endif
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 89bf9abe9b..3f83750e3a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -3,6 +3,11 @@
"usb": {
"pid": "0xAEC3"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B12", "pin_b": "B13"}
+ ]
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"indicators": {
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h
index 69af2941a6..254d204038 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h
@@ -1,7 +1,3 @@
#pragma once
-#define ENCODERS_PAD_A { A6, A4, B7 }
-#define ENCODERS_PAD_B { A5, A3, B6 }
-#define ENCODER_RESOLUTION 4
-
#define TAP_CODE_DELAY 10 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
index a8d21313a2..60d20c4a29 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
@@ -2,6 +2,13 @@
"usb": {
"pid": "0xAD02"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A6", "pin_b": "A5"},
+ {"pin_a": "A4", "pin_b": "A3"},
+ {"pin_a": "B7", "pin_b": "B6"}
+ ]
+ },
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu"
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h
index 70fa00220b..7905be1891 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h
@@ -16,8 +16,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define ENCODERS_PAD_A { A6, A4, B7 }
-#define ENCODERS_PAD_B { A5, A3, B6 }
-#define ENCODER_RESOLUTION 4
-
#define TAP_CODE_DELAY 10 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index f4c096143b..925b7cd213 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -1,5 +1,12 @@
{
"usb": {
"pid": "0xAD03"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A6", "pin_b": "A5"},
+ {"pin_a": "A4", "pin_b": "A3"},
+ {"pin_a": "B7", "pin_b": "B6"}
+ ]
}
}
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index aac4aae40d..831642126b 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -45,8 +45,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define ENCODERS_PAD_A { D3, D5, C7 }
-#define ENCODERS_PAD_B { D2, B6, C6 }
-#define ENCODER_RESOLUTION 4
-
#define TAP_CODE_DELAY 10
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index 73ea66a997..e385d5ef1a 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -3,6 +3,13 @@
"usb": {
"pid": "0xAD04"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D3", "pin_b": "D2"},
+ {"pin_a": "D5", "pin_b": "B6"},
+ {"pin_a": "C7", "pin_b": "C6"}
+ ]
+ },
"backlight": {
"pin": "B5",
"breathing": true