1
0
Fork 0

Brightness for Ergodox Infinity emulated LEDs

This commit is contained in:
Fred Sundvik 2017-04-02 02:29:50 +03:00
parent 39385144e7
commit 5fbaf31dc2
5 changed files with 63 additions and 23 deletions

View file

@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* number of backlight levels */ /* number of backlight levels */
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define LED_BRIGHTNESS_LO 15 #define LED_BRIGHTNESS_LO 100
#define LED_BRIGHTNESS_HI 255 #define LED_BRIGHTNESS_HI 255
/* define if matrix has ghost */ /* define if matrix has ghost */

View file

@ -99,7 +99,12 @@ typedef struct {
} visualizer_user_data_t; } visualizer_user_data_t;
// Don't access from visualization function, use the visualizer state instead // Don't access from visualization function, use the visualizer state instead
static visualizer_user_data_t user_data_keyboard = {}; static visualizer_user_data_t user_data_keyboard = {
.led_on = 0,
.led1 = LED_BRIGHTNESS_HI,
.led2 = LED_BRIGHTNESS_HI,
.led3 = LED_BRIGHTNESS_HI,
};
_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE,
"Please increase the VISUALIZER_USER_DATA_SIZE"); "Please increase the VISUALIZER_USER_DATA_SIZE");
@ -250,18 +255,21 @@ static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) {
return 0; return 0;
} }
void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) {
// Check the status here to start and stop animations switch (index) {
// You might have to save some state, like the current animation here so that you can start the right case 1:
// This function is called every time the status changes return user_data->led1;
case 2:
// NOTE that this is called from the visualizer thread, so don't access anything else outside the status return user_data->led2;
// This is also important because the slave won't have access to the active layer for example outside the case 3:
// status. return user_data->led3;
}
return 0;
}
static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) {
visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data;
visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status.user_data; visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data;
uint8_t new_index; uint8_t new_index;
uint8_t old_index; uint8_t old_index;
@ -277,27 +285,41 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard
uint8_t new_secondary_index = get_secondary_led_index(user_data_new); uint8_t new_secondary_index = get_secondary_led_index(user_data_new);
uint8_t old_secondary_index = get_secondary_led_index(user_data_old); uint8_t old_secondary_index = get_secondary_led_index(user_data_old);
uint8_t old_brightness = get_brightness(user_data_old, old_index);
uint8_t new_brightness = get_brightness(user_data_new, new_index);
uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index);
uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index);
if (lcd_state == LCD_STATE_INITIAL || if (lcd_state == LCD_STATE_INITIAL ||
new_index != old_index || new_index != old_index ||
new_secondary_index != old_secondary_index) { new_secondary_index != old_secondary_index ||
new_brightness != old_brightness ||
new_secondary_brightness != old_secondary_brightness) {
if (new_secondary_index != 0) { if (new_secondary_index != 0) {
state->target_lcd_color = led_emulation_colors[new_index]; state->target_lcd_color = change_lcd_color_intensity(
next_led_target_color = led_emulation_colors[new_secondary_index]; led_emulation_colors[new_index], new_brightness);
next_led_target_color = change_lcd_color_intensity(
led_emulation_colors[new_secondary_index], new_secondary_brightness);
stop_keyframe_animation(&one_led_color); stop_keyframe_animation(&one_led_color);
start_keyframe_animation(&two_led_colors); start_keyframe_animation(&two_led_colors);
} else { } else {
state->target_lcd_color = led_emulation_colors[new_index]; state->target_lcd_color = change_lcd_color_intensity(
led_emulation_colors[new_index], new_brightness);
stop_keyframe_animation(&two_led_colors); stop_keyframe_animation(&two_led_colors);
start_keyframe_animation(&one_led_color); start_keyframe_animation(&one_led_color);
} }
} }
}
static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) {
if (state->status.leds) { if (state->status.leds) {
if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || if (lcd_state != LCD_STATE_BITMAP_AND_LEDS ||
state->status.leds != prev_status.leds || state->status.leds != prev_status->leds ||
state->status.layer != prev_status.layer || state->status.layer != prev_status->layer ||
state->status.default_layer != prev_status.default_layer) { state->status.default_layer != prev_status->default_layer) {
// NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case
stop_keyframe_animation(&lcd_bitmap_animation); stop_keyframe_animation(&lcd_bitmap_animation);
@ -310,8 +332,8 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard
} }
} else { } else {
if (lcd_state != LCD_STATE_LAYER_BITMAP || if (lcd_state != LCD_STATE_LAYER_BITMAP ||
state->status.layer != prev_status.layer || state->status.layer != prev_status->layer ||
state->status.default_layer != prev_status.default_layer) { state->status.default_layer != prev_status->default_layer) {
stop_keyframe_animation(&lcd_bitmap_leds_animation); stop_keyframe_animation(&lcd_bitmap_leds_animation);
@ -321,6 +343,20 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard
} }
} }
void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) {
// Check the status here to start and stop animations
// You might have to save some state, like the current animation here so that you can start the right
// This function is called every time the status changes
// NOTE that this is called from the visualizer thread, so don't access anything else outside the status
// This is also important because the slave won't have access to the active layer for example outside the
// status.
update_emulated_leds(state, prev_status);
update_lcd_text(state, prev_status);
}
void user_visualizer_suspend(visualizer_state_t* state) { void user_visualizer_suspend(visualizer_state_t* state) {
state->layer_text = "Suspending..."; state->layer_text = "Suspending...";
uint8_t hue = LCD_HUE(state->current_lcd_color); uint8_t hue = LCD_HUE(state->current_lcd_color);

View file

@ -32,6 +32,10 @@ SOFTWARE.
#define LCD_SAT(color) ((color >> 8) & 0xFF) #define LCD_SAT(color) ((color >> 8) & 0xFF)
#define LCD_INT(color) (color & 0xFF) #define LCD_INT(color) (color & 0xFF)
inline uint32_t change_lcd_color_intensity(uint32_t color, uint8_t new_intensity) {
return (color & 0xFFFFFF00) | new_intensity;
}
void lcd_backlight_init(void); void lcd_backlight_init(void);
void lcd_backlight_color(uint8_t hue, uint8_t saturation, uint8_t intensity); void lcd_backlight_color(uint8_t hue, uint8_t saturation, uint8_t intensity);
void lcd_backlight_brightness(uint8_t b); void lcd_backlight_brightness(uint8_t b);

View file

@ -484,7 +484,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
else { else {
visualizer_keyboard_status_t prev_status = state.status; visualizer_keyboard_status_t prev_status = state.status;
state.status = current_status; state.status = current_status;
update_user_visualizer_state(&state, prev_status); update_user_visualizer_state(&state, &prev_status);
} }
state.prev_lcd_color = state.current_lcd_color; state.prev_lcd_color = state.current_lcd_color;
} }

View file

@ -156,7 +156,7 @@ void visualizer_set_user_data(void* user_data);
// These functions have to be implemented by the user // These functions have to be implemented by the user
void initialize_user_visualizer(visualizer_state_t* state); void initialize_user_visualizer(visualizer_state_t* state);
void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status); void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status);
void user_visualizer_suspend(visualizer_state_t* state); void user_visualizer_suspend(visualizer_state_t* state);
void user_visualizer_resume(visualizer_state_t* state); void user_visualizer_resume(visualizer_state_t* state);