summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-25 12:05:42 +0000
committerQMK Bot <hello@qmk.fm>2021-03-25 12:05:42 +0000
commitaa85b5ee1e75ffdf54667bc25ba1f736e1029396 (patch)
tree2fb59d92244e2abd662d68ef3e3662adb7d9ed62
parentfd24546787b304f63c94c4afd6fb0121b3e5dc43 (diff)
parentb664db3cf32f9e286dbbeb9a44761fcf707caf4d (diff)
downloadqmk_firmware-aa85b5ee1e75ffdf54667bc25ba1f736e1029396.tar.gz
qmk_firmware-aa85b5ee1e75ffdf54667bc25ba1f736e1029396.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/choco60/rev2/config.h3
-rw-r--r--quantum/rgblight.c16
-rw-r--r--quantum/rgblight.h3
3 files changed, 2 insertions, 20 deletions
diff --git a/keyboards/choco60/rev2/config.h b/keyboards/choco60/rev2/config.h
index 3783234971..46aef108d8 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 904c02d6cd..119d3eab21 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 028b3ea416..6fb3ab9380 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"