summaryrefslogtreecommitdiff
path: root/keyboards/acheron
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/acheron
parent314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 (diff)
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/acheron')
-rw-r--r--keyboards/acheron/shark/alpha/config.h5
-rw-r--r--keyboards/acheron/shark/alpha/info.json5
-rw-r--r--keyboards/acheron/shark/beta/config.h3
-rw-r--r--keyboards/acheron/shark/beta/info.json5
4 files changed, 10 insertions, 8 deletions
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index dba9b3f41d..9c36ac3a1f 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* encoder pads */
-#define ENCODERS_PAD_A { B6 }
-#define ENCODERS_PAD_B { B7 }
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json
index 5b235cc387..d6b5dfcd0f 100644
--- a/keyboards/acheron/shark/alpha/info.json
+++ b/keyboards/acheron/shark/alpha/info.json
@@ -6,6 +6,11 @@
"pid": "0x5368",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B7"}
+ ]
+ },
"backlight": {
"pin": "B0"
},
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 161b9b1558..8cfc57b9d5 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -49,7 +49,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
#define WS2812_DMA_CHANNEL 6
-#define ENCODERS_PAD_A { C15 }
-#define ENCODERS_PAD_B { C14 }
-
#define EEPROM_I2C_24LC256
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 0dcb286e97..73025df6c4 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@@ -4,6 +4,11 @@
"pid": "0x5369",
"device_version": "0.0.2"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C15", "pin_b": "C14"}
+ ]
+ },
"backlight": {
"pin": "A6",
"levels": 20,