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

Simplifiy breathing led feature and code

yuk86
Kai Ryu 10 years ago
parent
e26869d70a
commit
f82a77cc15
8 changed files with 70 additions and 229 deletions
Split View Show Diff Stats
  1. 4
    32
      common/backlight.c
  2. 0
    3
      common/backlight.h
  3. 15
    45
      common/breathing_led.c
  4. 4
    18
      common/breathing_led.h
  5. 0
    8
      common/eeconfig.c
  6. 0
    6
      common/eeconfig.h
  7. 41
    114
      keyboard/gh60/backlight.c
  8. 6
    3
      keyboard/gh60/config.h

+ 4
- 32
common/backlight.c View File

@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "backlight.h"
#include "breathing_led.h"
#include "eeconfig.h"
#include "debug.h"

@@ -34,7 +33,7 @@ void backlight_init(void)

void backlight_increase(void)
{
#if defined(BACKLIGHT_CUSTOM) || defined(BREATHING_LED_ENABLE)
#ifdef BACKLIGHT_CUSTOM
if (backlight_config.enable) {
if (backlight_config.level < BACKLIGHT_LEVELS) {
backlight_config.level++;
@@ -43,9 +42,6 @@ void backlight_increase(void)
dprintf("backlight custom increase: %u\n", backlight_config.level);
backlight_set(backlight_config.level);
}
#ifdef BREATHING_LED_ENABLE
breathing_led_increase();
#endif
#else
if(backlight_config.level < BACKLIGHT_LEVELS)
{
@@ -60,7 +56,7 @@ void backlight_increase(void)

void backlight_decrease(void)
{
#if defined(BACKLIGHT_CUSTOM) || defined(BREATHING_LED_ENABLE)
#ifdef BACKLIGHT_CUSTOM
if (backlight_config.enable) {
if(backlight_config.level > 1)
{
@@ -70,9 +66,6 @@ void backlight_decrease(void)
dprintf("backlight custom decrease: %u\n", backlight_config.level);
backlight_set(backlight_config.level);
}
#ifdef BREATHING_LED_ENABLE
breathing_led_decrease();
#endif
#else
if(backlight_config.level > 0)
{
@@ -87,37 +80,16 @@ void backlight_decrease(void)

void backlight_toggle(void)
{
#ifdef BREATHING_LED_ENABLE
if (breathing_led_is_enabled()) {
breathing_led_disable();
backlight_disable();
return;
}
#endif
backlight_config.enable ^= 1;
if (backlight_config.enable) {
#if defined(BACKLIGHT_CUSTOM) || defined(BREATHING_LED_ENABLE)
backlight_enable();
#endif
if (backlight_config.enable)
{
if (backlight_config.level == 0) {
backlight_config.level = 1;
}
}
else {
#ifndef BREATHING_LED_ENABLE
#ifdef BACKLIGHT_CUSTOM
backlight_disable();
#endif
#endif
}
eeconfig_write_backlight(backlight_config.raw);
dprintf("backlight toggle: %u\n", backlight_config.enable);
backlight_set(backlight_config.enable ? backlight_config.level : 0);
#ifdef BREATHING_LED_ENABLE
if (!backlight_config.enable) {
breathing_led_enable();
}
#endif
}

void backlight_step(void)

+ 0
- 3
common/backlight.h View File

@@ -36,9 +36,6 @@ void backlight_decrease(void);
void backlight_toggle(void);
void backlight_step(void);

void backlight_enable(void);
void backlight_disable(void);
void backlight_set(uint8_t level);
void backlight_set_raw(uint8_t raw);

#endif

+ 15
- 45
common/breathing_led.c View File

@@ -1,22 +1,20 @@
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "led.h"
#include "breathing_led.h"
#include "backlight.h"
#include "debug.h"

#define BREATHING_LED_TIMER_TOP F_CPU/256

breathing_led_config_t breathing_led_config;
static uint8_t breathing_led_duration = 0;

void breathing_led_init(void)
{
/* Timer3 setup */
/* CTC mode */
TCCR3B |= _BV(WGM32);
TCCR3B |= (1<<WGM32);
/* Clock selelct: clk/8 */
TCCR3B |= _BV(CS30);
TCCR3B |= (1<<CS30);
/* Set TOP value */
uint8_t sreg = SREG;
cli();
@@ -25,59 +23,31 @@ void breathing_led_init(void)
SREG = sreg;
}

bool breathing_led_is_enabled(void)
{
return breathing_led_config.enable;
}

void breathing_led_enable(void)
{
/* Enable Compare Match Interrupt */
TIMSK3 |= _BV(OCIE3A);
breathing_led_config.enable = true;
dprintf("breathing led on: %u\n", breathing_led_config.enable);
eeconfig_write_breathing_led(breathing_led_config.raw);
TIMSK3 |= (1<<OCIE3A);
dprintf("breathing led on: %u\n", TIMSK3 & (1<<OCIE3A));
}

void breathing_led_disable(void)
{
/* Disable Compare Match Interrupt */
TIMSK3 &= ~_BV(OCIE3A);
breathing_led_config.enable = false;
dprintf("breathing led off: %u\n", breathing_led_config.enable);
eeconfig_write_breathing_led(breathing_led_config.raw);
TIMSK3 &= ~(1<<OCIE3A);
dprintf("breathing led off: %u\n", TIMSK3 & (1<<OCIE3A));
}

void breathing_led_toggle(void)
{
/* Disable Compare Match Interrupt */
TIMSK3 ^= _BV(OCIE3A);
breathing_led_config.enable ^= 1;
dprintf("breathing led toggle: %u\n", breathing_led_config.enable);
eeconfig_write_breathing_led(breathing_led_config.raw);
}

void breathing_led_increase(void)
{
if (breathing_led_config.enable) {
if (breathing_led_config.level < BREATHING_LED_LEVELS) {
breathing_led_config.level++;
eeconfig_write_breathing_led(breathing_led_config.raw);
}
dprintf("breathing led speed increase: %u\n", breathing_led_config.level);
}
TIMSK3 ^= (1<<OCIE3A);
dprintf("breathing led toggle: %u\n", TIMSK3 & (1<<OCIE3A));
}

void breathing_led_decrease(void)
void breathing_led_set_duration(uint8_t dur)
{
if (breathing_led_config.enable) {
if (breathing_led_config.level > 0)
{
breathing_led_config.level--;
eeconfig_write_breathing_led(breathing_led_config.raw);
}
dprintf("breathing led speed decrease: %u\n", breathing_led_config.level);
}
breathing_led_duration = dur;
dprintf("breathing led set duration: %u\n", breathing_led_duration);
}

/* Breathing LED brighness(PWM On period) table
@@ -87,7 +57,7 @@ void breathing_led_decrease(void)
* (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[256] 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, 255, 255, 255, 255, 254, 253, 252, 251, 250, 248, 247, 245, 243, 241, 239, 236, 234, 231, 228, 226, 223, 219, 216, 213, 210, 206, 203, 199, 195, 192, 188, 184, 180, 176, 173, 169, 165, 161, 157, 153, 149, 145, 142, 138, 134, 130, 126, 123, 119, 116, 112, 108, 105, 102, 98, 95, 92, 89, 86, 83, 80, 77, 74, 71, 68, 66, 63, 61, 58, 56, 53, 51, 49, 47, 45, 43, 41, 39, 37, 35, 34, 32, 30, 29, 27, 26, 25, 23, 22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 11, 10, 9, 8, 8, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
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, 255, 255, 255, 255, 254, 253, 252, 251, 250, 248, 247, 245, 243, 241, 239, 236, 234, 231, 228, 226, 223, 219, 216, 213, 210, 206, 203, 199, 195, 192, 188, 184, 180, 176, 173, 169, 165, 161, 157, 153, 149, 145, 142, 138, 134, 130, 126, 123, 119, 116, 112, 108, 105, 102, 98, 95, 92, 89, 86, 83, 80, 77, 74, 71, 68, 66, 63, 61, 58, 56, 53, 51, 49, 47, 45, 43, 41, 39, 37, 35, 34, 32, 30, 29, 27, 26, 25, 23, 22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 11, 10, 9, 8, 8, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0
};

ISR(TIMER3_COMPA_vect)
@@ -95,9 +65,9 @@ ISR(TIMER3_COMPA_vect)
static uint8_t index = 0;
static uint8_t step = 0;
step++;
if (step >= BREATHING_LED_LEVELS - breathing_led_config.level) {
if (step > breathing_led_duration) {
step = 0;
backlight_set_raw(pgm_read_byte(&breathing_table[index]));
breathing_led_set_raw(pgm_read_byte(&breathing_table[index]));
index++;
}
}

+ 4
- 18
common/breathing_led.h View File

@@ -4,28 +4,12 @@

#ifdef BREATHING_LED_ENABLE

#include <stdint.h>
#include <stdbool.h>

#ifndef BREATHING_LED_LEVEL
#define BREATHING_LED_LEVEL 1
#endif

typedef union {
uint8_t raw;
struct {
bool enable:1;
uint8_t level:7;
};
} breathing_led_config_t;

void breathing_led_init(void);
bool breathing_led_is_enabled(void);
void breathing_led_enable(void);
void breathing_led_disable(void);
void breathing_led_toggle(void);
void breathing_led_increase(void);
void breathing_led_decrease(void);
void breathing_led_set_duration(uint8_t dur);
void breathing_led_set_raw(uint8_t raw);

#else

@@ -33,6 +17,8 @@ void breathing_led_decrease(void);
#define breathing_led_enable()
#define breathing_led_disable()
#define breathing_led_toggle()
#define breathing_led_set_duration()
#define breathing_led_set_raw()

#endif


+ 0
- 8
common/eeconfig.c View File

@@ -14,9 +14,6 @@ void eeconfig_init(void)
#ifdef BACKLIGHT_ENABLE
eeprom_write_byte(EECONFIG_BACKLIGHT, 0);
#endif
#ifdef BREATHING_LED_ENABLE
eeprom_write_byte(EECONFIG_BREATHING_LED, 0);
#endif
#ifdef KEYMAP_EX_ENABLE
keymap_ex_init();
#endif
@@ -53,8 +50,3 @@ void eeconfig_write_keymap(uint8_t val) { eeprom_write_byte(EECONFIG_KEYMAP, val
uint8_t eeconfig_read_backlight(void) { return eeprom_read_byte(EECONFIG_BACKLIGHT); }
void eeconfig_write_backlight(uint8_t val) { eeprom_write_byte(EECONFIG_BACKLIGHT, val); }
#endif

#ifdef BREATHING_LED_ENABLE
uint8_t eeconfig_read_breathing_led(void) { return eeprom_read_byte(EECONFIG_BREATHING_LED); }
void eeconfig_write_breathing_led(uint8_t val) { eeprom_write_byte(EECONFIG_BREATHING_LED, val); }
#endif

+ 0
- 6
common/eeconfig.h View File

@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EECONFIG_KEYMAP (uint8_t *)4
#define EECONFIG_MOUSEKEY_ACCEL (uint8_t *)5
#define EECONFIG_BACKLIGHT (uint8_t *)6
#define EECONFIG_BREATHING_LED (uint8_t *)7


/* debug bit */
@@ -72,9 +71,4 @@ uint8_t eeconfig_read_backlight(void);
void eeconfig_write_backlight(uint8_t val);
#endif

#ifdef BREATHING_LED_ENABLE
uint8_t eeconfig_read_breathing_led(void);
void eeconfig_write_breathing_led(uint8_t val);
#endif

#endif

+ 41
- 114
keyboard/gh60/backlight.c View File

@@ -19,21 +19,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "backlight.h"
#include "debug.h"
#include "breathing_led.h"

#ifndef GH60_REV_CHN
#ifdef GH60_REV_CHN
#else
#define SOFTPWM_TIMER_TOP F_CPU/(256*64)
uint8_t softpwm_ocr = 0;
uint8_t softpwm_ocr_buff = 0;
#endif

#if defined(BREATHING_LED_ENABLE) || defined(BACKLIGHT_CUSTOM)
static const uint8_t backlight_table[] PROGMEM = {
0, 16, 128, 255
};

/* Backlight pin configuration
* PWM: PB6
* PWM: PB6 (Rev.CHN)
* GPIO: PF7 PF6 PF5 PF4 (Rev.B)
*/
void backlight_enable(void)
{
@@ -80,16 +81,50 @@ void backlight_disable(void)

void backlight_set(uint8_t level)
{
#ifdef BREATHING_LED_ENABLE
switch (level) {
case 1:
case 2:
case 3:
backlight_enable();
breathing_led_disable();
backlight_set_raw(pgm_read_byte(&backlight_table[level]));
break;
case 4:
case 5:
case 6:
backlight_enable();
breathing_led_enable();
breathing_led_set_duration(6 - level);
break;
case 0:
default:
breathing_led_disable();
backlight_disable();
break;
}
#else
if (level > 0) {
backlight_enable();
backlight_set_raw(pgm_read_byte(&backlight_table[level]));
}
else {
backlight_disable();
}
#endif
}

void backlight_set_raw(uint8_t raw)
#ifdef BREATHING_LED_ENABLE
void breathing_led_set_raw(uint8_t raw)
{
backlight_set_raw(raw);
}
#endif

inline void backlight_set_raw(uint8_t raw)
{
#if defined(GH60_REV_CHN)
OCR1B = raw;

#else
softpwm_ocr_buff = raw;
#endif
@@ -113,112 +148,4 @@ ISR(TIMER1_COMPA_vect)
PORTF |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
}
}
/*
ISR(TIMER1_COMPA_vect)
{
// LED off
PORTF |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
}
ISR(TIMER1_OVF_vect)
{
// LED on
if (OCR1A > 15) {
PORTF &= ~(1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
}
}
*/
#endif
#else
#if defined(GH60_REV_CHN)
static const uint8_t backlight_table[] PROGMEM = {
0, 16, 128, 255
};

/* Backlight pin configuration
* PWM: PB7
*/
void backlight_set(uint8_t level)
{
if (level > 0) {
// Turn on PWM
cli();
DDRB |= (1<<PB6);
TCCR1A |= ( (1<<WGM10) | (1<<COM1B1) );
TCCR1B |= ( (1<<CS11) | (1<<CS10) );
sei();
// Set PWM
OCR1B = pgm_read_byte(&backlight_table[level]);
}
else {
// Turn off PWM
cli();
DDRB &= ~(1<<PB6);
TCCR1A &= ~( (1<<WGM10) | (1<<COM1B1) );
TCCR1B &= ~( (1<<CS11) | (1<<CS10) );
sei();
// Set PWM
OCR1B = 0;
}
}
#elif #defined(GH60_REV_CNY)
static const uint8_t backlight_table[] PROGMEM = {
0, 16, 128, 255
};

void backlight_set(uint8_t level)
{
if (level > 0) {
led_matrix_disable();
for (uint8_t row = 0; row < LED_MATRIX_ROWS; row++) {
for (uint8_t col = 0; col < LED_MATRIX_COLS; col++) {
led_matrix_set_value(row, col, pgm_read_byte(&backlight_table[level]));
}
}
led_matrix_enable();
}
else {
led_matrix_disable();
}
}
#else
static const uint8_t backlight_table[] PROGMEM = {
0, 16, 128, 255
};

void backlight_set(uint8_t level)
{
if (level > 0) {
DDRF |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
PORTF |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
cli();
TCCR1A |= (1<<WGM10);
TCCR1B |= ((1<<CS11) | (1<<CS10));
TIMSK1 |= ((1<<OCIE1A) | (1<<TOIE1));
TIFR1 |= (1<<TOV1);
sei();
OCR1A = pgm_read_byte(&backlight_table[level]);
}
else {
DDRF &= ~(1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
cli();
TCCR1A &= ~(1<<WGM10);
TCCR1B &= ~((1<<CS11) | (1<<CS10));
TIMSK1 |= ((1<<OCIE1A) | (1<<TOIE1));
TIFR1 |= (1<<TOV1);
sei();
OCR1A = 0;
}
}

ISR(TIMER1_COMPA_vect)
{
// LED off
PORTF |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
}
ISR(TIMER1_OVF_vect)
{
// LED on
PORTF &= ~(1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
}
#endif
#endif

+ 6
- 3
keyboard/gh60/config.h View File

@@ -42,12 +42,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBOUNCE 5

/* number of backlight levels */
#ifdef BREATHING_LED_ENABLE
#define BACKLIGHT_LEVELS 6
#else
#define BACKLIGHT_LEVELS 3
#define BREATHING_LED_LEVELS 5
#endif

#ifdef GH60_REV_CNY
# define LED_MATRIX_ROWS 6
# define LED_MATRIX_COLS 14
#define LED_MATRIX_ROWS 6
#define LED_MATRIX_COLS 14
#endif

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */