di0ib
/
tmk_keyboard_custom
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Change implement from breathing led to fading led

yuk86
Kai Ryu 9 years ago
parent
7a3652f6fa
commit
5ea92acdf7
6 changed files with 197 additions and 132 deletions
Split View Show Diff Stats
  1. 6
    1
      common/action.c
  2. 3
    1
      common/action.h
  3. 139
    99
      common/softpwm_led.c
  4. 33
    19
      common/softpwm_led.h
  5. 15
    11
      keyboard/gh60/backlight.c
  6. 1
    1
      keyboard/gh60/ledmap.c

+ 6
- 1
common/action.c View File

@@ -43,7 +43,7 @@ void action_exec(keyevent_t event)

keyrecord_t record = { .event = event };

key_event(event);
action_keyevent(event);

#ifndef NO_ACTION_TAPPING
action_tapping_process(record);
@@ -559,3 +559,8 @@ void debug_action(action_t action)
}
dprintf("[%X:%02X]", action.kind.param>>8, action.kind.param&0xff);
}

__attribute__ ((weak))
void action_keyevent(keyevent_t event)
{
}

+ 3
- 1
common/action.h View File

@@ -55,6 +55,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
/* user defined special function */
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);

/* keyevent callback */
void action_keyevent(keyevent_t event);

/* Utilities for actions. */
void process_action(keyrecord_t *record);
void register_code(uint8_t code);
@@ -66,7 +69,6 @@ void clear_keyboard(void);
void clear_keyboard_but_mods(void);
void layer_switch(uint8_t new_layer);
bool is_tap_key(key_t key);
void key_event(keyevent_t event);

/* debug */
void debug_event(keyevent_t event);

+ 139
- 99
common/softpwm_led.c View File

@@ -98,145 +98,149 @@ void softpwm_led_set_all(uint8_t val)
}
}

void softpwm_led_increase(uint8_t index, uint8_t offset)
{
if (softpwm_led_ocr_buff[index] > 0xFF - offset) {
softpwm_led_ocr_buff[index] = 0xFF;
}
else {
softpwm_led_ocr_buff[index] += offset;
}
}

void softpwm_led_increase_all(uint8_t offset)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
softpwm_led_increase(i, offset);
}
}

void softpwm_led_decrease(uint8_t index, uint8_t offset)
{
if (softpwm_led_ocr_buff[index] < offset) {
softpwm_led_ocr_buff[index] = 0;
}
else {
softpwm_led_ocr_buff[index] -= offset;
}
}

void softpwm_led_decrease_all(uint8_t offset)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
softpwm_led_decrease(i, offset);
}
}

inline uint8_t softpwm_led_get_state(void)
{
return softpwm_led_state;
}

#ifdef BREATHING_LED_ENABLE
#ifdef FADING_LED_ENABLE

/* Breathing LED brighness(PWM On period) table
*
* http://www.wolframalpha.com/input/?i=Table%5Bfloor%28%28exp%28sin%28x%2F256*2*pi%2B3%2F2*pi%29%29-1%2Fe%29*%28256%2F%28e-1%2Fe%29%29%29%2C+%7Bx%2C0%2C255%2C1%7D%5D
* Table[floor((exp(sin(x/256*2*pi+3/2*pi))-1/e)*(256/(e-1/e))), {x,0,255,1}]
* (0..255).each {|x| print ((exp(sin(x/256.0*2*PI+3.0/2*PI))-1/E)*(256/(E-1/E))).to_i, ', ' }
*/
static const uint8_t breathing_table[128] PROGMEM = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 8, 9, 10, 11, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 25, 26, 27, 29, 30, 32, 34, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 56, 58, 61, 63, 66, 68, 71, 74, 77, 80, 83, 86, 89, 92, 95, 98, 102, 105, 108, 112, 116, 119, 123, 126, 130, 134, 138, 142, 145, 149, 153, 157, 161, 165, 169, 173, 176, 180, 184, 188, 192, 195, 199, 203, 206, 210, 213, 216, 219, 223, 226, 228, 231, 234, 236, 239, 241, 243, 245, 247, 248, 250, 251, 252, 253, 254, 255, 255, 255
};
static led_pack_t fading_led_state = 0;
static led_pack_t fading_led_direction = 0;
static uint8_t fading_led_duration = 0;

