From a5ecd4eb87db8eb48544de1de5f437046358369d Mon Sep 17 00:00:00 2001 From: Naoto Takai Date: Thu, 25 Mar 2021 21:05:05 +0900 Subject: [PATCH 1/2] Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same (#12203) * Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same * Use NO_PIN instead of duplicate pin --- keyboards/choco60/rev2/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 . */ #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 From b664db3cf32f9e286dbbeb9a44761fcf707caf4d Mon Sep 17 00:00:00 2001 From: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Date: Thu, 25 Mar 2021 21:05:38 +0900 Subject: [PATCH 2/2] Removed unused RGBLED_TIMER_TOP and F_CPU macros from quantum/rgblight.[ch] (#12233) --- quantum/rgblight.c | 16 ---------------- quantum/rgblight.h | 3 --- 2 files changed, 19 deletions(-) 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 # include # include "eeconfig.h"