Remove all of the deprecated RGB defines

Fixes #3641
2018-10-22 10:26:19 -07:00 · 2018-10-22 10:26:19 -07:00 · 7e99d869de
commit 7e99d869de
parent 00b6f14821
58 changed files with 62 additions and 180 deletions
--- a/drivers/avr/ws2812.h
+++ b/drivers/avr/ws2812.h
@ -69,7 +69,4 @@ void ws2812_sendarray_mask(uint8_t *array,uint16_t length, uint8_t pinmask);
 #define CONCAT_EXP(a, b)   CONCAT(a, b)
 #endif

-// #define ws2812_PORTREG  CONCAT_EXP(PORT,ws2812_port)
-// #define ws2812_DDRREG   CONCAT_EXP(DDR,ws2812_port)
-
 #endif /* LIGHT_WS2812_H_ */
--- a/keyboards/6ball/config.h
+++ b/keyboards/6ball/config.h
@ -39,11 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
-#define RGBLIGHT_TIMER
+
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 6    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@ -39,10 +39,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 1    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
--- a/keyboards/amj40/keymaps/default/rules.mk
+++ b/keyboards/amj40/keymaps/default/rules.mk
@ -18,9 +18,6 @@ RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-

 ifndef QUANTUM_DIR
 	include ../../../../Makefile
--- a/keyboards/amj40/keymaps/fabian/rules.mk
+++ b/keyboards/amj40/keymaps/fabian/rules.mk
@ -17,11 +17,3 @@ RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight.

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk
+++ b/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk
@ -17,11 +17,3 @@ RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.

 # Do not enable SLEEP_LED_ENABLE. It uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/amj40/keymaps/myee/rules.mk
+++ b/keyboards/amj40/keymaps/myee/rules.mk
@ -17,11 +17,3 @@ RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight.

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/bfo9000/config.h
+++ b/keyboards/bfo9000/config.h
@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN B4
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 20    // Number of LEDs

 /*
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@ -51,11 +51,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN B1
-#define RGBLIGHT_TIMER
-#define RGBLED_NUM 4
-#define ws2812_PORTREG  PORTB
-#define ws2812_DDRREG   DDRB

+#define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17

--- a/keyboards/chocopad/config.h
+++ b/keyboards/chocopad/config.h
@ -47,9 +47,7 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 4
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 #endif
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@ -57,10 +57,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/config.h
@ -61,10 +61,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/dilly/config.h
+++ b/keyboards/dilly/config.h
@ -50,9 +50,7 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 10
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 #endif
--- a/keyboards/ergo42/rev1/config.h
+++ b/keyboards/ergo42/rev1/config.h
@ -66,10 +66,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/ergodash/mini/config.h
+++ b/keyboards/ergodash/mini/config.h
@ -73,10 +73,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 20    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/ergodash/rev1/config.h
+++ b/keyboards/ergodash/rev1/config.h
@ -63,10 +63,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 24    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/ergodash/rev2/config.h
+++ b/keyboards/ergodash/rev2/config.h
@ -70,10 +70,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 24    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/config.h
@ -61,10 +61,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
@ -83,4 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@ -66,7 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #ifdef RGBLIGHT_ENABLE
  #define RGB_DI_PIN B5
-  #define RGBLIGHT_TIMER
+  
  #define RGBLED_NUM 18    // Number of LEDs */
 #endif
 /*
--- a/keyboards/fourier/rev1/config.h
+++ b/keyboards/fourier/rev1/config.h
@ -56,11 +56,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 14    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/gh60/keymaps/dbroqua/config.h
+++ b/keyboards/gh60/keymaps/dbroqua/config.h
@ -160,8 +160,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 * These settings are for the F4 by default:
 *
 *
- * #define ws2812_PORTREG  PORTF
- * #define ws2812_DDRREG   DDRF
 * #define ws2812_pin PF4
 * #define RGBLED_NUM 14     // Number of LEDs
 * #define RGBLIGHT_HUE_STEP 10
@ -173,11 +171,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 * For details, please check this keymap. keyboard/planck/keymaps/yang/keymap.c
 */

-/* Deprecated code below
-#define ws2812_PORTREG  PORTF 
-#define ws2812_DDRREG   DDRF
-#define ws2812_pin PF4
-*/ 
 #define RGB_DI_PIN F4
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 11         // Number of LEDs
--- a/keyboards/gh60/keymaps/robotmaxtron/config.h
+++ b/keyboards/gh60/keymaps/robotmaxtron/config.h
@ -163,8 +163,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 * These settings are for the F4 by default:
 *
 *
- * #define ws2812_PORTREG  PORTF
- * #define ws2812_DDRREG   DDRF
 * #define ws2812_pin PF4
 * #define RGBLED_NUM 14     // Number of LEDs
 * #define RGBLIGHT_HUE_STEP 10
@ -176,11 +174,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 * For details, please check this keymap. keyboard/planck/keymaps/yang/keymap.c
 */

-/* Deprecated code below
-#define ws2812_PORTREG  PORTF 
-#define ws2812_DDRREG   DDRF
-#define ws2812_pin PF4
-*/ 
 #define RGB_DI_PIN F4
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 8         // Number of LEDs
--- a/keyboards/handwired/dactyl_manuform/config.h
+++ b/keyboards/handwired/dactyl_manuform/config.h
@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs


@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-
--- a/keyboards/handwired/qc60/proto/config.h
+++ b/keyboards/handwired/qc60/proto/config.h
@ -10,5 +10,3 @@
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 1    // Number of LEDs
-// #define ws2812_PORTREG  PORTD
-// #define ws2812_DDRREG   DDRD
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@ -83,10 +83,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 //#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 // Helix keyboard RGB LED support
 //#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
--- a/keyboards/helix/rev1/config.h
+++ b/keyboards/helix/rev1/config.h
@ -74,11 +74,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
-#define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

+#define RGBLED_NUM 12    // Number of LEDs
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@ -87,10 +87,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 //#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 // Helix keyboard RGB LED support
 //#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
--- a/keyboards/iris/rev1/config.h
+++ b/keyboards/iris/rev1/config.h
@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /*
--- a/keyboards/iris/rev1_led/config.h
+++ b/keyboards/iris/rev1_led/config.h
@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /*
--- a/keyboards/iris/rev2/config.h
+++ b/keyboards/iris/rev2/config.h
@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /*
--- a/keyboards/iris/rev3/config.h
+++ b/keyboards/iris/rev3/config.h
@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /*
--- a/keyboards/lets_split/keymaps/zer09/config.h
+++ b/keyboards/lets_split/keymaps/zer09/config.h
@ -52,8 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #undef RGBLED_NUM
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 50
-#define ws2812_PORTREG PORTD
-#define ws2812_DDRREG DDRD
 #endif
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@ -60,10 +60,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 16    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@ -60,10 +60,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/lets_split/sockets/config.h
+++ b/keyboards/lets_split/sockets/config.h
@ -60,10 +60,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D4
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /* Audio settings */
 #ifdef AUDIO_ENABLE
--- a/keyboards/levinson/rev1/config.h
+++ b/keyboards/levinson/rev1/config.h
@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /* Backlight LEDs */
--- a/keyboards/levinson/rev2/config.h
+++ b/keyboards/levinson/rev2/config.h
@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /* Backlight LEDs */
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@ -62,10 +62,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 14    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/meira/config.h
+++ b/keyboards/meira/config.h
@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 15    // Number of LEDs
 #endif

--- a/keyboards/minidox/keymaps/alairock/config.h
+++ b/keyboards/minidox/keymaps/alairock/config.h
@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 8   // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 10
--- a/keyboards/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/minidox/keymaps/that_canadian/config.h
@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 8   // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 10
--- a/keyboards/minidox/keymaps/xyverz/config.h
+++ b/keyboards/minidox/keymaps/xyverz/config.h
@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 8   // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 10
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@ -152,10 +152,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 8
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@ -159,9 +159,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION

-#define RGBLIGHT_TIMER 
+
 #define RGB_DI_PIN D0     // The pin your RGB strip is wired to
-#define RGBLIGHT_TIMER    // Require for fancier stuff (not compatible with audio)
 #define RGBLED_NUM 7     // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 10
--- a/keyboards/nyquist/rev1/config.h
+++ b/keyboards/nyquist/rev1/config.h
@ -61,10 +61,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 16    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/nyquist/rev2/config.h
+++ b/keyboards/nyquist/rev2/config.h
@ -58,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 16    // Number of LEDs

 /* Backlight LEDs */
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@ -70,10 +70,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 //#define RGB_DI_PIN D3
-//#define RGBLIGHT_TIMER
 //#define RGBLED_NUM 16    // Number of LEDs
-//#define ws2812_PORTREG  PORTD
-//#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@ -75,10 +75,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 //#define RGB_DI_PIN D3
-//#define RGBLIGHT_TIMER
+
 //#define RGBLED_NUM 16    // Number of LEDs
-//#define ws2812_PORTREG  PORTD
-//#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/orthodox/rev3_teensy/config.h
+++ b/keyboards/orthodox/rev3_teensy/config.h
@ -67,10 +67,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 //#define RGB_DI_PIN D3
-//#define RGBLIGHT_TIMER
+
 //#define RGBLED_NUM 16    // Number of LEDs
-//#define ws2812_PORTREG  PORTD
-//#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/preonic/keymaps/zach/config.h
+++ b/keyboards/preonic/keymaps/zach/config.h
@ -65,7 +65,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 //#define RGB_DI_PIN D1
-//#define RGBLIGHT_TIMER
+
 //#define RGBLED_NUM 28     // Number of LEDs
 //#define RGBLIGHT_HUE_STEP 10
 //#define RGBLIGHT_SAT_STEP 17
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@ -64,10 +64,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D6
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/qwertyydox/rev1/config.h
+++ b/keyboards/qwertyydox/rev1/config.h
@ -64,10 +64,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D6
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD


 /*
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@ -62,10 +62,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 14    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/the_ruler/config.h
+++ b/keyboards/the_ruler/config.h
@ -155,9 +155,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION

-#define RGBLIGHT_TIMER 
+
 #define RGB_DI_PIN E6     // The pin your RGB strip is wired to
-#define RGBLIGHT_TIMER    // Require for fancier stuff (not compatible with audio)
 #define RGBLED_NUM 1      // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 10
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@ -59,10 +59,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN F0
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 16    // Number of LEDs
-#define ws2812_PORTREG  PORTF
-#define ws2812_DDRREG   DDRF
 #define RGBLIGHT_ANIMATIONS

 /* Audio settings */
--- a/keyboards/viterbi/rev1/config.h
+++ b/keyboards/viterbi/rev1/config.h
@ -61,10 +61,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 16    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options
--- a/keyboards/wavelet/config.h
+++ b/keyboards/wavelet/config.h
@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 12    // Number of LEDs

 /* Backlight LEDs */
--- a/keyboards/zen/rev1/config.h
+++ b/keyboards/zen/rev1/config.h
@ -65,10 +65,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D1
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 16    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD

 /*
 * Feature disable options