static led_pack_t breathing_led_state = 0;
static led_pack_t breathing_led_direction = 0;
static led_pack_t breathing_led_rebound_low = 0;
static led_pack_t breathing_led_rebound_high = 0;
static uint8_t breathing_led_index[LED_COUNT] = {0};
static uint8_t breathing_led_duration[LED_COUNT] = {0};

void breathing_led_enable(uint8_t index)
void fading_led_enable(uint8_t index)
{
LED_BIT_SET(breathing_led_state, index);
LED_BIT_SET(fading_led_state, index);
}

void breathing_led_enable_all(void)
void fading_led_enable_all(void)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
LED_BIT_SET(breathing_led_state, i);
LED_BIT_SET(fading_led_state, i);
}
}

void breathing_led_disable(uint8_t index)
void fading_led_disable(uint8_t index)
{
LED_BIT_CLEAR(breathing_led_state, index);
LED_BIT_CLEAR(fading_led_state, index);
}

void breathing_led_disable_all(void)
void fading_led_disable_all(void)
{
breathing_led_state = 0;
fading_led_state = 0;
}

void breathing_led_toggle(uint8_t index)
void fading_led_toggle(uint8_t index)
{
LED_BIT_XOR(breathing_led_state, index);
LED_BIT_XOR(fading_led_state, index);
}

void breathing_led_toggle_all(void)
void fading_led_toggle_all(void)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
LED_BIT_XOR(breathing_led_state, i);
LED_BIT_XOR(fading_led_state, i);
}
}

void breathing_led_increase(uint8_t index, uint8_t offset)
void fading_led_set_direction(uint8_t dir)
{
if (breathing_led_index[index] + offset > 0x7F) {
breathing_led_index[index] = 0x7F;
if (breathing_led_rebound_high & LED_BIT(index)) {
LED_BIT_SET(breathing_led_direction, index);
}
}
else {
breathing_led_index[index] += offset;
}
fading_led_direction = dir;
}

void breathing_led_decrease(uint8_t index, uint8_t offset)
void fading_led_set_duration(uint8_t dur)
{
if (breathing_led_index[index] < offset) {
breathing_led_index[index] = 0;
if (breathing_led_rebound_low & LED_BIT(index)) {
LED_BIT_CLEAR(breathing_led_direction, index);
}
}
else {
breathing_led_index[index] -= offset;
}
fading_led_duration = dur;
}

void breathing_led_set_mode(uint8_t index, uint8_t mode)
#endif

#ifdef BREATHING_LED_ENABLE

/* Breathing LED brighness(PWM On period) table
*
* http://www.wolframalpha.com/input/?i=Table%5Bfloor%28%28exp%28sin%28x%2F256*2*pi%2B3%2F2*pi%29%29-1%2Fe%29*%28256%2F%28e-1%2Fe%29%29%29%2C+%7Bx%2C0%2C255%2C1%7D%5D
* Table[floor((exp(sin(x/256*2*pi+3/2*pi))-1/e)*(256/(e-1/e))), {x,0,255,1}]
* (0..255).each {|x| print ((exp(sin(x/256.0*2*PI+3.0/2*PI))-1/E)*(256/(E-1/E))).to_i, ', ' }
*/
static const uint8_t breathing_table[128] PROGMEM = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 8, 9, 10, 11, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 25, 26, 27, 29, 30, 32, 34, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 56, 58, 61, 63, 66, 68, 71, 74, 77, 80, 83, 86, 89, 92, 95, 98, 102, 105, 108, 112, 116, 119, 123, 126, 130, 134, 138, 142, 145, 149, 153, 157, 161, 165, 169, 173, 176, 180, 184, 188, 192, 195, 199, 203, 206, 210, 213, 216, 219, 223, 226, 228, 231, 234, 236, 239, 241, 243, 245, 247, 248, 250, 251, 252, 253, 254, 255, 255, 255
};

static led_pack_t breathing_led_state = 0;
static uint8_t breathing_led_duration = 0;

void breathing_led_enable(uint8_t index)
{
LED_BIT_SET(breathing_led_state, index);
}

void breathing_led_enable_all(void)
{
switch (mode) {
case BREATHING_LED_UP:
breathing_led_index[index] = 0;
LED_BIT_CLEAR(breathing_led_direction, index);
LED_BIT_CLEAR(breathing_led_rebound_low, index);
LED_BIT_CLEAR(breathing_led_rebound_high, index);
break;
case BREATHING_LED_DOWN:
breathing_led_index[index] = 0x7F;
LED_BIT_SET(breathing_led_direction, index);
LED_BIT_CLEAR(breathing_led_rebound_low, index);
LED_BIT_CLEAR(breathing_led_rebound_high, index);
break;
case BREATHING_LED_CYCLE:
breathing_led_index[index] = 0;
LED_BIT_CLEAR(breathing_led_direction, index);
LED_BIT_SET(breathing_led_rebound_low, index);
LED_BIT_SET(breathing_led_rebound_high, index);
for (uint8_t i = 0; i < LED_COUNT; i++) {
LED_BIT_SET(breathing_led_state, i);
}
}

void breathing_led_set_duration(uint8_t index, uint8_t dur)
void breathing_led_disable(uint8_t index)
{
breathing_led_duration[index] = dur;
//dprintf("breathing led set duration: %u\n", breathing_led_duration);
LED_BIT_CLEAR(breathing_led_state, index);
}

void breathing_led_increase_all(uint8_t offset)
void breathing_led_disable_all(void)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
breathing_led_increase(i, offset);
}
breathing_led_state = 0;
}

void breathing_led_decrease_all(uint8_t offset)
void breathing_led_toggle(uint8_t index)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
breathing_led_decrease(i, offset);
}
LED_BIT_XOR(breathing_led_state, index);
}

void breathing_led_set_mode_all(uint8_t mode)
void breathing_led_toggle_all(void)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
breathing_led_set_mode(i, mode);
LED_BIT_XOR(breathing_led_state, i);
}
}

void breathing_led_set_duration_all(uint8_t dur)
void breathing_led_set_duration(uint8_t dur)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
breathing_led_duration[i] = dur;
}
breathing_led_duration = dur;
}

#endif
@@ -263,22 +267,21 @@ ISR(TIMER1_COMPA_vect)
}
}

#ifdef BREATHING_LED_ENABLE
static uint8_t count = 0;
static uint8_t step[LED_COUNT] = {0};
if (breathing_led_state) {
if (++count > SOFTPWM_LED_FREQ) {
count = 0;
for (uint8_t i = 0; i < LED_COUNT; i++) {
if (breathing_led_state & LED_BIT(i)) {
if (++step[i] > breathing_led_duration[i]) {
step[i] = 0;
softpwm_led_ocr_buff[i] = pgm_read_byte(&breathing_table[breathing_led_index[i]]);
if (breathing_led_direction & LED_BIT(i)) {
breathing_led_decrease(i, 1);
#ifdef FADING_LED_ENABLE
static uint8_t fading_led_counter = 0;
static uint8_t fading_led_step = 0;
if (fading_led_state) {
if (++fading_led_counter > SOFTPWM_LED_FREQ) {
fading_led_counter = 0;
if (++fading_led_step > fading_led_duration) {
fading_led_step = 0;
for (uint8_t i = 0; i < LED_COUNT; i++) {
if (fading_led_state & LED_BIT(i)) {
if (fading_led_direction) {
softpwm_led_decrease(i, 1);
}
else {
breathing_led_increase(i, 1);
softpwm_led_increase(i, 1);
}
}
}
@@ -286,4 +289,41 @@ ISR(TIMER1_COMPA_vect)
}
}
#endif

#ifdef BREATHING_LED_ENABLE
static uint8_t breathing_led_counter = 0;
static uint8_t breathing_led_step = 0;
static uint8_t breathing_led_index = 0;
static uint8_t breathing_led_direction = 0;
if (breathing_led_state) {
if (++breathing_led_counter > SOFTPWM_LED_FREQ) {
breathing_led_counter = 0;
if (++breathing_led_step > breathing_led_duration) {
breathing_led_step = 0;
uint8_t value = pgm_read_byte(&breathing_table[breathing_led_index]);
for (uint8_t i = 0; i < LED_COUNT; i++) {
if (breathing_led_state & LED_BIT(i)) {
softpwm_led_ocr_buff[i] = value;
}
}
if (breathing_led_direction) {
if (breathing_led_index == 0) {
breathing_led_direction = 0;
}
else {
breathing_led_index--;
}
}
else {
if (breathing_led_index == 0x7F) {
breathing_led_direction = 1;
}
else {
breathing_led_index++;
}
}
}
}
}
#endif
}

+ 33
- 19
common/softpwm_led.h View File

@@ -14,18 +14,41 @@ void softpwm_led_disable(void);
void softpwm_led_toggle(void);
void softpwm_led_set(uint8_t index, uint8_t val);
void softpwm_led_set_all(uint8_t val);
void softpwm_led_increase(uint8_t index, uint8_t offset);
void softpwm_led_increase_all(uint8_t offset);
void softpwm_led_decrease(uint8_t index, uint8_t offset);
void softpwm_led_decrease_all(uint8_t offset);
void softpwm_led_on(uint8_t index);
void softpwm_led_off(uint8_t index);
uint8_t softpwm_led_get_state(void);
void softpwm_led_state_change(uint8_t state);

#ifdef BREATHING_LED_ENABLE
enum {
BREATHING_LED_NO = 0,
BREATHING_LED_UP,
BREATHING_LED_DOWN,
BREATHING_LED_CYCLE
FADING_LED_FADE_IN = 0,
FADING_LED_FADE_OUT
};
#ifdef FADING_LED_ENABLE
void fading_led_enable(uint8_t index);
void fading_led_enable_all(void);
void fading_led_disable(uint8_t index);
void fading_led_disable_all(void);
void fading_led_toggle(uint8_t index);
void fading_led_toggle_all(void);
void fading_led_set_direction(uint8_t dir);
void fading_led_set_duration(uint8_t dur);
#else
#define fading_led_enable()
#define fading_led_enable_all()
#define fading_led_disable()
#define fading_led_disable_all()
#define fading_led_toggle()
#define fading_led_toggle_all()
#define fading_led_set_direction()
#define fading_led_set_direction_all()
#define fading_led_set_duration()
#endif

#ifdef BREATHING_LED_ENABLE
#define breathing_led_init()
void breathing_led_enable(uint8_t index);
void breathing_led_enable_all(void);
@@ -33,14 +56,7 @@ void breathing_led_disable(uint8_t index);
void breathing_led_disable_all(void);
void breathing_led_toggle(uint8_t index);
void breathing_led_toggle_all(void);
void breathing_led_set_mode(uint8_t index, uint8_t mode);
void breathing_led_set_duration(uint8_t index, uint8_t dur);
void breathing_led_increase(uint8_t index, uint8_t offset);
void breathing_led_decrease(uint8_t index, uint8_t offset);
void breathing_led_set_mode_all(uint8_t mode);
void breathing_led_set_duration_all(uint8_t dur);
void breathing_led_increase_all(uint8_t offset);
void breathing_led_decrease_all(uint8_t offset);
void breathing_led_set_duration(uint8_t dur);
#else
#define breathing_led_init()
#define breathing_led_enable()
@@ -49,14 +65,8 @@ void breathing_led_decrease_all(uint8_t offset);
#define breathing_led_disable_all()
#define breathing_led_toggle()
#define breathing_led_toggle_all()
#define breathing_led_set_mode()
#define breathing_led_set_duration()
#define breathing_led_increase()
#define breathing_led_decrease()
#define breathing_led_set_mode_all()
#define breathing_led_set_duration_all()
#define breathing_led_increase_all()
#define breathing_led_decrease_all()
#endif

#else
@@ -68,6 +78,10 @@ void breathing_led_decrease_all(uint8_t offset);
#define softpwm_led_toggle()
#define softpwm_led_set()
#define softpwm_led_set_all()
#define softpwm_led_increase()
#define softpwm_led_increase_all()
#define softpwm_led_decrease()
#define softpwm_led_decrease_all()
#define softpwm_led_on()
#define softpwm_led_off()
#define softpwm_led_get_state()

+ 15
- 11
keyboard/gh60/backlight.c View File

@@ -112,6 +112,7 @@ void backlight_set(uint8_t level)
case 3:
backlight_enable();
#ifdef SOFTPWM_LED_ENABLE
fading_led_disable_all();
breathing_led_disable_all();
#else
breathing_led_disable();
@@ -124,8 +125,8 @@ void backlight_set(uint8_t level)
backlight_enable();
#ifdef SOFTPWM_LED_ENABLE
breathing_led_enable_all();
breathing_led_set_mode_all(BREATHING_LED_CYCLE);
breathing_led_set_duration_all(6 - level);
fading_led_disable_all();
breathing_led_set_duration(6 - level);
#else
breathing_led_enable();
breathing_led_set_duration(6 - level);
@@ -133,19 +134,22 @@ void backlight_set(uint8_t level)
break;
case 7:
backlight_enable();
breathing_led_enable_all();
breathing_led_set_mode_all(BREATHING_LED_UP);
breathing_led_set_duration_all(3);
fading_led_enable_all();
breathing_led_disable_all();
fading_led_set_direction(FADING_LED_FADE_IN);
fading_led_set_duration(3);
break;
case 8:
backlight_enable();
breathing_led_enable_all();
breathing_led_set_mode_all(BREATHING_LED_DOWN);
breathing_led_set_duration_all(3);
fading_led_enable_all();
breathing_led_disable_all();
fading_led_set_direction(FADING_LED_FADE_OUT);
fading_led_set_duration(3);
break;
case 0:
default:
#ifdef SOFTPWM_LED_ENABLE
fading_led_disable_all();
breathing_led_disable_all();
#else
breathing_led_disable();
@@ -221,16 +225,16 @@ void softpwm_led_off(uint8_t index)
#endif
#endif

void key_event(keyevent_t event)
void action_keyevent(keyevent_t event)
{
if (backlight_mode == 7) {
if (event.pressed) {
breathing_led_decrease_all(32);
softpwm_led_decrease_all(32);
}
}
if (backlight_mode == 8) {
if (event.pressed) {
breathing_led_increase_all(32);
softpwm_led_increase_all(32);
}
}
}

+ 1
- 1
keyboard/gh60/ledmap.c View File

@@ -8,7 +8,7 @@
static const uint8_t ledmaps[LED_COUNT] PROGMEM = {
#if defined(GH60_REV_CHN)
[0] = LEDMAP_CAPS_LOCK | LEDMAP_BACKLIGHT, // CapsLock - PB2
[1] = LEDMAP_LAYER(1) | LEDMAP_BACKLIGHT, // PWM - PB6
[1] = LEDMAP_LAYER(1), // PWM - PB6
#else
[0] = LEDMAP_CAPS_LOCK | LEDMAP_BACKLIGHT, // CapsLock - PB2
[1] = LEDMAP_BACKLIGHT, // Esc - GPIO1 - PF6