sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2021-03-25 12:05:42 +00:00
commit aa85b5ee1e
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/choco60/rev2/config.h
View File

@ -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 { C5, C4, B6, B7, C7 }
#define MATRIX_ROW_PINS_RIGHT { D3, D2, D5, D6, B0 } #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 MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 }
#define UNUSED_PINS #define UNUSED_PINS

16
quantum/rgblight.c
View File

@ -884,22 +884,6 @@ typedef void (*effect_func_t)(animation_status_t *anim);
// Animation timer -- use system timer (AVR Timer0) // Animation timer -- use system timer (AVR Timer0)
void rgblight_timer_init(void) { 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_status.timer_enabled = false;
RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE; RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
} }

3
quantum/rgblight.h
View File

@ -170,9 +170,6 @@ enum RGBLIGHT_EFFECT_MODE {
# define RGBLIGHT_LIMIT_VAL 255 # define RGBLIGHT_LIMIT_VAL 255
# endif # endif
# define RGBLED_TIMER_TOP F_CPU / (256 * 64)
// #define RGBLED_TIMER_TOP 0xFF10
# include <stdint.h> # include <stdint.h>
# include <stdbool.h> # include <stdbool.h>
# include "eeconfig.h" # include "eeconfig.h"