summaryrefslogtreecommitdiffstats
path: root/keyboards/rmi_kb
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/rmi_kb
parent314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 (diff)
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/rmi_kb')
-rw-r--r--keyboards/rmi_kb/chevron/config.h6
-rw-r--r--keyboards/rmi_kb/chevron/info.json5
-rw-r--r--keyboards/rmi_kb/herringbone/pro/config.h4
-rw-r--r--keyboards/rmi_kb/herringbone/pro/info.json5
-rw-r--r--keyboards/rmi_kb/squishytkl/config.h8
-rw-r--r--keyboards/rmi_kb/squishytkl/info.json5
-rw-r--r--keyboards/rmi_kb/wete/v2/config.h4
-rw-r--r--keyboards/rmi_kb/wete/v2/info.json5
8 files changed, 20 insertions, 22 deletions
diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h
index 0c9e3da4ca..cd4c43391b 100644
--- a/keyboards/rmi_kb/chevron/config.h
+++ b/keyboards/rmi_kb/chevron/config.h
@@ -58,9 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-
-/* Encoder */
-#define ENCODERS_PAD_A { A0 }
-#define ENCODERS_PAD_B { A1 }
-
-//#define ENCODER_DIRECTION_FLIP
diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json
index 654da4ace8..bdca6506f1 100644
--- a/keyboards/rmi_kb/chevron/info.json
+++ b/keyboards/rmi_kb/chevron/info.json
@@ -8,6 +8,11 @@
"pid": "0xC4EE",
"device_version": "0.1.2"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A0", "pin_b": "A1"}
+ ]
+ },
"processor": "atmega32a",
"bootloader": "usbasploader",
"layouts": {
diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h
index e6195dc87c..ddf1d3199d 100644
--- a/keyboards/rmi_kb/herringbone/pro/config.h
+++ b/keyboards/rmi_kb/herringbone/pro/config.h
@@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* Encoder pin assignment */
-#define ENCODERS_PAD_A { C3 }
-#define ENCODERS_PAD_B { C2 }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json
index 6a365b17c1..5eebdf3b79 100644
--- a/keyboards/rmi_kb/herringbone/pro/info.json
+++ b/keyboards/rmi_kb/herringbone/pro/info.json
@@ -8,6 +8,11 @@
"pid": "0x440B",
"device_version": "0.1.2"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C3", "pin_b": "C2"}
+ ]
+ },
"processor": "atmega32a",
"bootloader": "usbasploader",
"layouts": {
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 07ac58f756..20e98b3d53 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -79,11 +79,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-
-/* Rotary encoder */
-#define ENCODERS_PAD_A { B6 }
-#define ENCODERS_PAD_B { B7 }
-
-#define ENCODER_RESOLUTION 1
-
-//#define ENCODER_DIRECTION_FLIP
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index febd39bdf5..17236053ca 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,11 @@
"pid": "0x00B1",
"device_version": "1.0.0"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B7", "resolution": 1}
+ ]
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index 194b0c9511..baf134e5e9 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
-/* Encoder pins */
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D1 }
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index d1aa783336..c477304658 100644
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -8,6 +8,11 @@
"pid": "0x00B3",
"device_version": "35.0.0"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D1"}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {