1
0

Some changes of backlight effects

- Change backlight levels from 10 to 8
- Remove fading when press and release mode
- Remove typing led (fade out)
- Change implementation of breathing led
- New marquee mode at level 7
This commit is contained in:
Kai Ryu 2015-04-27 19:12:16 +09:00
parent fa46fa1edd
commit c003379074
2 changed files with 43 additions and 66 deletions

View File

@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "backlight.h" #include "backlight.h"
#include "softpwm_led.h" #include "softpwm_led.h"
#include "action.h" #include "action.h"
#include "timer.h"
#include "rgb.h" #include "rgb.h"
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
@ -48,23 +49,22 @@ void backlight_set(uint8_t level)
case 4: case 4:
case 5: case 5:
case 6: case 6:
breathing_led_enable_all();
fading_led_disable_all(); fading_led_disable_all();
breathing_led_set_duration(6 - level); breathing_led_set_duration(6 - level);
breathing_led_set_index_all(0);
breathing_led_enable_all();
break; break;
case 7: case 7:
case 8: fading_led_disable_all();
fading_led_enable_all();
breathing_led_disable_all(); breathing_led_disable_all();
fading_led_set_direction_all(FADING_LED_FADE_IN); breathing_led_set_duration(1);
fading_led_set_duration(level == 7 ? 3 : 0); breathing_led_set_index_all(0);
break; break;
case 9: case 8:
case 10:
fading_led_enable_all();
breathing_led_disable_all(); breathing_led_disable_all();
fading_led_set_direction_all(FADING_LED_FADE_OUT); fading_led_set_direction_all(FADING_LED_FADE_OUT);
fading_led_set_duration(level == 9 ? 3 : 0); fading_led_set_duration(3);
fading_led_enable_all();
break; break;
case 0: case 0:
default: default:
@ -88,19 +88,19 @@ void softpwm_led_init(void)
void softpwm_led_on(uint8_t index) void softpwm_led_on(uint8_t index)
{ {
switch (index) { switch (index) {
case 0: case 1:
PORTC &= ~(1<<PC2); PORTC &= ~(1<<PC2);
break; break;
case 1: case 2:
PORTC &= ~(1<<PC7); PORTC &= ~(1<<PC7);
break; break;
case 2: case 3:
PORTD &= ~(1<<PD5); PORTD &= ~(1<<PD5);
break; break;
case 3: case 4:
PORTD &= ~(1<<PD6); PORTD &= ~(1<<PD6);
break; break;
case 4: case 5:
PORTB &= ~(1<<PB0); PORTB &= ~(1<<PB0);
break; break;
} }
@ -109,19 +109,19 @@ void softpwm_led_on(uint8_t index)
void softpwm_led_off(uint8_t index) void softpwm_led_off(uint8_t index)
{ {
switch (index) { switch (index) {
case 0: case 1:
PORTC |= (1<<PC2); PORTC |= (1<<PC2);
break; break;
case 1: case 2:
PORTC |= (1<<PC7); PORTC |= (1<<PC7);
break; break;
case 2: case 3:
PORTD |= (1<<PD5); PORTD |= (1<<PD5);
break; break;
case 3: case 4:
PORTD |= (1<<PD6); PORTD |= (1<<PD6);
break; break;
case 4: case 5:
PORTB |= (1<<PB0); PORTB |= (1<<PB0);
break; break;
} }
@ -131,35 +131,12 @@ void softpwm_led_off(uint8_t index)
void action_keyevent(keyevent_t event) void action_keyevent(keyevent_t event)
{ {
if (backlight_config.enable) { if (backlight_config.enable) {
switch (backlight_config.level) { if (backlight_config.level == 8) {
case 7: if (event.pressed) {
if (event.pressed) { uint8_t key = event.key.col + 1;
fading_led_set_delay(event.key.col, 64); fading_led_set_delay(key, 64);
softpwm_led_decrease(event.key.col, 32); softpwm_led_increase(key, 32);
} }
break;
case 8:
if (event.pressed) {
fading_led_set_direction(event.key.col, FADING_LED_FADE_OUT);
}
else {
fading_led_set_direction(event.key.col, FADING_LED_FADE_IN);
}
break;
case 9:
if (event.pressed) {
fading_led_set_delay(event.key.col, 64);
softpwm_led_increase(event.key.col, 32);
}
break;
case 10:
if (event.pressed) {
fading_led_set_direction(event.key.col, FADING_LED_FADE_IN);
}
else {
fading_led_set_direction(event.key.col, FADING_LED_FADE_OUT);
}
break;
} }
} }
} }
@ -168,31 +145,31 @@ void action_keyevent(keyevent_t event)
void softpwm_led_custom(void) void softpwm_led_custom(void)
{ {
rgb_fading(); rgb_fading();
if (backlight_config.level == 7) {
static uint8_t index = 0;
static uint16_t last = 0;
if (timer_elapsed(last) > 250) {
last = timer_read();
breathing_led_enable_once(index);
index = (index + 1) % 6;
}
}
} }
void fading_led_custom(uint8_t *value) void fading_led_custom(uint8_t *value)
{ {
uint8_t tmp = value[0]; if (backlight_config.level == 8) {
switch (backlight_config.level) { uint8_t max = value[0];
case 7: for (uint8_t i = 1; i < LED_COUNT; i++) {
case 8: if (value[i] > max) max = value[i];
for (uint8_t i = 0; i < LED_COUNT; i++) { }
if (value[i] < tmp) tmp = value[i]; rgb_set_brightness(max);
}
break;
case 9:
case 10:
for (uint8_t i = 0; i < LED_COUNT; i++) {
if (value[i] > tmp) tmp = value[i];
}
break;
} }
rgb_set_brightness(tmp);
} }
void breathing_led_custom(uint8_t *value) void breathing_led_custom(uint8_t *value)
{ {
rgb_set_brightness(*value); rgb_set_brightness(value[0]);
} }
#endif #endif

View File

@ -42,10 +42,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBOUNCE 5 #define DEBOUNCE 5
/* number of backlight levels */ /* number of backlight levels */
#define BACKLIGHT_LEVELS 10 #define BACKLIGHT_LEVELS 8
/* number of LEDs */ /* number of LEDs */
#define LED_COUNT 5 #define LED_COUNT 6
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE