2017-03-29 00:20:36 +02:00
|
|
|
/* Copyright 2016-2017 Yang Liu
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
2017-10-18 01:47:49 +02:00
|
|
|
#include <math.h>
|
2018-09-13 19:24:10 +02:00
|
|
|
#include <string.h>
|
2020-05-09 10:56:16 +02:00
|
|
|
#include <stdlib.h>
|
2018-07-16 17:48:31 +02:00
|
|
|
#ifdef __AVR__
|
2019-08-30 20:19:03 +02:00
|
|
|
# include <avr/eeprom.h>
|
|
|
|
# include <avr/interrupt.h>
|
2018-07-16 17:48:31 +02:00
|
|
|
#endif
|
2019-11-05 22:04:50 +01:00
|
|
|
#ifdef EEPROM_ENABLE
|
|
|
|
# include "eeprom.h"
|
|
|
|
#endif
|
2019-01-29 01:40:02 +01:00
|
|
|
#ifdef STM32_EEPROM_ENABLE
|
2020-12-11 03:45:24 +01:00
|
|
|
# include <hal.h>
|
2019-08-30 20:19:03 +02:00
|
|
|
# include "eeprom_stm32.h"
|
2019-01-29 01:40:02 +01:00
|
|
|
#endif
|
2018-07-16 17:48:31 +02:00
|
|
|
#include "wait.h"
|
2016-01-24 22:14:50 +01:00
|
|
|
#include "progmem.h"
|
2020-12-01 19:04:42 +01:00
|
|
|
#include "sync_timer.h"
|
2016-01-24 22:14:50 +01:00
|
|
|
#include "rgblight.h"
|
2019-05-01 17:02:02 +02:00
|
|
|
#include "color.h"
|
2016-01-24 22:14:50 +01:00
|
|
|
#include "debug.h"
|
2017-04-01 16:43:38 +02:00
|
|
|
#include "led_tables.h"
|
2020-12-11 03:45:24 +01:00
|
|
|
#include <lib/lib8tion/lib8tion.h>
|
2019-02-21 16:22:46 +01:00
|
|
|
#ifdef VELOCIKEY_ENABLE
|
2019-08-30 20:19:03 +02:00
|
|
|
# include "velocikey.h"
|
2019-02-21 16:22:46 +01:00
|
|
|
#endif
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2020-03-10 20:50:01 +01:00
|
|
|
#ifndef MIN
|
|
|
|
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
|
|
|
|
#endif
|
2021-01-11 08:04:42 +01:00
|
|
|
#ifndef MAX
|
|
|
|
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
|
|
|
|
#endif
|
2020-03-10 20:50:01 +01:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
#ifdef RGBLIGHT_SPLIT
|
2019-08-30 20:19:03 +02:00
|
|
|
/* for split keyboard */
|
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_MODE rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_MODE
|
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_HSVS rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_HSVS
|
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS rgblight_status.change_flags |= (RGBLIGHT_STATUS_CHANGE_MODE | RGBLIGHT_STATUS_CHANGE_HSVS)
|
2020-03-10 20:50:01 +01:00
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_LAYERS rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_LAYERS
|
2019-08-30 20:19:03 +02:00
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_TIMER
|
|
|
|
# define RGBLIGHT_SPLIT_ANIMATION_TICK rgblight_status.change_flags |= RGBLIGHT_STATUS_ANIMATION_TICK
|
2019-04-20 00:05:51 +02:00
|
|
|
#else
|
2019-08-30 20:19:03 +02:00
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_MODE
|
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_HSVS
|
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS
|
2020-03-10 20:50:01 +01:00
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_LAYERS
|
2019-08-30 20:19:03 +02:00
|
|
|
# define RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE
|
|
|
|
# define RGBLIGHT_SPLIT_ANIMATION_TICK
|
2019-04-20 00:05:51 +02:00
|
|
|
#endif
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
#define _RGBM_SINGLE_STATIC(sym) RGBLIGHT_MODE_##sym,
|
2018-09-13 19:24:10 +02:00
|
|
|
#define _RGBM_SINGLE_DYNAMIC(sym)
|
2019-08-30 20:19:03 +02:00
|
|
|
#define _RGBM_MULTI_STATIC(sym) RGBLIGHT_MODE_##sym,
|
2018-09-13 19:24:10 +02:00
|
|
|
#define _RGBM_MULTI_DYNAMIC(sym)
|
2019-08-30 20:19:03 +02:00
|
|
|
#define _RGBM_TMP_STATIC(sym, msym) RGBLIGHT_MODE_##sym,
|
2019-04-20 00:05:51 +02:00
|
|
|
#define _RGBM_TMP_DYNAMIC(sym, msym)
|
2019-08-30 20:19:03 +02:00
|
|
|
static uint8_t static_effect_table[] = {
|
2019-04-20 00:05:51 +02:00
|
|
|
#include "rgblight_modes.h"
|
|
|
|
};
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
#define _RGBM_SINGLE_STATIC(sym) RGBLIGHT_MODE_##sym,
|
|
|
|
#define _RGBM_SINGLE_DYNAMIC(sym) RGBLIGHT_MODE_##sym,
|
|
|
|
#define _RGBM_MULTI_STATIC(sym) RGBLIGHT_MODE_##sym,
|
|
|
|
#define _RGBM_MULTI_DYNAMIC(sym) RGBLIGHT_MODE_##sym,
|
|
|
|
#define _RGBM_TMP_STATIC(sym, msym) RGBLIGHT_MODE_##msym,
|
|
|
|
#define _RGBM_TMP_DYNAMIC(sym, msym) RGBLIGHT_MODE_##msym,
|
|
|
|
static uint8_t mode_base_table[] = {
|
|
|
|
0, // RGBLIGHT_MODE_zero
|
2019-04-20 00:05:51 +02:00
|
|
|
#include "rgblight_modes.h"
|
2018-09-13 19:24:10 +02:00
|
|
|
};
|
|
|
|
|
2021-02-16 16:51:28 +01:00
|
|
|
#if !defined(RGBLIGHT_DEFAULT_MODE)
|
|
|
|
# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(RGBLIGHT_DEFAULT_HUE)
|
|
|
|
# define RGBLIGHT_DEFAULT_HUE 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(RGBLIGHT_DEFAULT_SAT)
|
|
|
|
# define RGBLIGHT_DEFAULT_SAT UINT8_MAX
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(RGBLIGHT_DEFAULT_VAL)
|
|
|
|
# define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(RGBLIGHT_DEFAULT_SPD)
|
|
|
|
# define RGBLIGHT_DEFAULT_SPD 0
|
|
|
|
#endif
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
static inline int is_static_effect(uint8_t mode) { return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL; }
|
2018-09-13 19:24:10 +02:00
|
|
|
|
2019-03-21 00:55:24 +01:00
|
|
|
#ifdef RGBLIGHT_LED_MAP
|
|
|
|
const uint8_t led_map[] PROGMEM = RGBLIGHT_LED_MAP;
|
|
|
|
#endif
|
|
|
|
|
2018-09-13 19:24:10 +02:00
|
|
|
#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
|
2019-08-30 20:19:03 +02:00
|
|
|
__attribute__((weak)) const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
2016-01-24 22:14:50 +01:00
|
|
|
|
|
|
|
rgblight_config_t rgblight_config;
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_status_t rgblight_status = {.timer_enabled = false};
|
|
|
|
bool is_rgblight_initialized = false;
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2021-01-11 09:07:09 +01:00
|
|
|
#ifdef RGBLIGHT_SLEEP
|
|
|
|
static bool is_suspended;
|
|
|
|
static bool pre_suspend_enabled;
|
|
|
|
#endif
|
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
#ifdef RGBLIGHT_USE_TIMER
|
|
|
|
animation_status_t animation_status = {};
|
|
|
|
#endif
|
|
|
|
|
2019-04-15 02:50:35 +02:00
|
|
|
#ifndef LED_ARRAY
|
2016-11-14 05:02:38 +01:00
|
|
|
LED_TYPE led[RGBLED_NUM];
|
2019-08-30 20:19:03 +02:00
|
|
|
# define LED_ARRAY led
|
2019-04-15 02:50:35 +02:00
|
|
|
#endif
|
|
|
|
|
2020-03-10 20:50:01 +01:00
|
|
|
#ifdef RGBLIGHT_LAYERS
|
2020-03-10 21:24:13 +01:00
|
|
|
rgblight_segment_t const *const *rgblight_layers = NULL;
|
2020-03-10 20:50:01 +01:00
|
|
|
#endif
|
|
|
|
|
2020-04-29 10:57:41 +02:00
|
|
|
rgblight_ranges_t rgblight_ranges = {0, RGBLED_NUM, 0, RGBLED_NUM, RGBLED_NUM};
|
2019-03-24 01:20:14 +01:00
|
|
|
|
|
|
|
void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds) {
|
2020-04-29 10:22:28 +02:00
|
|
|
rgblight_ranges.clipping_start_pos = start_pos;
|
|
|
|
rgblight_ranges.clipping_num_leds = num_leds;
|
2019-03-24 01:20:14 +01:00
|
|
|
}
|
|
|
|
|
2019-05-16 06:11:28 +02:00
|
|
|
void rgblight_set_effect_range(uint8_t start_pos, uint8_t num_leds) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (start_pos >= RGBLED_NUM) return;
|
|
|
|
if (start_pos + num_leds > RGBLED_NUM) return;
|
2020-04-29 10:22:28 +02:00
|
|
|
rgblight_ranges.effect_start_pos = start_pos;
|
|
|
|
rgblight_ranges.effect_end_pos = start_pos + num_leds;
|
|
|
|
rgblight_ranges.effect_num_leds = num_leds;
|
2019-05-16 06:11:28 +02:00
|
|
|
}
|
2019-03-24 01:20:14 +01:00
|
|
|
|
2020-11-28 21:02:18 +01:00
|
|
|
__attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
|
|
|
|
|
2019-05-16 06:11:28 +02:00
|
|
|
void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
|
2019-08-30 20:19:03 +02:00
|
|
|
HSV hsv = {hue, sat, val};
|
2020-11-28 21:02:18 +01:00
|
|
|
RGB rgb = rgblight_hsv_to_rgb(hsv);
|
2019-08-30 20:19:03 +02:00
|
|
|
setrgb(rgb.r, rgb.g, rgb.b, led1);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { sethsv_raw(hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val, led1); }
|
2019-05-16 06:11:28 +02:00
|
|
|
|
2016-11-14 05:02:38 +01:00
|
|
|
void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) {
|
2020-09-26 20:42:40 +02:00
|
|
|
led1->r = r;
|
|
|
|
led1->g = g;
|
|
|
|
led1->b = b;
|
2019-11-09 16:51:39 +01:00
|
|
|
#ifdef RGBW
|
2020-09-26 20:42:40 +02:00
|
|
|
led1->w = 0;
|
2019-11-09 16:51:39 +01:00
|
|
|
#endif
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
2019-02-15 15:37:44 +01:00
|
|
|
void rgblight_check_config(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
/* Add some out of bound checks for RGB light config */
|
|
|
|
|
|
|
|
if (rgblight_config.mode < RGBLIGHT_MODE_STATIC_LIGHT) {
|
|
|
|
rgblight_config.mode = RGBLIGHT_MODE_STATIC_LIGHT;
|
|
|
|
} else if (rgblight_config.mode > RGBLIGHT_MODES) {
|
|
|
|
rgblight_config.mode = RGBLIGHT_MODES;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rgblight_config.val > RGBLIGHT_LIMIT_VAL) {
|
|
|
|
rgblight_config.val = RGBLIGHT_LIMIT_VAL;
|
|
|
|
}
|
2019-02-15 15:37:44 +01:00
|
|
|
}
|
2016-01-24 22:14:50 +01:00
|
|
|
|
|
|
|
uint32_t eeconfig_read_rgblight(void) {
|
2019-11-05 22:04:50 +01:00
|
|
|
#ifdef EEPROM_ENABLE
|
2018-07-16 17:48:31 +02:00
|
|
|
return eeprom_read_dword(EECONFIG_RGBLIGHT);
|
2019-08-30 20:19:03 +02:00
|
|
|
#else
|
2018-07-16 17:48:31 +02:00
|
|
|
return 0;
|
2019-08-30 20:19:03 +02:00
|
|
|
#endif
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2019-02-15 15:37:44 +01:00
|
|
|
|
2016-04-22 04:35:18 +02:00
|
|
|
void eeconfig_update_rgblight(uint32_t val) {
|
2019-11-05 22:04:50 +01:00
|
|
|
#ifdef EEPROM_ENABLE
|
2019-02-15 15:37:44 +01:00
|
|
|
rgblight_check_config();
|
2018-07-16 17:48:31 +02:00
|
|
|
eeprom_update_dword(EECONFIG_RGBLIGHT, val);
|
2019-08-30 20:19:03 +02:00
|
|
|
#endif
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2019-02-15 15:37:44 +01:00
|
|
|
|
2020-01-20 19:48:28 +01:00
|
|
|
void eeconfig_update_rgblight_current(void) { eeconfig_update_rgblight(rgblight_config.raw); }
|
2020-01-20 19:18:25 +01:00
|
|
|
|
2016-04-22 04:35:18 +02:00
|
|
|
void eeconfig_update_rgblight_default(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.enable = 1;
|
2021-02-16 16:51:28 +01:00
|
|
|
rgblight_config.mode = RGBLIGHT_DEFAULT_MODE;
|
|
|
|
rgblight_config.hue = RGBLIGHT_DEFAULT_HUE;
|
|
|
|
rgblight_config.sat = RGBLIGHT_DEFAULT_SAT;
|
|
|
|
rgblight_config.val = RGBLIGHT_DEFAULT_VAL;
|
|
|
|
rgblight_config.speed = RGBLIGHT_DEFAULT_SPD;
|
2019-08-30 20:19:03 +02:00
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
|
|
|
|
eeconfig_update_rgblight(rgblight_config.raw);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2019-02-15 15:37:44 +01:00
|
|
|
|
2016-01-24 22:14:50 +01:00
|
|
|
void eeconfig_debug_rgblight(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
dprintf("rgblight_config EEPROM:\n");
|
|
|
|
dprintf("rgblight_config.enable = %d\n", rgblight_config.enable);
|
|
|
|
dprintf("rghlight_config.mode = %d\n", rgblight_config.mode);
|
|
|
|
dprintf("rgblight_config.hue = %d\n", rgblight_config.hue);
|
|
|
|
dprintf("rgblight_config.sat = %d\n", rgblight_config.sat);
|
|
|
|
dprintf("rgblight_config.val = %d\n", rgblight_config.val);
|
|
|
|
dprintf("rgblight_config.speed = %d\n", rgblight_config.speed);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void rgblight_init(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
/* if already initialized, don't do it again.
|
|
|
|
If you must do it again, extern this and set to false, first.
|
|
|
|
This is a dirty, dirty hack until proper hooks can be added for keyboard startup. */
|
|
|
|
if (is_rgblight_initialized) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dprintf("rgblight_init called.\n");
|
|
|
|
dprintf("rgblight_init start!\n");
|
|
|
|
if (!eeconfig_is_enabled()) {
|
|
|
|
dprintf("rgblight_init eeconfig is not enabled.\n");
|
|
|
|
eeconfig_init();
|
|
|
|
eeconfig_update_rgblight_default();
|
|
|
|
}
|
2016-07-26 21:43:45 +02:00
|
|
|
rgblight_config.raw = eeconfig_read_rgblight();
|
2019-08-30 20:19:03 +02:00
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
|
|
|
|
if (!rgblight_config.mode) {
|
|
|
|
dprintf("rgblight_init rgblight_config.mode = 0. Write default values to EEPROM.\n");
|
|
|
|
eeconfig_update_rgblight_default();
|
|
|
|
rgblight_config.raw = eeconfig_read_rgblight();
|
|
|
|
}
|
|
|
|
rgblight_check_config();
|
2019-02-15 15:37:44 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
eeconfig_debug_rgblight(); // display current eeprom values
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_timer_init(); // setup the timer
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_config.enable) {
|
|
|
|
rgblight_mode_noeeprom(rgblight_config.mode);
|
|
|
|
}
|
2019-02-15 15:37:44 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
is_rgblight_initialized = true;
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
2021-01-27 18:42:03 +01:00
|
|
|
void rgblight_reload_from_eeprom(void) {
|
|
|
|
/* Reset back to what we have in eeprom */
|
|
|
|
rgblight_config.raw = eeconfig_read_rgblight();
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
|
|
|
|
rgblight_check_config();
|
|
|
|
eeconfig_debug_rgblight(); // display current eeprom values
|
|
|
|
if (rgblight_config.enable) {
|
|
|
|
rgblight_mode_noeeprom(rgblight_config.mode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
uint32_t rgblight_read_dword(void) { return rgblight_config.raw; }
|
2019-03-15 21:46:49 +01:00
|
|
|
|
2016-11-24 00:52:02 +01:00
|
|
|
void rgblight_update_dword(uint32_t dword) {
|
2019-08-30 20:19:03 +02:00
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
|
|
|
|
rgblight_config.raw = dword;
|
|
|
|
if (rgblight_config.enable)
|
|
|
|
rgblight_mode_noeeprom(rgblight_config.mode);
|
|
|
|
else {
|
|
|
|
rgblight_timer_disable();
|
|
|
|
rgblight_set();
|
|
|
|
}
|
2016-11-24 00:52:02 +01:00
|
|
|
}
|
|
|
|
|
2016-01-24 22:14:50 +01:00
|
|
|
void rgblight_increase(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t mode = 0;
|
|
|
|
if (rgblight_config.mode < RGBLIGHT_MODES) {
|
|
|
|
mode = rgblight_config.mode + 1;
|
|
|
|
}
|
|
|
|
rgblight_mode(mode);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
void rgblight_decrease(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t mode = 0;
|
|
|
|
// Mode will never be < 1. If it ever is, eeprom needs to be initialized.
|
|
|
|
if (rgblight_config.mode > RGBLIGHT_MODE_STATIC_LIGHT) {
|
|
|
|
mode = rgblight_config.mode - 1;
|
|
|
|
}
|
|
|
|
rgblight_mode(mode);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_step_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t mode = 0;
|
|
|
|
mode = rgblight_config.mode + 1;
|
|
|
|
if (mode > RGBLIGHT_MODES) {
|
|
|
|
mode = 1;
|
|
|
|
}
|
|
|
|
rgblight_mode_eeprom_helper(mode, write_to_eeprom);
|
2018-12-14 03:05:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_step_noeeprom(void) { rgblight_step_helper(false); }
|
|
|
|
void rgblight_step(void) { rgblight_step_helper(true); }
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_step_reverse_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t mode = 0;
|
|
|
|
mode = rgblight_config.mode - 1;
|
|
|
|
if (mode < 1) {
|
|
|
|
mode = RGBLIGHT_MODES;
|
|
|
|
}
|
|
|
|
rgblight_mode_eeprom_helper(mode, write_to_eeprom);
|
2017-02-06 23:09:29 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_step_reverse_noeeprom(void) { rgblight_step_reverse_helper(false); }
|
|
|
|
void rgblight_step_reverse(void) { rgblight_step_reverse_helper(true); }
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2018-12-31 17:42:58 +01:00
|
|
|
uint8_t rgblight_get_mode(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable) {
|
|
|
|
return false;
|
|
|
|
}
|
2017-09-06 23:49:19 +02:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
return rgblight_config.mode;
|
2017-09-06 23:49:19 +02:00
|
|
|
}
|
|
|
|
|
2018-05-29 17:05:22 +02:00
|
|
|
void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (mode < RGBLIGHT_MODE_STATIC_LIGHT) {
|
|
|
|
rgblight_config.mode = RGBLIGHT_MODE_STATIC_LIGHT;
|
|
|
|
} else if (mode > RGBLIGHT_MODES) {
|
|
|
|
rgblight_config.mode = RGBLIGHT_MODES;
|
|
|
|
} else {
|
|
|
|
rgblight_config.mode = mode;
|
|
|
|
}
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODE;
|
|
|
|
if (write_to_eeprom) {
|
|
|
|
eeconfig_update_rgblight(rgblight_config.raw);
|
|
|
|
dprintf("rgblight mode [EEPROM]: %u\n", rgblight_config.mode);
|
|
|
|
} else {
|
|
|
|
dprintf("rgblight mode [NOEEPROM]: %u\n", rgblight_config.mode);
|
|
|
|
}
|
|
|
|
if (is_static_effect(rgblight_config.mode)) {
|
|
|
|
rgblight_timer_disable();
|
|
|
|
} else {
|
|
|
|
rgblight_timer_enable();
|
|
|
|
}
|
2019-04-20 00:05:51 +02:00
|
|
|
#ifdef RGBLIGHT_USE_TIMER
|
|
|
|
animation_status.restart = true;
|
|
|
|
#endif
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
|
2018-05-29 17:05:22 +02:00
|
|
|
}
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_mode(uint8_t mode) { rgblight_mode_eeprom_helper(mode, true); }
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_mode_noeeprom(uint8_t mode) { rgblight_mode_eeprom_helper(mode, false); }
|
2018-05-29 17:05:22 +02:00
|
|
|
|
2016-01-24 22:14:50 +01:00
|
|
|
void rgblight_toggle(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
dprintf("rgblight toggle [EEPROM]: rgblight_config.enable = %u\n", !rgblight_config.enable);
|
|
|
|
if (rgblight_config.enable) {
|
|
|
|
rgblight_disable();
|
|
|
|
} else {
|
|
|
|
rgblight_enable();
|
|
|
|
}
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
2018-05-29 17:05:22 +02:00
|
|
|
void rgblight_toggle_noeeprom(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
dprintf("rgblight toggle [NOEEPROM]: rgblight_config.enable = %u\n", !rgblight_config.enable);
|
|
|
|
if (rgblight_config.enable) {
|
|
|
|
rgblight_disable_noeeprom();
|
|
|
|
} else {
|
|
|
|
rgblight_enable_noeeprom();
|
|
|
|
}
|
2018-05-29 17:05:22 +02:00
|
|
|
}
|
|
|
|
|
2016-11-18 02:56:36 +01:00
|
|
|
void rgblight_enable(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.enable = 1;
|
|
|
|
// No need to update EEPROM here. rgblight_mode() will do that, actually
|
|
|
|
// eeconfig_update_rgblight(rgblight_config.raw);
|
|
|
|
dprintf("rgblight enable [EEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
|
|
|
|
rgblight_mode(rgblight_config.mode);
|
2016-11-18 02:56:36 +01:00
|
|
|
}
|
|
|
|
|
2018-05-29 17:05:22 +02:00
|
|
|
void rgblight_enable_noeeprom(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.enable = 1;
|
|
|
|
dprintf("rgblight enable [NOEEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
|
|
|
|
rgblight_mode_noeeprom(rgblight_config.mode);
|
2018-05-29 17:05:22 +02:00
|
|
|
}
|
|
|
|
|
2017-12-05 19:56:15 +01:00
|
|
|
void rgblight_disable(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.enable = 0;
|
|
|
|
eeconfig_update_rgblight(rgblight_config.raw);
|
|
|
|
dprintf("rgblight disable [EEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
|
|
|
|
rgblight_timer_disable();
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODE;
|
|
|
|
wait_ms(50);
|
|
|
|
rgblight_set();
|
2017-12-05 19:56:15 +01:00
|
|
|
}
|
|
|
|
|
2018-05-29 17:05:22 +02:00
|
|
|
void rgblight_disable_noeeprom(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.enable = 0;
|
|
|
|
dprintf("rgblight disable [NOEEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
|
2018-05-29 17:05:22 +02:00
|
|
|
rgblight_timer_disable();
|
2019-08-30 20:19:03 +02:00
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_MODE;
|
|
|
|
wait_ms(50);
|
|
|
|
rgblight_set();
|
2018-05-29 17:05:22 +02:00
|
|
|
}
|
|
|
|
|
2020-05-18 15:05:35 +02:00
|
|
|
bool rgblight_is_enabled(void) { return rgblight_config.enable; }
|
|
|
|
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_increase_hue_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t hue = rgblight_config.hue + RGBLIGHT_HUE_STEP;
|
|
|
|
rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
|
2018-12-14 03:05:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_increase_hue_noeeprom(void) { rgblight_increase_hue_helper(false); }
|
|
|
|
void rgblight_increase_hue(void) { rgblight_increase_hue_helper(true); }
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_decrease_hue_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t hue = rgblight_config.hue - RGBLIGHT_HUE_STEP;
|
|
|
|
rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
|
2018-12-14 03:05:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_decrease_hue_noeeprom(void) { rgblight_decrease_hue_helper(false); }
|
|
|
|
void rgblight_decrease_hue(void) { rgblight_decrease_hue_helper(true); }
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_increase_sat_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t sat = qadd8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
|
|
|
|
rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
|
2018-12-14 03:05:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_increase_sat_noeeprom(void) { rgblight_increase_sat_helper(false); }
|
|
|
|
void rgblight_increase_sat(void) { rgblight_increase_sat_helper(true); }
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_decrease_sat_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t sat = qsub8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
|
|
|
|
rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
|
2018-12-14 03:05:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_decrease_sat_noeeprom(void) { rgblight_decrease_sat_helper(false); }
|
|
|
|
void rgblight_decrease_sat(void) { rgblight_decrease_sat_helper(true); }
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_increase_val_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t val = qadd8(rgblight_config.val, RGBLIGHT_VAL_STEP);
|
|
|
|
rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
|
2018-12-14 03:05:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_increase_val_noeeprom(void) { rgblight_increase_val_helper(false); }
|
|
|
|
void rgblight_increase_val(void) { rgblight_increase_val_helper(true); }
|
2018-12-14 03:05:50 +01:00
|
|
|
void rgblight_decrease_val_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t val = qsub8(rgblight_config.val, RGBLIGHT_VAL_STEP);
|
|
|
|
rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_decrease_val_noeeprom(void) { rgblight_decrease_val_helper(false); }
|
|
|
|
void rgblight_decrease_val(void) { rgblight_decrease_val_helper(true); }
|
2020-08-25 11:08:09 +02:00
|
|
|
|
|
|
|
void rgblight_increase_speed_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_config.speed < 3) rgblight_config.speed++;
|
|
|
|
// RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?
|
2020-08-25 11:08:09 +02:00
|
|
|
if (write_to_eeprom) {
|
|
|
|
eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
|
|
|
|
}
|
2018-05-09 05:23:21 +02:00
|
|
|
}
|
2020-08-25 11:08:09 +02:00
|
|
|
void rgblight_increase_speed(void) { rgblight_increase_speed_helper(true); }
|
|
|
|
void rgblight_increase_speed_noeeprom(void) { rgblight_increase_speed_helper(false); }
|
2018-05-09 05:23:21 +02:00
|
|
|
|
2020-08-25 11:08:09 +02:00
|
|
|
void rgblight_decrease_speed_helper(bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_config.speed > 0) rgblight_config.speed--;
|
|
|
|
// RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED??
|
2020-08-25 11:08:09 +02:00
|
|
|
if (write_to_eeprom) {
|
|
|
|
eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
|
|
|
|
}
|
2018-05-09 05:23:21 +02:00
|
|
|
}
|
2020-08-25 11:08:09 +02:00
|
|
|
void rgblight_decrease_speed(void) { rgblight_decrease_speed_helper(true); }
|
|
|
|
void rgblight_decrease_speed_noeeprom(void) { rgblight_decrease_speed_helper(false); }
|
|
|
|
|
2019-05-01 17:02:02 +02:00
|
|
|
void rgblight_sethsv_noeeprom_old(uint8_t hue, uint8_t sat, uint8_t val) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_config.enable) {
|
|
|
|
LED_TYPE tmp_led;
|
|
|
|
sethsv(hue, sat, val, &tmp_led);
|
|
|
|
rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);
|
|
|
|
}
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2018-05-29 17:05:22 +02:00
|
|
|
|
2019-05-01 17:02:02 +02:00
|
|
|
void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_config.enable) {
|
|
|
|
rgblight_status.base_mode = mode_base_table[rgblight_config.mode];
|
|
|
|
if (rgblight_config.mode == RGBLIGHT_MODE_STATIC_LIGHT) {
|
|
|
|
// same static color
|
|
|
|
LED_TYPE tmp_led;
|
|
|
|
sethsv(hue, sat, val, &tmp_led);
|
|
|
|
rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);
|
|
|
|
} else {
|
|
|
|
// all LEDs in same color
|
|
|
|
if (1 == 0) { // dummy
|
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#ifdef RGBLIGHT_EFFECT_BREATHING
|
2019-08-30 20:19:03 +02:00
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
|
|
|
|
// breathing mode, ignore the change of val, use in memory value instead
|
|
|
|
val = rgblight_config.val;
|
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
|
2019-08-30 20:19:03 +02:00
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) {
|
|
|
|
// rainbow mood, ignore the change of hue
|
|
|
|
hue = rgblight_config.hue;
|
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
2019-08-30 20:19:03 +02:00
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) {
|
|
|
|
// rainbow swirl, ignore the change of hue
|
|
|
|
hue = rgblight_config.hue;
|
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
|
2019-08-30 20:19:03 +02:00
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) {
|
|
|
|
// static gradient
|
|
|
|
uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
|
|
|
|
bool direction = (delta % 2) == 0;
|
|
|
|
# ifdef __AVR__
|
|
|
|
// probably due to how pgm_read_word is defined for ARM, but the ARM compiler really hates this line
|
|
|
|
uint8_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[delta / 2]);
|
|
|
|
# else
|
|
|
|
uint8_t range = RGBLED_GRADIENT_RANGES[delta / 2];
|
|
|
|
# endif
|
2020-04-29 10:22:28 +02:00
|
|
|
for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) {
|
|
|
|
uint8_t _hue = ((uint16_t)i * (uint16_t)range) / rgblight_ranges.effect_num_leds;
|
2019-08-30 20:19:03 +02:00
|
|
|
if (direction) {
|
|
|
|
_hue = hue + _hue;
|
|
|
|
} else {
|
|
|
|
_hue = hue - _hue;
|
|
|
|
}
|
|
|
|
dprintf("rgblight rainbow set hsv: %d,%d,%d,%u\n", i, _hue, direction, range);
|
2020-04-29 10:22:28 +02:00
|
|
|
sethsv(_hue, sat, val, (LED_TYPE *)&led[i + rgblight_ranges.effect_start_pos]);
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
rgblight_set();
|
|
|
|
}
|
2019-05-01 17:02:02 +02:00
|
|
|
#endif
|
2017-02-06 23:14:56 +01:00
|
|
|
}
|
2019-04-20 00:05:51 +02:00
|
|
|
#ifdef RGBLIGHT_SPLIT
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_config.hue != hue || rgblight_config.sat != sat || rgblight_config.val != val) {
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_HSVS;
|
|
|
|
}
|
2019-04-20 00:05:51 +02:00
|
|
|
#endif
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.hue = hue;
|
|
|
|
rgblight_config.sat = sat;
|
|
|
|
rgblight_config.val = val;
|
|
|
|
if (write_to_eeprom) {
|
|
|
|
eeconfig_update_rgblight(rgblight_config.raw);
|
|
|
|
dprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
|
|
|
|
} else {
|
|
|
|
dprintf("rgblight set hsv [NOEEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
|
|
|
|
}
|
2018-05-29 17:05:22 +02:00
|
|
|
}
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_eeprom_helper(hue, sat, val, true); }
|
2018-05-29 17:05:22 +02:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_eeprom_helper(hue, sat, val, false); }
|
2018-05-29 17:05:22 +02:00
|
|
|
|
2020-01-20 19:18:25 +01:00
|
|
|
uint8_t rgblight_get_speed(void) { return rgblight_config.speed; }
|
|
|
|
|
|
|
|
void rgblight_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
|
|
|
|
rgblight_config.speed = speed;
|
|
|
|
if (write_to_eeprom) {
|
2020-01-20 19:48:28 +01:00
|
|
|
eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
|
2020-01-20 19:18:25 +01:00
|
|
|
dprintf("rgblight set speed [EEPROM]: %u\n", rgblight_config.speed);
|
|
|
|
} else {
|
|
|
|
dprintf("rgblight set speed [NOEEPROM]: %u\n", rgblight_config.speed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void rgblight_set_speed(uint8_t speed) { rgblight_set_speed_eeprom_helper(speed, true); }
|
|
|
|
|
|
|
|
void rgblight_set_speed_noeeprom(uint8_t speed) { rgblight_set_speed_eeprom_helper(speed, false); }
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t rgblight_get_hue(void) { return rgblight_config.hue; }
|
2017-12-17 17:44:13 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t rgblight_get_sat(void) { return rgblight_config.sat; }
|
2017-12-17 17:44:13 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t rgblight_get_val(void) { return rgblight_config.val; }
|
2017-12-17 17:44:13 +01:00
|
|
|
|
2020-05-18 15:42:23 +02:00
|
|
|
HSV rgblight_get_hsv(void) { return (HSV){rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; }
|
2020-05-18 15:05:35 +02:00
|
|
|
|
2016-07-26 21:43:45 +02:00
|
|
|
void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-04-29 10:22:28 +02:00
|
|
|
for (uint8_t i = rgblight_ranges.effect_start_pos; i < rgblight_ranges.effect_end_pos; i++) {
|
2019-08-30 20:19:03 +02:00
|
|
|
led[i].r = r;
|
|
|
|
led[i].g = g;
|
|
|
|
led[i].b = b;
|
2019-11-09 16:51:39 +01:00
|
|
|
#ifdef RGBW
|
|
|
|
led[i].w = 0;
|
|
|
|
#endif
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
rgblight_set();
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
2017-12-05 19:56:15 +01:00
|
|
|
void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable || index >= RGBLED_NUM) {
|
|
|
|
return;
|
|
|
|
}
|
2017-12-05 19:56:15 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
led[index].r = r;
|
|
|
|
led[index].g = g;
|
|
|
|
led[index].b = b;
|
2019-11-09 16:51:39 +01:00
|
|
|
#ifdef RGBW
|
|
|
|
led[index].w = 0;
|
|
|
|
#endif
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_set();
|
2017-12-05 19:56:15 +01:00
|
|
|
}
|
|
|
|
|
2019-05-01 17:02:02 +02:00
|
|
|
void rgblight_sethsv_at(uint8_t hue, uint8_t sat, uint8_t val, uint8_t index) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable) {
|
|
|
|
return;
|
|
|
|
}
|
2017-12-05 19:56:15 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
LED_TYPE tmp_led;
|
|
|
|
sethsv(hue, sat, val, &tmp_led);
|
|
|
|
rgblight_setrgb_at(tmp_led.r, tmp_led.g, tmp_led.b, index);
|
2017-12-05 19:56:15 +01:00
|
|
|
}
|
|
|
|
|
2020-05-09 10:56:16 +02:00
|
|
|
#if defined(RGBLIGHT_EFFECT_BREATHING) || defined(RGBLIGHT_EFFECT_RAINBOW_MOOD) || defined(RGBLIGHT_EFFECT_RAINBOW_SWIRL) || defined(RGBLIGHT_EFFECT_SNAKE) || defined(RGBLIGHT_EFFECT_KNIGHT) || defined(RGBLIGHT_EFFECT_TWINKLE)
|
2019-02-21 16:22:46 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
static uint8_t get_interval_time(const uint8_t *default_interval_address, uint8_t velocikey_min, uint8_t velocikey_max) {
|
|
|
|
return
|
|
|
|
# ifdef VELOCIKEY_ENABLE
|
|
|
|
velocikey_enabled() ? velocikey_match_speed(velocikey_min, velocikey_max) :
|
|
|
|
# endif
|
|
|
|
pgm_read_byte(default_interval_address);
|
2019-02-21 16:22:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2019-02-15 15:52:04 +01:00
|
|
|
void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8_t end) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable || start < 0 || start >= end || end > RGBLED_NUM) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (uint8_t i = start; i < end; i++) {
|
|
|
|
led[i].r = r;
|
|
|
|
led[i].g = g;
|
|
|
|
led[i].b = b;
|
2019-11-09 16:51:39 +01:00
|
|
|
#ifdef RGBW
|
|
|
|
led[i].w = 0;
|
|
|
|
#endif
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
rgblight_set();
|
|
|
|
wait_ms(1);
|
2019-02-15 15:52:04 +01:00
|
|
|
}
|
|
|
|
|
2019-05-01 17:02:02 +02:00
|
|
|
void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!rgblight_config.enable) {
|
|
|
|
return;
|
|
|
|
}
|
2019-02-15 15:52:04 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
LED_TYPE tmp_led;
|
|
|
|
sethsv(hue, sat, val, &tmp_led);
|
|
|
|
rgblight_setrgb_range(tmp_led.r, tmp_led.g, tmp_led.b, start, end);
|
2019-02-15 15:52:04 +01:00
|
|
|
}
|
|
|
|
|
2019-05-16 06:11:28 +02:00
|
|
|
#ifndef RGBLIGHT_SPLIT
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b) { rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLED_NUM / 2); }
|
2019-02-15 15:52:04 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) { rgblight_setrgb_range(r, g, b, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); }
|
2019-02-15 15:52:04 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLED_NUM / 2); }
|
2019-02-15 15:52:04 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); }
|
|
|
|
#endif // ifndef RGBLIGHT_SPLIT
|
2019-02-15 15:52:04 +01:00
|
|
|
|
2020-03-10 20:50:01 +01:00
|
|
|
#ifdef RGBLIGHT_LAYERS
|
|
|
|
void rgblight_set_layer_state(uint8_t layer, bool enabled) {
|
2021-01-02 22:42:48 +01:00
|
|
|
rgblight_layer_mask_t mask = (rgblight_layer_mask_t)1 << layer;
|
2020-03-10 20:50:01 +01:00
|
|
|
if (enabled) {
|
|
|
|
rgblight_status.enabled_layer_mask |= mask;
|
|
|
|
} else {
|
|
|
|
rgblight_status.enabled_layer_mask &= ~mask;
|
|
|
|
}
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_LAYERS;
|
|
|
|
// Static modes don't have a ticker running to update the LEDs
|
|
|
|
if (rgblight_status.timer_enabled == false) {
|
|
|
|
rgblight_mode_noeeprom(rgblight_config.mode);
|
|
|
|
}
|
2020-06-01 11:02:28 +02:00
|
|
|
|
|
|
|
# ifdef RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
|
|
|
|
// If not enabled, then nothing else will actually set the LEDs...
|
|
|
|
if (!rgblight_config.enable) {
|
|
|
|
rgblight_set();
|
|
|
|
}
|
|
|
|
# endif
|
2020-03-10 20:50:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool rgblight_get_layer_state(uint8_t layer) {
|
2021-01-02 22:42:48 +01:00
|
|
|
rgblight_layer_mask_t mask = (rgblight_layer_mask_t)1 << layer;
|
2020-03-10 20:50:01 +01:00
|
|
|
return (rgblight_status.enabled_layer_mask & mask) != 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write any enabled LED layers into the buffer
|
|
|
|
static void rgblight_layers_write(void) {
|
|
|
|
uint8_t i = 0;
|
|
|
|
// For each layer
|
2020-03-10 21:24:13 +01:00
|
|
|
for (const rgblight_segment_t *const *layer_ptr = rgblight_layers; i < RGBLIGHT_MAX_LAYERS; layer_ptr++, i++) {
|
2020-03-10 20:50:01 +01:00
|
|
|
if (!rgblight_get_layer_state(i)) {
|
2020-03-10 21:24:13 +01:00
|
|
|
continue; // Layer is disabled
|
2020-03-10 20:50:01 +01:00
|
|
|
}
|
2020-03-10 21:24:13 +01:00
|
|
|
const rgblight_segment_t *segment_ptr = pgm_read_ptr(layer_ptr);
|
2020-03-10 20:50:01 +01:00
|
|
|
if (segment_ptr == NULL) {
|
|
|
|
break; // No more layers
|
|
|
|
}
|
|
|
|
// For each segment
|
|
|
|
while (1) {
|
|
|
|
rgblight_segment_t segment;
|
|
|
|
memcpy_P(&segment, segment_ptr, sizeof(rgblight_segment_t));
|
|
|
|
if (segment.index == RGBLIGHT_END_SEGMENT_INDEX) {
|
|
|
|
break; // No more segments
|
|
|
|
}
|
|
|
|
// Write segment.count LEDs
|
2020-03-10 21:24:13 +01:00
|
|
|
LED_TYPE *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)];
|
2020-03-10 20:50:01 +01:00
|
|
|
for (LED_TYPE *led_ptr = &led[segment.index]; led_ptr < limit; led_ptr++) {
|
|
|
|
sethsv(segment.hue, segment.sat, segment.val, led_ptr);
|
|
|
|
}
|
|
|
|
segment_ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-05-09 10:38:33 +02:00
|
|
|
|
|
|
|
# ifdef RGBLIGHT_LAYER_BLINK
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
rgblight_layer_mask_t _blinking_layer_mask = 0;
|
|
|
|
static uint16_t _repeat_timer;
|
|
|
|
static uint8_t _times_remaining;
|
|
|
|
static uint16_t _dur;
|
|
|
|
|
|
|
|
void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) { rgblight_blink_layer_repeat(layer, duration_ms, 1); }
|
|
|
|
|
|
|
|
void rgblight_blink_layer_repeat(uint8_t layer, uint16_t duration_ms, uint8_t times) {
|
|
|
|
_times_remaining = times * 2;
|
|
|
|
_dur = duration_ms;
|
2020-05-09 10:38:33 +02:00
|
|
|
|
|
|
|
rgblight_set_layer_state(layer, true);
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
_times_remaining--;
|
|
|
|
_blinking_layer_mask |= (rgblight_layer_mask_t)1 << layer;
|
|
|
|
_repeat_timer = sync_timer_read() + duration_ms;
|
2020-05-09 10:38:33 +02:00
|
|
|
}
|
|
|
|
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
void rgblight_blink_layer_repeat_helper(void) {
|
|
|
|
if (_blinking_layer_mask != 0 && timer_expired(sync_timer_read(), _repeat_timer)) {
|
2020-05-09 10:38:33 +02:00
|
|
|
for (uint8_t layer = 0; layer < RGBLIGHT_MAX_LAYERS; layer++) {
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
if ((_blinking_layer_mask & (rgblight_layer_mask_t)1 << layer) != 0 && _times_remaining > 0) {
|
|
|
|
if (_times_remaining % 2 == 1) {
|
|
|
|
rgblight_set_layer_state(layer, false);
|
|
|
|
} else {
|
|
|
|
rgblight_set_layer_state(layer, true);
|
|
|
|
}
|
|
|
|
_times_remaining--;
|
|
|
|
_repeat_timer = sync_timer_read() + _dur;
|
2020-05-09 10:38:33 +02:00
|
|
|
}
|
|
|
|
}
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
if (_times_remaining <= 0) {
|
|
|
|
_blinking_layer_mask = 0;
|
|
|
|
}
|
2020-05-09 10:38:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
|
2020-03-10 20:50:01 +01:00
|
|
|
#endif
|
|
|
|
|
2021-01-11 09:07:09 +01:00
|
|
|
#ifdef RGBLIGHT_SLEEP
|
|
|
|
|
|
|
|
void rgblight_suspend(void) {
|
|
|
|
rgblight_timer_disable();
|
|
|
|
if (!is_suspended) {
|
|
|
|
is_suspended = true;
|
|
|
|
pre_suspend_enabled = rgblight_config.enable;
|
|
|
|
|
|
|
|
# ifdef RGBLIGHT_LAYER_BLINK
|
|
|
|
// make sure any layer blinks don't come back after suspend
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
rgblight_status.enabled_layer_mask &= ~_blinking_layer_mask;
|
|
|
|
_blinking_layer_mask = 0;
|
2021-01-11 09:07:09 +01:00
|
|
|
# endif
|
|
|
|
|
|
|
|
rgblight_disable_noeeprom();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void rgblight_wakeup(void) {
|
|
|
|
is_suspended = false;
|
|
|
|
|
|
|
|
if (pre_suspend_enabled) {
|
|
|
|
rgblight_enable_noeeprom();
|
|
|
|
}
|
|
|
|
# ifdef RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
|
|
|
|
// Need this or else the LEDs won't be set
|
|
|
|
else if (rgblight_status.enabled_layer_mask != 0) {
|
|
|
|
rgblight_set();
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
|
|
|
|
rgblight_timer_enable();
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2020-04-29 10:57:41 +02:00
|
|
|
__attribute__((weak)) void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) { ws2812_setleds(start_led, num_leds); }
|
2020-04-29 10:22:28 +02:00
|
|
|
|
2017-06-10 18:40:32 +02:00
|
|
|
#ifndef RGBLIGHT_CUSTOM_DRIVER
|
2020-06-01 11:02:28 +02:00
|
|
|
|
2016-01-24 22:14:50 +01:00
|
|
|
void rgblight_set(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
LED_TYPE *start_led;
|
2020-04-29 10:57:41 +02:00
|
|
|
uint8_t num_leds = rgblight_ranges.clipping_num_leds;
|
2019-08-30 20:19:03 +02:00
|
|
|
|
|
|
|
if (!rgblight_config.enable) {
|
2020-04-29 10:22:28 +02:00
|
|
|
for (uint8_t i = rgblight_ranges.effect_start_pos; i < rgblight_ranges.effect_end_pos; i++) {
|
2019-08-30 20:19:03 +02:00
|
|
|
led[i].r = 0;
|
|
|
|
led[i].g = 0;
|
|
|
|
led[i].b = 0;
|
2019-11-09 16:51:39 +01:00
|
|
|
# ifdef RGBW
|
|
|
|
led[i].w = 0;
|
|
|
|
# endif
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
2019-12-31 17:33:49 +01:00
|
|
|
|
2020-06-01 11:02:28 +02:00
|
|
|
# ifdef RGBLIGHT_LAYERS
|
|
|
|
if (rgblight_layers != NULL
|
2021-01-11 09:07:09 +01:00
|
|
|
# if !defined(RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF)
|
2020-06-01 11:02:28 +02:00
|
|
|
&& rgblight_config.enable
|
2021-01-11 09:07:09 +01:00
|
|
|
# elif defined(RGBLIGHT_SLEEP)
|
|
|
|
&& !is_suspended
|
2020-06-01 11:02:28 +02:00
|
|
|
# endif
|
|
|
|
) {
|
|
|
|
rgblight_layers_write();
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
# ifdef RGBLIGHT_LED_MAP
|
|
|
|
LED_TYPE led0[RGBLED_NUM];
|
|
|
|
for (uint8_t i = 0; i < RGBLED_NUM; i++) {
|
|
|
|
led0[i] = led[pgm_read_byte(&led_map[i])];
|
|
|
|
}
|
2020-04-29 10:22:28 +02:00
|
|
|
start_led = led0 + rgblight_ranges.clipping_start_pos;
|
2019-08-30 20:19:03 +02:00
|
|
|
# else
|
2020-04-29 10:22:28 +02:00
|
|
|
start_led = led + rgblight_ranges.clipping_start_pos;
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif
|
2019-12-31 17:33:49 +01:00
|
|
|
|
2020-01-19 17:30:34 +01:00
|
|
|
# ifdef RGBW
|
2019-12-31 17:33:49 +01:00
|
|
|
for (uint8_t i = 0; i < num_leds; i++) {
|
|
|
|
convert_rgb_to_rgbw(&start_led[i]);
|
|
|
|
}
|
2020-01-19 17:30:34 +01:00
|
|
|
# endif
|
2020-04-29 10:22:28 +02:00
|
|
|
rgblight_call_driver(start_led, num_leds);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2017-06-10 18:40:32 +02:00
|
|
|
#endif
|
2016-01-24 22:14:50 +01:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
#ifdef RGBLIGHT_SPLIT
|
|
|
|
/* for split keyboard master side */
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t rgblight_get_change_flags(void) { return rgblight_status.change_flags; }
|
2019-04-20 00:05:51 +02:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
void rgblight_clear_change_flags(void) { rgblight_status.change_flags = 0; }
|
2019-04-20 00:05:51 +02:00
|
|
|
|
|
|
|
void rgblight_get_syncinfo(rgblight_syncinfo_t *syncinfo) {
|
|
|
|
syncinfo->config = rgblight_config;
|
|
|
|
syncinfo->status = rgblight_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* for split keyboard slave side */
|
|
|
|
void rgblight_update_sync(rgblight_syncinfo_t *syncinfo, bool write_to_eeprom) {
|
2020-03-10 20:50:01 +01:00
|
|
|
# ifdef RGBLIGHT_LAYERS
|
|
|
|
if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_LAYERS) {
|
|
|
|
rgblight_status.enabled_layer_mask = syncinfo->status.enabled_layer_mask;
|
|
|
|
}
|
|
|
|
# endif
|
2019-04-20 00:05:51 +02:00
|
|
|
if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_MODE) {
|
|
|
|
if (syncinfo->config.enable) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_config.enable = 1; // == rgblight_enable_noeeprom();
|
2019-04-20 00:05:51 +02:00
|
|
|
rgblight_mode_eeprom_helper(syncinfo->config.mode, write_to_eeprom);
|
|
|
|
} else {
|
|
|
|
rgblight_disable_noeeprom();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_HSVS) {
|
|
|
|
rgblight_sethsv_eeprom_helper(syncinfo->config.hue, syncinfo->config.sat, syncinfo->config.val, write_to_eeprom);
|
|
|
|
// rgblight_config.speed = config->speed; // NEED???
|
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
# ifdef RGBLIGHT_USE_TIMER
|
2019-04-20 00:05:51 +02:00
|
|
|
if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_TIMER) {
|
|
|
|
if (syncinfo->status.timer_enabled) {
|
|
|
|
rgblight_timer_enable();
|
|
|
|
} else {
|
|
|
|
rgblight_timer_disable();
|
|
|
|
}
|
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
# ifndef RGBLIGHT_SPLIT_NO_ANIMATION_SYNC
|
2019-04-20 00:05:51 +02:00
|
|
|
if (syncinfo->status.change_flags & RGBLIGHT_STATUS_ANIMATION_TICK) {
|
|
|
|
animation_status.restart = true;
|
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif /* RGBLIGHT_SPLIT_NO_ANIMATION_SYNC */
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
# endif /* RGBLIGHT_USE_TIMER */
|
2019-04-20 00:05:51 +02:00
|
|
|
}
|
|
|
|
#endif /* RGBLIGHT_SPLIT */
|
|
|
|
|
2018-09-13 19:24:10 +02:00
|
|
|
#ifdef RGBLIGHT_USE_TIMER
|
2016-07-07 17:33:32 +02:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
typedef void (*effect_func_t)(animation_status_t *anim);
|
|
|
|
|
|
|
|
// Animation timer -- use system timer (AVR Timer0)
|
2016-01-24 22:14:50 +01:00
|
|
|
void rgblight_timer_init(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_status.timer_enabled = false;
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
void rgblight_timer_enable(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (!is_static_effect(rgblight_config.mode)) {
|
|
|
|
rgblight_status.timer_enabled = true;
|
|
|
|
}
|
2020-12-01 19:04:42 +01:00
|
|
|
animation_status.last_timer = sync_timer_read();
|
2019-08-30 20:19:03 +02:00
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
|
|
|
|
dprintf("rgblight timer enabled.\n");
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
void rgblight_timer_disable(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_status.timer_enabled = false;
|
|
|
|
RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
|
|
|
|
dprintf("rgblight timer disable.\n");
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
void rgblight_timer_toggle(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
dprintf("rgblight timer toggle.\n");
|
|
|
|
if (rgblight_status.timer_enabled) {
|
|
|
|
rgblight_timer_disable();
|
|
|
|
} else {
|
|
|
|
rgblight_timer_enable();
|
|
|
|
}
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
|
|
|
|
2016-11-29 15:23:16 +01:00
|
|
|
void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_enable();
|
|
|
|
rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
|
|
|
|
rgblight_setrgb(r, g, b);
|
2016-11-29 15:23:16 +01:00
|
|
|
}
|
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
static void rgblight_effect_dummy(animation_status_t *anim) {
|
|
|
|
// do nothing
|
|
|
|
/********
|
|
|
|
dprintf("rgblight_task() what happened?\n");
|
|
|
|
dprintf("is_static_effect %d\n", is_static_effect(rgblight_config.mode));
|
|
|
|
dprintf("mode = %d, base_mode = %d, timer_enabled %d, ",
|
|
|
|
rgblight_config.mode, rgblight_status.base_mode,
|
|
|
|
rgblight_status.timer_enabled);
|
|
|
|
dprintf("last_timer = %d\n",anim->last_timer);
|
|
|
|
**/
|
|
|
|
}
|
|
|
|
|
2016-11-14 05:02:38 +01:00
|
|
|
void rgblight_task(void) {
|
2019-08-30 20:19:03 +02:00
|
|
|
if (rgblight_status.timer_enabled) {
|
|
|
|
effect_func_t effect_func = rgblight_effect_dummy;
|
|
|
|
uint16_t interval_time = 2000; // dummy interval
|
|
|
|
uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
|
|
|
|
animation_status.delta = delta;
|
|
|
|
|
|
|
|
// static light mode, do nothing here
|
|
|
|
if (1 == 0) { // dummy
|
|
|
|
}
|
|
|
|
# ifdef RGBLIGHT_EFFECT_BREATHING
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
|
|
|
|
// breathing mode
|
|
|
|
interval_time = get_interval_time(&RGBLED_BREATHING_INTERVALS[delta], 1, 100);
|
|
|
|
effect_func = rgblight_effect_breathing;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) {
|
|
|
|
// rainbow mood mode
|
|
|
|
interval_time = get_interval_time(&RGBLED_RAINBOW_MOOD_INTERVALS[delta], 5, 100);
|
|
|
|
effect_func = rgblight_effect_rainbow_mood;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) {
|
|
|
|
// rainbow swirl mode
|
|
|
|
interval_time = get_interval_time(&RGBLED_RAINBOW_SWIRL_INTERVALS[delta / 2], 1, 100);
|
|
|
|
effect_func = rgblight_effect_rainbow_swirl;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_SNAKE
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_SNAKE) {
|
|
|
|
// snake mode
|
|
|
|
interval_time = get_interval_time(&RGBLED_SNAKE_INTERVALS[delta / 2], 1, 200);
|
|
|
|
effect_func = rgblight_effect_snake;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_KNIGHT
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_KNIGHT) {
|
|
|
|
// knight mode
|
|
|
|
interval_time = get_interval_time(&RGBLED_KNIGHT_INTERVALS[delta], 5, 100);
|
|
|
|
effect_func = rgblight_effect_knight;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_CHRISTMAS
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_CHRISTMAS) {
|
|
|
|
// christmas mode
|
|
|
|
interval_time = RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL;
|
|
|
|
effect_func = (effect_func_t)rgblight_effect_christmas;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_RGB_TEST
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_RGB_TEST) {
|
|
|
|
// RGB test mode
|
|
|
|
interval_time = pgm_read_word(&RGBLED_RGBTEST_INTERVALS[0]);
|
|
|
|
effect_func = (effect_func_t)rgblight_effect_rgbtest;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_ALTERNATING
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_ALTERNATING) {
|
|
|
|
interval_time = 500;
|
|
|
|
effect_func = (effect_func_t)rgblight_effect_alternating;
|
|
|
|
}
|
2020-05-09 10:56:16 +02:00
|
|
|
# endif
|
|
|
|
# ifdef RGBLIGHT_EFFECT_TWINKLE
|
|
|
|
else if (rgblight_status.base_mode == RGBLIGHT_MODE_TWINKLE) {
|
2021-01-11 08:04:42 +01:00
|
|
|
interval_time = get_interval_time(&RGBLED_TWINKLE_INTERVALS[delta % 3], 5, 30);
|
2020-05-09 10:56:16 +02:00
|
|
|
effect_func = (effect_func_t)rgblight_effect_twinkle;
|
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif
|
|
|
|
if (animation_status.restart) {
|
|
|
|
animation_status.restart = false;
|
2020-12-01 19:04:42 +01:00
|
|
|
animation_status.last_timer = sync_timer_read();
|
2019-08-30 20:19:03 +02:00
|
|
|
animation_status.pos16 = 0; // restart signal to local each effect
|
|
|
|
}
|
2020-12-01 19:04:42 +01:00
|
|
|
uint16_t now = sync_timer_read();
|
|
|
|
if (timer_expired(now, animation_status.last_timer)) {
|
2019-08-30 20:19:03 +02:00
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
static uint16_t report_last_timer = 0;
|
|
|
|
static bool tick_flag = false;
|
|
|
|
uint16_t oldpos16;
|
|
|
|
if (tick_flag) {
|
|
|
|
tick_flag = false;
|
2020-12-01 19:04:42 +01:00
|
|
|
if (timer_expired(now, report_last_timer)) {
|
|
|
|
report_last_timer += 30000;
|
2019-08-30 20:19:03 +02:00
|
|
|
dprintf("rgblight animation tick report to slave\n");
|
|
|
|
RGBLIGHT_SPLIT_ANIMATION_TICK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
oldpos16 = animation_status.pos16;
|
|
|
|
# endif
|
|
|
|
animation_status.last_timer += interval_time;
|
|
|
|
effect_func(&animation_status);
|
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
if (animation_status.pos16 == 0 && oldpos16 != 0) {
|
|
|
|
tick_flag = true;
|
|
|
|
}
|
|
|
|
# endif
|
2019-04-20 00:05:51 +02:00
|
|
|
}
|
|
|
|
}
|
2020-05-09 10:38:33 +02:00
|
|
|
|
|
|
|
# ifdef RGBLIGHT_LAYER_BLINK
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
rgblight_blink_layer_repeat_helper();
|
2020-05-09 10:38:33 +02:00
|
|
|
# endif
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
|
|
|
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif /* RGBLIGHT_USE_TIMER */
|
|
|
|
|
2021-01-11 08:04:42 +01:00
|
|
|
#if defined(RGBLIGHT_EFFECT_BREATHING) || defined(RGBLIGHT_EFFECT_TWINKLE)
|
2019-05-02 16:59:29 +02:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
# ifndef RGBLIGHT_EFFECT_BREATHE_CENTER
|
|
|
|
# ifndef RGBLIGHT_BREATHE_TABLE_SIZE
|
|
|
|
# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64
|
|
|
|
# endif
|
2020-12-12 19:19:15 +01:00
|
|
|
# include <rgblight_breathe_table.h>
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif
|
2019-05-02 16:59:29 +02:00
|
|
|
|
2021-01-11 08:04:42 +01:00
|
|
|
static uint8_t breathe_calc(uint8_t pos) {
|
2019-08-30 20:19:03 +02:00
|
|
|
// http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
|
|
|
|
# ifdef RGBLIGHT_EFFECT_BREATHE_TABLE
|
2021-01-11 08:04:42 +01:00
|
|
|
return pgm_read_byte(&rgblight_effect_breathe_table[pos / table_scale]);
|
2019-08-30 20:19:03 +02:00
|
|
|
# else
|
2021-01-11 08:04:42 +01:00
|
|
|
return (exp(sin((pos / 255.0) * M_PI)) - RGBLIGHT_EFFECT_BREATHE_CENTER / M_E) * (RGBLIGHT_EFFECT_BREATHE_MAX / (M_E - 1 / M_E));
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif
|
2021-01-11 08:04:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Effects
|
|
|
|
#ifdef RGBLIGHT_EFFECT_BREATHING
|
|
|
|
|
|
|
|
__attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
|
|
|
|
|
|
|
|
void rgblight_effect_breathing(animation_status_t *anim) {
|
|
|
|
uint8_t val = breathe_calc(anim->pos);
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_sethsv_noeeprom_old(rgblight_config.hue, rgblight_config.sat, val);
|
|
|
|
anim->pos = (anim->pos + 1);
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
|
2019-08-30 20:19:03 +02:00
|
|
|
__attribute__((weak)) const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
|
2018-09-13 19:24:10 +02:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_rainbow_mood(animation_status_t *anim) {
|
2019-08-30 20:19:03 +02:00
|
|
|
rgblight_sethsv_noeeprom_old(anim->current_hue, rgblight_config.sat, rgblight_config.val);
|
|
|
|
anim->current_hue++;
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
2019-08-30 20:19:03 +02:00
|
|
|
# ifndef RGBLIGHT_RAINBOW_SWIRL_RANGE
|
|
|
|
# define RGBLIGHT_RAINBOW_SWIRL_RANGE 255
|
|
|
|
# endif
|
2018-11-07 17:25:18 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
__attribute__((weak)) const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20};
|
2018-09-13 19:24:10 +02:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_rainbow_swirl(animation_status_t *anim) {
|
2019-08-30 20:19:03 +02:00
|
|
|
uint8_t hue;
|
|
|
|
uint8_t i;
|
2019-02-21 16:22:46 +01:00
|
|
|
|
2020-04-29 10:22:28 +02:00
|
|
|
for (i = 0; i < rgblight_ranges.effect_num_leds; i++) {
|
|
|
|
hue = (RGBLIGHT_RAINBOW_SWIRL_RANGE / rgblight_ranges.effect_num_leds * i + anim->current_hue);
|
|
|
|
sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i + rgblight_ranges.effect_start_pos]);
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
rgblight_set();
|
2016-07-26 21:43:45 +02:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
if (anim->delta % 2) {
|
|
|
|
anim->current_hue++;
|
|
|
|
} else {
|
|
|
|
anim->current_hue--;
|
|
|
|
}
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef RGBLIGHT_EFFECT_SNAKE
|
2019-08-30 20:19:03 +02:00
|
|
|
__attribute__((weak)) const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
|
2018-09-13 19:24:10 +02:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_snake(animation_status_t *anim) {
|
2019-08-30 20:19:03 +02:00
|
|
|
static uint8_t pos = 0;
|
|
|
|
uint8_t i, j;
|
|
|
|
int8_t k;
|
|
|
|
int8_t increment = 1;
|
2019-02-21 16:22:46 +01:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
if (anim->delta % 2) {
|
|
|
|
increment = -1;
|
2019-04-20 00:05:51 +02:00
|
|
|
}
|
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
if (anim->pos == 0) { // restart signal
|
|
|
|
if (increment == 1) {
|
2020-04-29 10:22:28 +02:00
|
|
|
pos = rgblight_ranges.effect_num_leds - 1;
|
2019-08-30 20:19:03 +02:00
|
|
|
} else {
|
|
|
|
pos = 0;
|
|
|
|
}
|
|
|
|
anim->pos = 1;
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif
|
|
|
|
|
2020-04-29 10:22:28 +02:00
|
|
|
for (i = 0; i < rgblight_ranges.effect_num_leds; i++) {
|
|
|
|
LED_TYPE *ledp = led + i + rgblight_ranges.effect_start_pos;
|
2019-08-30 20:19:03 +02:00
|
|
|
ledp->r = 0;
|
|
|
|
ledp->g = 0;
|
|
|
|
ledp->b = 0;
|
2019-11-09 16:51:39 +01:00
|
|
|
# ifdef RGBW
|
2019-11-17 15:02:26 +01:00
|
|
|
ledp->w = 0;
|
2019-11-09 16:51:39 +01:00
|
|
|
# endif
|
2019-08-30 20:19:03 +02:00
|
|
|
for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) {
|
|
|
|
k = pos + j * increment;
|
2019-10-16 00:13:13 +02:00
|
|
|
if (k > RGBLED_NUM) {
|
|
|
|
k = k % RGBLED_NUM;
|
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
if (k < 0) {
|
2020-04-29 10:22:28 +02:00
|
|
|
k = k + rgblight_ranges.effect_num_leds;
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
if (i == k) {
|
|
|
|
sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val * (RGBLIGHT_EFFECT_SNAKE_LENGTH - j) / RGBLIGHT_EFFECT_SNAKE_LENGTH), ledp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rgblight_set();
|
|
|
|
if (increment == 1) {
|
|
|
|
if (pos - 1 < 0) {
|
2020-04-29 10:22:28 +02:00
|
|
|
pos = rgblight_ranges.effect_num_leds - 1;
|
2019-08-30 20:19:03 +02:00
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
anim->pos = 0;
|
|
|
|
# endif
|
|
|
|
} else {
|
|
|
|
pos -= 1;
|
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
anim->pos = 1;
|
|
|
|
# endif
|
|
|
|
}
|
2016-07-26 21:43:45 +02:00
|
|
|
} else {
|
2020-04-29 10:22:28 +02:00
|
|
|
pos = (pos + 1) % rgblight_ranges.effect_num_leds;
|
2019-08-30 20:19:03 +02:00
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
anim->pos = pos;
|
|
|
|
# endif
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
2016-01-24 22:14:50 +01:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef RGBLIGHT_EFFECT_KNIGHT
|
2019-08-30 20:19:03 +02:00
|
|
|
__attribute__((weak)) const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
|
2018-09-13 19:24:10 +02:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_knight(animation_status_t *anim) {
|
2019-08-30 20:19:03 +02:00
|
|
|
static int8_t low_bound = 0;
|
|
|
|
static int8_t high_bound = RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
|
|
|
|
static int8_t increment = 1;
|
|
|
|
uint8_t i, cur;
|
|
|
|
|
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
if (anim->pos == 0) { // restart signal
|
|
|
|
anim->pos = 1;
|
|
|
|
low_bound = 0;
|
|
|
|
high_bound = RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
|
|
|
|
increment = 1;
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
2019-08-30 20:19:03 +02:00
|
|
|
# endif
|
|
|
|
// Set all the LEDs to 0
|
2020-04-29 10:22:28 +02:00
|
|
|
for (i = rgblight_ranges.effect_start_pos; i < rgblight_ranges.effect_end_pos; i++) {
|
2019-08-30 20:19:03 +02:00
|
|
|
led[i].r = 0;
|
|
|
|
led[i].g = 0;
|
|
|
|
led[i].b = 0;
|
2019-11-09 16:51:39 +01:00
|
|
|
# ifdef RGBW
|
|
|
|
led[i].w = 0;
|
|
|
|
# endif
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
// Determine which LEDs should be lit up
|
|
|
|
for (i = 0; i < RGBLIGHT_EFFECT_KNIGHT_LED_NUM; i++) {
|
2020-04-29 10:22:28 +02:00
|
|
|
cur = (i + RGBLIGHT_EFFECT_KNIGHT_OFFSET) % rgblight_ranges.effect_num_leds + rgblight_ranges.effect_start_pos;
|
2017-09-05 23:19:08 +02:00
|
|
|
|
2019-08-30 20:19:03 +02:00
|
|
|
if (i >= low_bound && i <= high_bound) {
|
|
|
|
sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[cur]);
|
|
|
|
} else {
|
|
|
|
led[cur].r = 0;
|
|
|
|
led[cur].g = 0;
|
|
|
|
led[cur].b = 0;
|
2019-11-09 16:51:39 +01:00
|
|
|
# ifdef RGBW
|
|
|
|
led[cur].w = 0;
|
|
|
|
# endif
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
rgblight_set();
|
|
|
|
|
|
|
|
// Move from low_bound to high_bound changing the direction we increment each
|
|
|
|
// time a boundary is hit.
|
|
|
|
low_bound += increment;
|
|
|
|
high_bound += increment;
|
|
|
|
|
|
|
|
if (high_bound <= 0 || low_bound >= RGBLIGHT_EFFECT_KNIGHT_LED_NUM - 1) {
|
|
|
|
increment = -increment;
|
|
|
|
# if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
|
|
|
|
if (increment == 1) {
|
|
|
|
anim->pos = 0;
|
|
|
|
}
|
|
|
|
# endif
|
2019-04-20 00:05:51 +02:00
|
|
|
}
|
2016-07-26 21:43:45 +02:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
2016-07-26 21:43:45 +02:00
|
|
|
|
2018-09-13 19:24:10 +02:00
|
|
|
#ifdef RGBLIGHT_EFFECT_CHRISTMAS
|
2020-07-26 01:00:33 +02:00
|
|
|
# define CUBED(x) ((x) * (x) * (x))
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Christmas lights effect, with a smooth animation between red & green.
|
|
|
|
*/
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_christmas(animation_status_t *anim) {
|
2020-07-26 01:00:33 +02:00
|
|
|
static int8_t increment = 1;
|
2020-08-30 00:57:48 +02:00
|
|
|
const uint8_t max_pos = 32;
|
2020-07-26 01:00:33 +02:00
|
|
|
const uint8_t hue_green = 85;
|
|
|
|
|
|
|
|
uint32_t xa;
|
2020-08-30 00:57:48 +02:00
|
|
|
uint8_t hue, val;
|
|
|
|
uint8_t i;
|
2019-08-30 20:19:03 +02:00
|
|
|
|
2020-07-26 01:00:33 +02:00
|
|
|
// The effect works by animating anim->pos from 0 to 32 and back to 0.
|
|
|
|
// The pos is used in a cubic bezier formula to ease-in-out between red and green, leaving the interpolated colors visible as short as possible.
|
2020-08-30 00:57:48 +02:00
|
|
|
xa = CUBED((uint32_t)anim->pos);
|
|
|
|
hue = ((uint32_t)hue_green) * xa / (xa + CUBED((uint32_t)(max_pos - anim->pos)));
|
2020-07-26 01:00:33 +02:00
|
|
|
// Additionally, these interpolated colors get shown with a slightly darker value, to make them less prominent than the main colors.
|
|
|
|
val = 255 - (3 * (hue < hue_green / 2 ? hue : hue_green - hue) / 2);
|
|
|
|
|
2020-04-29 10:22:28 +02:00
|
|
|
for (i = 0; i < rgblight_ranges.effect_num_leds; i++) {
|
2020-07-26 01:00:33 +02:00
|
|
|
uint8_t local_hue = (i / RGBLIGHT_EFFECT_CHRISTMAS_STEP) % 2 ? hue : hue_green - hue;
|
|
|
|
sethsv(local_hue, rgblight_config.sat, val, (LED_TYPE *)&led[i + rgblight_ranges.effect_start_pos]);
|
2019-08-30 20:19:03 +02:00
|
|
|
}
|
|
|
|
rgblight_set();
|
2020-07-26 01:00:33 +02:00
|
|
|
|
|
|
|
if (anim->pos == 0) {
|
|
|
|
increment = 1;
|
|
|
|
} else if (anim->pos == max_pos) {
|
|
|
|
increment = -1;
|
|
|
|
}
|
|
|
|
anim->pos += increment;
|
2016-12-23 16:29:19 +01:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef RGBLIGHT_EFFECT_RGB_TEST
|
2019-08-30 20:19:03 +02:00
|
|
|
__attribute__((weak)) const uint16_t RGBLED_RGBTEST_INTERVALS[] PROGMEM = {1024};
|
2016-12-23 16:29:19 +01:00
|
|
|
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_rgbtest(animation_status_t *anim) {
|
2019-08-30 20:19:03 +02:00
|
|
|
static uint8_t maxval = 0;
|
|
|
|
uint8_t g;
|
|
|
|
uint8_t r;
|
|
|
|
uint8_t b;
|
|
|
|
|
|
|
|
if (maxval == 0) {
|
|
|
|
LED_TYPE tmp_led;
|
|
|
|
sethsv(0, 255, RGBLIGHT_LIMIT_VAL, &tmp_led);
|
|
|
|
maxval = tmp_led.r;
|
|
|
|
}
|
|
|
|
g = r = b = 0;
|
|
|
|
switch (anim->pos) {
|
|
|
|
case 0:
|
|
|
|
r = maxval;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
g = maxval;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
b = maxval;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rgblight_setrgb(r, g, b);
|
|
|
|
anim->pos = (anim->pos + 1) % 3;
|
2018-06-04 17:10:39 +02:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
2018-06-04 17:10:39 +02:00
|
|
|
|
2018-09-13 19:24:10 +02:00
|
|
|
#ifdef RGBLIGHT_EFFECT_ALTERNATING
|
2019-04-20 00:05:51 +02:00
|
|
|
void rgblight_effect_alternating(animation_status_t *anim) {
|
2020-04-29 10:22:28 +02:00
|
|
|
for (int i = 0; i < rgblight_ranges.effect_num_leds; i++) {
|
|
|
|
LED_TYPE *ledp = led + i + rgblight_ranges.effect_start_pos;
|
|
|
|
if (i < rgblight_ranges.effect_num_leds / 2 && anim->pos) {
|
2019-08-30 20:19:03 +02:00
|
|
|
sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, ledp);
|
2020-04-29 10:22:28 +02:00
|
|
|
} else if (i >= rgblight_ranges.effect_num_leds / 2 && !anim->pos) {
|
2019-08-30 20:19:03 +02:00
|
|
|
sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, ledp);
|
|
|
|
} else {
|
|
|
|
sethsv(rgblight_config.hue, rgblight_config.sat, 0, ledp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rgblight_set();
|
|
|
|
anim->pos = (anim->pos + 1) % 2;
|
2018-07-29 17:42:11 +02:00
|
|
|
}
|
2018-09-13 19:24:10 +02:00
|
|
|
#endif
|
2020-05-09 10:56:16 +02:00
|
|
|
|
|
|
|
#ifdef RGBLIGHT_EFFECT_TWINKLE
|
2021-01-11 08:04:42 +01:00
|
|
|
__attribute__((weak)) const uint8_t RGBLED_TWINKLE_INTERVALS[] PROGMEM = {30, 15, 5};
|
2020-05-09 10:56:16 +02:00
|
|
|
|
|
|
|
typedef struct PACKED {
|
2020-05-09 11:31:49 +02:00
|
|
|
HSV hsv;
|
|
|
|
uint8_t life;
|
2021-01-11 08:04:42 +01:00
|
|
|
uint8_t max_life;
|
2020-05-09 10:56:16 +02:00
|
|
|
} TwinkleState;
|
|
|
|
|
|
|
|
static TwinkleState led_twinkle_state[RGBLED_NUM];
|
|
|
|
|
|
|
|
void rgblight_effect_twinkle(animation_status_t *anim) {
|
2021-01-11 08:04:42 +01:00
|
|
|
const bool random_color = anim->delta / 3;
|
|
|
|
const bool restart = anim->pos == 0;
|
|
|
|
anim->pos = 1;
|
|
|
|
|
|
|
|
const uint8_t bottom = breathe_calc(0);
|
|
|
|
const uint8_t top = breathe_calc(127);
|
|
|
|
|
|
|
|
uint8_t frac(uint8_t n, uint8_t d) { return (uint16_t)255 * n / d; }
|
|
|
|
uint8_t scale(uint16_t v, uint8_t scale) { return (v * scale) >> 8; }
|
2020-05-09 10:56:16 +02:00
|
|
|
|
|
|
|
for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) {
|
|
|
|
TwinkleState *t = &(led_twinkle_state[i]);
|
2020-05-09 11:31:49 +02:00
|
|
|
HSV * c = &(t->hsv);
|
2021-01-11 08:04:42 +01:00
|
|
|
|
|
|
|
if (!random_color) {
|
|
|
|
c->h = rgblight_config.hue;
|
|
|
|
c->s = rgblight_config.sat;
|
|
|
|
}
|
|
|
|
|
2020-05-09 10:56:16 +02:00
|
|
|
if (restart) {
|
|
|
|
// Restart
|
2021-01-11 08:04:42 +01:00
|
|
|
t->life = 0;
|
|
|
|
c->v = 0;
|
2020-05-09 10:56:16 +02:00
|
|
|
} else if (t->life) {
|
|
|
|
// This LED is already on, either brightening or dimming
|
|
|
|
t->life--;
|
2021-01-11 08:04:42 +01:00
|
|
|
uint8_t unscaled = frac(breathe_calc(frac(t->life, t->max_life)) - bottom, top - bottom);
|
|
|
|
c->v = scale(rgblight_config.val, unscaled);
|
|
|
|
} else if (rand() < scale((uint16_t)RAND_MAX * RGBLIGHT_EFFECT_TWINKLE_PROBABILITY, 127 + rgblight_config.val / 2)) {
|
2020-05-09 10:56:16 +02:00
|
|
|
// This LED is off, but was randomly selected to start brightening
|
2021-01-11 08:04:42 +01:00
|
|
|
if (random_color) {
|
|
|
|
c->h = rand() % 0xFF;
|
|
|
|
c->s = (rand() % (rgblight_config.sat / 2)) + (rgblight_config.sat / 2);
|
|
|
|
}
|
|
|
|
c->v = 0;
|
|
|
|
t->max_life = MAX(20, MIN(RGBLIGHT_EFFECT_TWINKLE_LIFE, rgblight_config.val));
|
|
|
|
t->life = t->max_life;
|
2020-05-09 10:56:16 +02:00
|
|
|
} else {
|
|
|
|
// This LED is off, and was NOT selected to start brightening
|
|
|
|
}
|
|
|
|
|
|
|
|
LED_TYPE *ledp = led + i + rgblight_ranges.effect_start_pos;
|
|
|
|
sethsv(c->h, c->s, c->v, ledp);
|
|
|
|
}
|
|
|
|
|
|
|
|
rgblight_set();
|
|
|
|
}
|
|
|
|
#endif
|