summaryrefslogtreecommitdiff
path: root/keyboards/nullbitsco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/nullbitsco')
-rw-r--r--keyboards/nullbitsco/nibble/config.h4
-rw-r--r--keyboards/nullbitsco/nibble/info.json5
-rw-r--r--keyboards/nullbitsco/scramble/v1/config.h3
-rw-r--r--keyboards/nullbitsco/scramble/v1/info.json5
-rw-r--r--keyboards/nullbitsco/scramble/v2/config.h3
-rw-r--r--keyboards/nullbitsco/scramble/v2/info.json5
-rw-r--r--keyboards/nullbitsco/tidbit/config.h5
-rw-r--r--keyboards/nullbitsco/tidbit/info.json8
8 files changed, 23 insertions, 15 deletions
diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h
index 2d203594bf..af85027e64 100644
--- a/keyboards/nullbitsco/nibble/config.h
+++ b/keyboards/nullbitsco/nibble/config.h
@@ -52,7 +52,3 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_SLEEP
-
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B4 }
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index b59fee2411..5c69cb0e7e 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -7,6 +7,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B4"}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"debounce": 10,
diff --git a/keyboards/nullbitsco/scramble/v1/config.h b/keyboards/nullbitsco/scramble/v1/config.h
index 6a7742ce87..bb0ee7d785 100644
--- a/keyboards/nullbitsco/scramble/v1/config.h
+++ b/keyboards/nullbitsco/scramble/v1/config.h
@@ -19,7 +19,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { D6 }
-#define ENCODERS_PAD_B { D7 }
#define TAP_CODE_DELAY 10
diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json
index 0acb699373..77a00d91f4 100644
--- a/keyboards/nullbitsco/scramble/v1/info.json
+++ b/keyboards/nullbitsco/scramble/v1/info.json
@@ -1,4 +1,9 @@
{
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D6", "pin_b": "D7"}
+ ]
+ },
"processor": "atmega328p",
"bootloader": "usbasploader",
"matrix_pins": {
diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h
index dd2ae62749..d3b3c44222 100644
--- a/keyboards/nullbitsco/scramble/v2/config.h
+++ b/keyboards/nullbitsco/scramble/v2/config.h
@@ -19,9 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { GP24 }
-#define ENCODERS_PAD_B { GP25 }
#define TAP_CODE_DELAY 10
/* RP2040-specific defines*/
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json
index ba27823b36..5255c32205 100644
--- a/keyboards/nullbitsco/scramble/v2/info.json
+++ b/keyboards/nullbitsco/scramble/v2/info.json
@@ -1,4 +1,9 @@
{
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP24", "pin_b": "GP25"}
+ ]
+ },
"processor": "RP2040",
"bootloader": "rp2040",
"matrix_pins": {
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 37f05b06e2..23b2f5f1a4 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -42,8 +42,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-/* Optional encoder pins */
-// Encoders are defined in order. 1: B2 & B3, 2: B4 & B5, 3: D0 & D1, 4: D2 & D3
-#define ENCODERS_PAD_A { B2, B4, D0, D3 }
-#define ENCODERS_PAD_B { B3, B5, D1, D2 }
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index ec014a6680..cce2a2902c 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -7,6 +7,14 @@
"pid": "0x6064",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B3"},
+ {"pin_a": "B4", "pin_b": "B5"},
+ {"pin_a": "D0", "pin_b": "D1"},
+ {"pin_a": "D3", "pin_b": "D2"}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {