summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-20 08:12:19 +1100
committerGitHub <noreply@github.com>2023-03-20 08:12:19 +1100
commit65a80f411f03be466d0b74c5b1d44f161e19ac7e (patch)
tree8d50fe66e700167fa758eb2763a7be6eb10a2c7f
parent3c144fac5e2b634166f6b9cc0fc45029d63d3398 (diff)
Clean up APA102 config and add DD mapping (#20159)
-rw-r--r--data/mappings/info_config.hjson3
-rw-r--r--data/schemas/keyboard.jsonschema13
-rw-r--r--docs/feature_rgb_matrix.md4
-rw-r--r--docs/feature_rgblight.md5
-rw-r--r--drivers/led/apa102.c26
-rw-r--r--keyboards/handwired/onekey/blackpill_f401/config.h2
-rw-r--r--keyboards/handwired/onekey/blackpill_f401/info.json4
-rwxr-xr-xkeyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h2
-rw-r--r--keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json4
-rw-r--r--keyboards/handwired/onekey/blackpill_f411/config.h2
-rw-r--r--keyboards/handwired/onekey/blackpill_f411/info.json4
-rwxr-xr-xkeyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h2
-rw-r--r--keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json4
-rw-r--r--keyboards/handwired/onekey/bluepill/config.h2
-rw-r--r--keyboards/handwired/onekey/bluepill/info.json4
-rw-r--r--keyboards/handwired/onekey/bluepill_f103c6/config.h2
-rw-r--r--keyboards/handwired/onekey/bluepill_f103c6/info.json4
-rw-r--r--keyboards/handwired/onekey/bluepill_uf2boot/config.h2
-rw-r--r--keyboards/handwired/onekey/bluepill_uf2boot/info.json4
-rw-r--r--keyboards/handwired/onekey/elite_c/config.h3
-rw-r--r--keyboards/handwired/onekey/elite_c/info.json4
-rw-r--r--keyboards/handwired/onekey/evb_wb32f3g71/config.h1
-rw-r--r--keyboards/handwired/onekey/evb_wb32f3g71/info.json4
-rw-r--r--keyboards/handwired/onekey/evb_wb32fq95/config.h1
-rw-r--r--keyboards/handwired/onekey/evb_wb32fq95/info.json4
-rw-r--r--keyboards/handwired/onekey/nucleo_f446re/config.h2
-rw-r--r--keyboards/handwired/onekey/nucleo_f446re/info.json4
-rw-r--r--keyboards/handwired/onekey/nucleo_l432kc/config.h2
-rw-r--r--keyboards/handwired/onekey/nucleo_l432kc/info.json4
-rw-r--r--keyboards/handwired/onekey/promicro/config.h3
-rw-r--r--keyboards/handwired/onekey/promicro/info.json4
-rw-r--r--keyboards/handwired/onekey/proton_c/config.h2
-rw-r--r--keyboards/handwired/onekey/proton_c/info.json4
-rw-r--r--keyboards/handwired/onekey/sipeed_longan_nano/config.h2
-rw-r--r--keyboards/handwired/onekey/sipeed_longan_nano/info.json4
-rw-r--r--keyboards/handwired/onekey/stm32f0_disco/config.h2
-rw-r--r--keyboards/handwired/onekey/stm32f0_disco/info.json4
-rw-r--r--keyboards/handwired/onekey/teensy_2/config.h2
-rw-r--r--keyboards/handwired/onekey/teensy_2/info.json4
-rw-r--r--keyboards/handwired/onekey/teensy_2pp/config.h2
-rw-r--r--keyboards/handwired/onekey/teensy_2pp/info.json4
41 files changed, 106 insertions, 53 deletions
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index 46108e6fe6..239813473c 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -10,6 +10,9 @@
// deprecated: Default `false`. Set to `true` to turn on warning when a value exists
// invalid: Default `false`. Set to `true` to generate errors when a value exists
// replace_with: use with a key marked deprecated or invalid to designate a replacement
+ "APA102_DI_PIN": {"info_key": "apa102.data_pin"},
+ "APA102_CI_PIN": {"info_key": "apa102.clock_pin"},
+ "APA102_DEFAULT_BRIGHTNESS": {"info_key": "apa102.default_brightness", "value_type": "int"},
"AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
"BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
"BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 2845af14f3..4d180712dc 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -96,6 +96,19 @@
"unknown"
]
},
+ "apa102": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+ "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+ "default_brightness": {
+ "type": "integer",
+ "minimum": 0,
+ "maximum": 31
+ }
+ }
+ },
"audio": {
"type": "object",
"additionalProperties": false,
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 20ad4c7faf..8b831f010b 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -383,9 +383,9 @@ Configure the hardware via your `config.h`:
```c
// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN D7
+#define APA102_DI_PIN D7
// The pin connected to the clock pin of the LEDs
-#define RGB_CI_PIN D6
+#define APA102_CI_PIN D6
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 70
```
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 060efaf1b3..7a1866d44f 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -35,8 +35,9 @@ At minimum you must define the data pin your LED strip is connected to, and the
|Define |Description |
|---------------|---------------------------------------------------------------------------------------------------------|
-|`RGB_DI_PIN` |The pin connected to the data pin of the LEDs |
-|`RGB_CI_PIN` |The pin connected to the clock pin of the LEDs (APA102 only) |
+|`RGB_DI_PIN` |The pin connected to the data pin of the LEDs (WS2812) |
+|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102) |
+|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102) |
|`RGBLED_NUM` |The number of LEDs connected |
|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half directly wired to `RGB_DI_PIN` |
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index f291948975..40fc68e4f1 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -27,7 +27,7 @@
# if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(GD32VF103)
# define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) // This calculates how many loops of 4 nops to run to delay 100 ns
# else
-# error("APA102_NOPS configuration required")
+# error APA102_NOPS configuration required
# define APA102_NOPS 0 // this just pleases the compile so the above error is easier to spot
# endif
# endif
@@ -43,14 +43,14 @@
} \
} while (0)
-#define APA102_SEND_BIT(byte, bit) \
- do { \
- writePin(RGB_DI_PIN, (byte >> bit) & 1); \
- io_wait; \
- writePinHigh(RGB_CI_PIN); \
- io_wait; \
- writePinLow(RGB_CI_PIN); \
- io_wait; \
+#define APA102_SEND_BIT(byte, bit) \
+ do { \
+ writePin(APA102_DI_PIN, (byte >> bit) & 1); \
+ io_wait; \
+ writePinHigh(APA102_CI_PIN); \
+ io_wait; \
+ writePinLow(APA102_CI_PIN); \
+ io_wait; \
} while (0)
uint8_t apa102_led_brightness = APA102_DEFAULT_BRIGHTNESS;
@@ -77,11 +77,11 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
}
void static apa102_init(void) {
- setPinOutput(RGB_DI_PIN);
- setPinOutput(RGB_CI_PIN);
+ setPinOutput(APA102_DI_PIN);
+ setPinOutput(APA102_CI_PIN);
- writePinLow(RGB_DI_PIN);
- writePinLow(RGB_CI_PIN);
+ writePinLow(APA102_DI_PIN);
+ writePinLow(APA102_CI_PIN);
}
void apa102_set_brightness(uint8_t brightness) {
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 8000ee77d7..6183ee9819 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -23,8 +23,6 @@
#define ADC_PIN A0
-#define RGB_CI_PIN A2
-
#define SOLENOID_PIN B12
#define SOLENOID_PINS { B12, B13, B14, B15 }
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json
index b79b17b000..6d75c549ce 100644
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/info.json
@@ -10,5 +10,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
index 8000ee77d7..6183ee9819 100755
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
@@ -23,8 +23,6 @@
#define ADC_PIN A0
-#define RGB_CI_PIN A2
-
#define SOLENOID_PIN B12
#define SOLENOID_PINS { B12, B13, B14, B15 }
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
index 6787be36af..8d558c4254 100644
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index 8000ee77d7..6183ee9819 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -23,8 +23,6 @@
#define ADC_PIN A0
-#define RGB_CI_PIN A2
-
#define SOLENOID_PIN B12
#define SOLENOID_PINS { B12, B13, B14, B15 }
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json
index 19c6cbfed9..8ff55f5587 100644
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/info.json
@@ -10,5 +10,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index 8000ee77d7..6183ee9819 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -23,8 +23,6 @@
#define ADC_PIN A0
-#define RGB_CI_PIN A2
-
#define SOLENOID_PIN B12
#define SOLENOID_PINS { B12, B13, B14, B15 }
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
index 25d33a7dde..4bdbc5241a 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h
index 7c3512b57b..02cd63ac3f 100644
--- a/keyboards/handwired/onekey/bluepill/config.h
+++ b/keyboards/handwired/onekey/bluepill/config.h
@@ -21,5 +21,3 @@
#define BACKLIGHT_PWM_CHANNEL 1
#define ADC_PIN A0
-
-#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json
index 7bef2db170..21de1b7696 100644
--- a/keyboards/handwired/onekey/bluepill/info.json
+++ b/keyboards/handwired/onekey/bluepill/info.json
@@ -10,5 +10,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h
index 12f4596e7b..5edcf5a2e1 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/config.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h
@@ -22,8 +22,6 @@
#define ADC_PIN A0
-#define RGB_CI_PIN A2
-
// This code does not fit into the really small flash of STM32F103x6 together
// with CONSOLE_ENABLE=yes, and the debugging console is probably more
// important for the "onekey" testing firmware. In a real firmware you may be
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
index 353f074d92..9a21daf322 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/config.h b/keyboards/handwired/onekey/bluepill_uf2boot/config.h
index 7c3512b57b..02cd63ac3f 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/config.h
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/config.h
@@ -21,5 +21,3 @@
#define BACKLIGHT_PWM_CHANNEL 1
#define ADC_PIN A0
-
-#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
index 1f823ea0d7..3e874e8532 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A1"
+ },
+ "apa102": {
+ "data_pin": "A1",
+ "clock_pin": "A2"
}
}
diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h
index 1eb62b4498..1bd5fb6c14 100644
--- a/keyboards/handwired/onekey/elite_c/config.h
+++ b/keyboards/handwired/onekey/elite_c/config.h
@@ -16,9 +16,6 @@
#pragma once
-
-#define RGB_CI_PIN B1
-
#define ADC_PIN F6
#define QMK_WAITING_TEST_BUSY_PIN F6
diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json
index 1548561041..4726c87053 100644
--- a/keyboards/handwired/onekey/elite_c/info.json
+++ b/keyboards/handwired/onekey/elite_c/info.json
@@ -10,5 +10,9 @@
},
"rgblight": {
"pin": "F6"
+ },
+ "apa102": {
+ "data_pin": "F6",
+ "clock_pin": "B1"
}
}
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
index 11cacfea72..4a65e9a72f 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
@@ -11,7 +11,6 @@
#define BACKLIGHT_PAL_MODE 2
#define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
-#define RGB_CI_PIN B8
#define SOLENOID_PIN B12
#define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
index 304517d266..0bc9001321 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A0"
+ },
+ "apa102": {
+ "data_pin": "A0",
+ "clock_pin": "B8"
}
}
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
index 11cacfea72..4a65e9a72f 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/config.h
+++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h
@@ -11,7 +11,6 @@
#define BACKLIGHT_PAL_MODE 2
#define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
-#define RGB_CI_PIN B8
#define SOLENOID_PIN B12
#define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json
index bbf5139668..7fcc3d4ebd 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A0"
+ },
+ "apa102": {
+ "data_pin": "A0",
+ "clock_pin": "B8"
}
}
diff --git a/keyboards/handwired/onekey/nucleo_f446re/config.h b/keyboards/handwired/onekey/nucleo_f446re/config.h
index 52fe25dc8c..c6c04ed615 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/config.h
+++ b/keyboards/handwired/onekey/nucleo_f446re/config.h
@@ -7,8 +7,6 @@
#define BACKLIGHT_PWM_CHANNEL 3
#define BACKLIGHT_PAL_MODE 2
-#define RGB_CI_PIN B13
-
#define ADC_PIN A0
#define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json
index 6b9206f987..2438c6e482 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/info.json
+++ b/keyboards/handwired/onekey/nucleo_f446re/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A0"
+ },
+ "apa102": {
+ "data_pin": "A0",
+ "clock_pin": "B13"
}
}
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h
index fcf2c71b47..d344a11094 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/config.h
+++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h
@@ -7,6 +7,4 @@
#define BACKLIGHT_PWM_CHANNEL 3
#define BACKLIGHT_PAL_MODE 2
-#define RGB_CI_PIN B13
-
#define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json
index a6e6511040..43a4b27992 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/info.json
+++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "A0"
+ },
+ "apa102": {
+ "data_pin": "A0",
+ "clock_pin": "B13"
}
}
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h
index 1eb62b4498..1bd5fb6c14 100644
--- a/keyboards/handwired/onekey/promicro/config.h
+++ b/keyboards/handwired/onekey/promicro/config.h
@@ -16,9 +16,6 @@
#pragma once
-
-#define RGB_CI_PIN B1
-
#define ADC_PIN F6
#define QMK_WAITING_TEST_BUSY_PIN F6
diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json
index efefd8d45c..84d2fba131 100644
--- a/keyboards/handwired/onekey/promicro/info.json
+++ b/keyboards/handwired/onekey/promicro/info.json
@@ -10,5 +10,9 @@
},
"rgblight": {
"pin": "F6"
+ },
+ "apa102": {
+ "data_pin": "F6",
+ "clock_pin": "B1"
}
}
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h
index 1f1c528400..49376e474e 100644
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -21,6 +21,4 @@
#define BACKLIGHT_PWM_CHANNEL 3
#define BACKLIGHT_PAL_MODE 2
-#define RGB_CI_PIN B13
-
#define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json
index 5292d02567..833f7cbf2a 100644
--- a/keyboards/handwired/onekey/proton_c/info.json
+++ b/keyboards/handwired/onekey/proton_c/info.json
@@ -10,5 +10,9 @@
},
"rgblight": {
"pin": "A0"
+ },
+ "apa102": {
+ "data_pin": "A0",
+ "clock_pin": "B13"
}
}
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/config.h b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
index 71ac29e882..1e39cf3f1d 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/config.h
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
@@ -20,8 +20,6 @@
#define BACKLIGHT_PWM_DRIVER PWMD5 /* GD32 numbering scheme starts from 0, TIMER4 on GD32 boards is TIMER5 on STM32 boards. */
#define BACKLIGHT_PWM_CHANNEL 2 /* GD32 numbering scheme starts from 0, Channel 1 on GD32 boards is Channel 2 on STM32 boards. */
-#define RGB_CI_PIN B13
-
#define ADC_PIN A0
#define I2C1_CLOCK_SPEED 1000000 /* GD32VF103 supports fast mode plus. */
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
index d14928139b..b37219bbc3 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
@@ -12,5 +12,9 @@
},
"rgblight": {
"pin": "A2"
+ },
+ "apa102": {
+ "data_pin": "A2",
+ "clock_pin": "B13"
}
}
diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h
index b4665911d4..806eb69df4 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/config.h
@@ -22,5 +22,3 @@
#define BACKLIGHT_PAL_MODE 0
#define ADC_PIN A0
-
-#define RGB_CI_PIN B13
diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json
index c76bd73173..993003373a 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f0_disco/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "B15"
+ },
+ "apa102": {
+ "data_pin": "B15",
+ "clock_pin": "B13"
}
}
diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h
index e70df80fc8..432ae9b85c 100644
--- a/keyboards/handwired/onekey/teensy_2/config.h
+++ b/keyboards/handwired/onekey/teensy_2/config.h
@@ -19,7 +19,5 @@
#define ADC_PIN F6
-#define RGB_CI_PIN F7
-
#define QMK_WAITING_TEST_BUSY_PIN F6
#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json
index 2425168462..e62fc69ce7 100644
--- a/keyboards/handwired/onekey/teensy_2/info.json
+++ b/keyboards/handwired/onekey/teensy_2/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "F6"
+ },
+ "apa102": {
+ "data_pin": "F6",
+ "clock_pin": "F7"
}
}
diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h
index e70df80fc8..432ae9b85c 100644
--- a/keyboards/handwired/onekey/teensy_2pp/config.h
+++ b/keyboards/handwired/onekey/teensy_2pp/config.h
@@ -19,7 +19,5 @@
#define ADC_PIN F6
-#define RGB_CI_PIN F7
-
#define QMK_WAITING_TEST_BUSY_PIN F6
#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json
index ba7281ce1b..6e134d4506 100644
--- a/keyboards/handwired/onekey/teensy_2pp/info.json
+++ b/keyboards/handwired/onekey/teensy_2pp/info.json
@@ -11,5 +11,9 @@
},
"rgblight": {
"pin": "F6"
+ },
+ "apa102": {
+ "data_pin": "F6",
+ "clock_pin": "F7"
}
}