summaryrefslogtreecommitdiff
path: root/keyboards/rgbkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rgbkb')
-rw-r--r--keyboards/rgbkb/mun/config.h4
-rw-r--r--keyboards/rgbkb/mun/rev1/info.json6
-rw-r--r--keyboards/rgbkb/pan/config.h2
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/config.h3
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/info.json8
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/config.h3
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/info.json8
-rw-r--r--keyboards/rgbkb/sol/rev1/config.h4
-rw-r--r--keyboards/rgbkb/sol/rev1/info.json5
-rw-r--r--keyboards/rgbkb/sol3/config.h8
-rw-r--r--keyboards/rgbkb/sol3/rev1/info.json18
-rw-r--r--keyboards/rgbkb/zen/rev2/config.h3
-rw-r--r--keyboards/rgbkb/zen/rev2/info.json5
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/config.h3
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/info.json5
15 files changed, 54 insertions, 31 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 5fbfc1cbfd..8f961078bd 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -25,10 +25,6 @@
#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
#define TOUCH_SEGMENTS 3
-/* Encoder Configuration */
-#define ENCODERS_PAD_A { B8, B9 }
-#define ENCODERS_PAD_B { A14, A15 }
-
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 774fa27a94..b68a1586c5 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,6 +8,12 @@
"pid": "0x3505",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B8", "pin_b": "A14"},
+ {"pin_a": "B9", "pin_b": "A15"}
+ ]
+ },
"split": {
"soft_serial_pin": "A9"
},
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 6f5c2c1db6..05d446d05d 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define ENCODER_RESOLUTION 4
#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
index 103cb4e5f8..5e7c4babbd 100644
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ b/keyboards/rgbkb/pan/rev1/32a/config.h
@@ -18,6 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define ENCODERS_PAD_A { B0, D0 }
-#define ENCODERS_PAD_B { B1, B2}
+
#define RGB_DI_PIN B3
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json
index 32a75ca0fc..1f7ece37eb 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/info.json
@@ -1,4 +1,10 @@
{
"processor": "atmega32a",
- "bootloader": "usbasploader"
+ "bootloader": "usbasploader",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B0", "pin_b": "B1"},
+ {"pin_a": "D0", "pin_b": "B2"}
+ ]
+ }
}
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
index 988bf60eca..f25713b2be 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ b/keyboards/rgbkb/pan/rev1/proton_c/config.h
@@ -18,6 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
-#define ENCODERS_PAD_A { B14, B11 }
-#define ENCODERS_PAD_B { B15, B12 }
+
#define RGB_DI_PIN A3
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json
index c06ffbaf06..5fd7124b9c 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json
@@ -1,5 +1,11 @@
{
"processor": "STM32F303",
"bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C"
+ "board": "QMK_PROTON_C",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B14", "pin_b": "B15"},
+ {"pin_a": "B11", "pin_b": "B12"}
+ ]
+ }
}
diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h
index 48f341583d..fcef317e1f 100644
--- a/keyboards/rgbkb/sol/rev1/config.h
+++ b/keyboards/rgbkb/sol/rev1/config.h
@@ -29,7 +29,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define RGB_MATRIX_CENTER { 112, 35 }
-
-// Encoder support
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D6 }
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index 4182ce4c03..eb742972b1 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D6"}
+ ]
+ },
"split": {
"soft_serial_pin": "D3"
},
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index a4c7d1e30e..727947ef0b 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -28,14 +28,6 @@
#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
#define TOUCH_SEGMENTS 3
-/* Encoder Configuration */
-// Matrix Entries k36/k35(E1SW>B13), k33/k32, k7/k28
-#define ENCODERS_PAD_A { A1, B10, A13 }
-#define ENCODERS_PAD_B { A2, B11, B14 }
-// Matrix Entries k72/k71(E5SW>B0), k69/k68, k43/k64
-#define ENCODERS_PAD_A_RIGHT { A1, C15, B3 }
-#define ENCODERS_PAD_B_RIGHT { A2, C14, B13 }
-
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 76eaf07f07..046a56f390 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,8 +8,24 @@
"pid": "0x3510",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A1", "pin_b": "A2"},
+ {"pin_a": "B10", "pin_b": "B11"},
+ {"pin_a": "A13", "pin_b": "B14"}
+ ]
+ },
"split": {
- "soft_serial_pin": "A9"
+ "soft_serial_pin": "A9",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "A1", "pin_b": "A2"},
+ {"pin_a": "C15", "pin_b": "C14"},
+ {"pin_a": "B3", "pin_b": "B13"}
+ ]
+ }
+ }
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 9ea7a3dc8f..85b6a68b79 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B3, B1, B2 }
-#define ENCODERS_PAD_A { D4 }
-#define ENCODERS_PAD_B { D2 }
-
#define RGB_DI_PIN B6
/* COL2ROW or ROW2COL */
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index d308819a42..cc25a74b73 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x3061",
"device_version": "0.0.2"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D4", "pin_b": "D2"}
+ ]
+ },
"split": {
"soft_serial_pin": "D3"
},
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index b92bc6d73f..df9875ed47 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -28,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D7 }
-
/* ws2812 RGB LED */
#define RGB_DI_PIN B7
#ifndef RGBLIGHT_SPLIT_ENABLE
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index e44966dabf..7bf6fe4b0d 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D7"}
+ ]
+ },
"split": {
"soft_serial_pin": "D3"
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 18:49:07 +0000