Merge remote-tracking branch 'origin/master' into develop

3 files changed, 2 insertions, 20 deletions

diff --git a/keyboards/choco60/rev2/config.h b/keyboards/choco60/rev2/config.h
index 378323497..46aef108d 100644
--- a/keyboards/choco60/rev2/config.h
+++ b/keyboards/choco60/rev2/config.h
@@ -29,7 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C5, C4, B6, B7, C7 }
 #define MATRIX_ROW_PINS_RIGHT { D3, D2, D5, D6, B0 }
-#define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0 }
+/* The last three NO_PIN are dummies to make the same size as MATRIX_ROW_PINS_RIGHT. */
+#define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0, NO_PIN, NO_PIN, NO_PIN }
 #define MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 }
 #define UNUSED_PINS
 
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 904c02d6c..119d3eab2 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -884,22 +884,6 @@ typedef void (*effect_func_t)(animation_status_t *anim);
 
 // Animation timer -- use system timer (AVR Timer0)
 void rgblight_timer_init(void) {
-    // OLD!!!! Animation timer -- AVR Timer3
-    // static uint8_t rgblight_timer_is_init = 0;
-    // if (rgblight_timer_is_init) {
-    //   return;
-    // }
-    // rgblight_timer_is_init = 1;
-    // /* Timer 3 setup */
-    // TCCR3B = _BV(WGM32) // CTC mode OCR3A as TOP
-    //       | _BV(CS30); // Clock selelct: clk/1
-    // /* Set TOP value */
-    // uint8_t sreg = SREG;
-    // cli();
-    // OCR3AH = (RGBLED_TIMER_TOP >> 8) & 0xff;
-    // OCR3AL = RGBLED_TIMER_TOP & 0xff;
-    // SREG = sreg;
-
     rgblight_status.timer_enabled = false;
     RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
 }
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index 028b3ea41..6fb3ab938 100644
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -170,9 +170,6 @@ enum RGBLIGHT_EFFECT_MODE {
 #        define RGBLIGHT_LIMIT_VAL 255
 #    endif
 
-#    define RGBLED_TIMER_TOP F_CPU / (256 * 64)
-// #define RGBLED_TIMER_TOP 0xFF10
-
 #    include <stdint.h>
 #    include <stdbool.h>
 #    include "eeconfig.h"