summaryrefslogtreecommitdiffstats
path: root/keyboards/planck
diff options
context:
space:
mode:
authorBalz Guenat <balz.guenat@gmail.com>2018-01-01 23:47:51 +0100
committerJack Humbert <jack.humb@gmail.com>2018-01-01 23:47:51 +0100
commit4931510ad38aadb1769c9241bfad0c3d77ad687f (patch)
treeb2e23ebbde408a3f6580b34e8cf3332346e7c3f3 /keyboards/planck
parentd6215ad6aff3857cea8a6877b56a547a76ab13ac (diff)
downloadqmk_firmware-4931510ad38aadb1769c9241bfad0c3d77ad687f.tar.gz
qmk_firmware-4931510ad38aadb1769c9241bfad0c3d77ad687f.tar.xz
backlight breathing overhaul (#2187)
* add breathing to bananasplit * backlight breathing overhaul * fix the backlight_tick thing. * fix for vision_division backlight * fix a few keymaps and probably break breathing for some weirdly set-up boards. * remove BL_x keycodes because they made unreasonable assumptions * some fixes for BL keycodes * integer cie lightness scaling * use cie lightness for non-breathing backlight and make breathing able to reach true max brightness
Diffstat (limited to 'keyboards/planck')
-rw-r--r--keyboards/planck/keymaps/cbbrowne/keymap.c4
-rw-r--r--keyboards/planck/keymaps/experimental/keymap.c4
-rw-r--r--keyboards/planck/keymaps/khord/keymap.c4
-rw-r--r--keyboards/planck/keymaps/pvc/keymap.c12
-rw-r--r--keyboards/planck/keymaps/zach/zach_common_functions.c2
-rwxr-xr-xkeyboards/planck/keymaps/zrichard/keymap.c12
6 files changed, 19 insertions, 19 deletions
diff --git a/keyboards/planck/keymaps/cbbrowne/keymap.c b/keyboards/planck/keymaps/cbbrowne/keymap.c
index d1214dda1..9bae6fb50 100644
--- a/keyboards/planck/keymaps/cbbrowne/keymap.c
+++ b/keyboards/planck/keymaps/cbbrowne/keymap.c
@@ -220,7 +220,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
layer_on(_RAISE);
#ifdef BACKLIGHT_ENABLE
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
#endif
update_tri_layer(_LOWER, _RAISE, _ADJUST);
@@ -236,7 +236,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
layer_on(_LOWER);
#ifdef BACKLIGHT_ENABLE
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
#endif
update_tri_layer(_LOWER, _RAISE, _ADJUST);
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c
index 272c09332..feeb137fa 100644
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@@ -242,7 +242,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
layer_on(_LOWER);
#ifdef BACKLIGHT_ENABLE
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
#endif
update_tri_layer(_LOWER, _RAISE, _ADJUST);
@@ -256,7 +256,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
layer_on(_RAISE);
#ifdef BACKLIGHT_ENABLE
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
#endif
update_tri_layer(_LOWER, _RAISE, _ADJUST);
diff --git a/keyboards/planck/keymaps/khord/keymap.c b/keyboards/planck/keymaps/khord/keymap.c
index c8022a389..c515a0d36 100644
--- a/keyboards/planck/keymaps/khord/keymap.c
+++ b/keyboards/planck/keymaps/khord/keymap.c
@@ -128,12 +128,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
break;
case MACRO_BREATH_SPEED_INC:
if (record->event.pressed) {
- breathing_speed_inc(1);
+ breathing_period_inc();
}
break;
case MACRO_BREATH_SPEED_DEC:
if (record->event.pressed) {
- breathing_speed_dec(1);
+ breathing_period_dec();
}
break;
case MACRO_BREATH_DEFAULT:
diff --git a/keyboards/planck/keymaps/pvc/keymap.c b/keyboards/planck/keymaps/pvc/keymap.c
index 60f6d925a..820018af6 100644
--- a/keyboards/planck/keymaps/pvc/keymap.c
+++ b/keyboards/planck/keymaps/pvc/keymap.c
@@ -323,14 +323,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case MACRO_BREATH_SPEED_INC:
if (record->event.pressed)
{
- breathing_speed_inc(1);
+ breathing_period_inc();
}
break;
case MACRO_BREATH_SPEED_DEC:
if (record->event.pressed)
{
- breathing_speed_dec(1);
+ breathing_period_dec();
}
break;
@@ -352,7 +352,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed)
{
layer_on(LAYER_UPPER);
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
}
@@ -367,7 +367,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed)
{
layer_on(LAYER_LOWER);
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
}
@@ -381,13 +381,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case MACRO_FUNCTION:
if (record->event.pressed)
{
- breathing_speed_set(3);
+ breathing_period_set(3);
breathing_enable();
layer_on(LAYER_FUNCTION);
}
else
{
- breathing_speed_set(1);
+ breathing_period_set(1);
breathing_self_disable();
layer_off(LAYER_FUNCTION);
}
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index f824b4033..e6aeaa50a 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -270,7 +270,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
PLAY_SONG(tone_ctrl_mod);
#endif
#ifdef BACKLIGHT_BREATHING
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
#endif
}
diff --git a/keyboards/planck/keymaps/zrichard/keymap.c b/keyboards/planck/keymaps/zrichard/keymap.c
index c40492f5e..cf4478cee 100755
--- a/keyboards/planck/keymaps/zrichard/keymap.c
+++ b/keyboards/planck/keymaps/zrichard/keymap.c
@@ -332,14 +332,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case MACRO_BREATH_SPEED_INC:
if (record->event.pressed)
{
- breathing_speed_inc(1);
+ breathing_period_inc();
}
break;
case MACRO_BREATH_SPEED_DEC:
if (record->event.pressed)
{
- breathing_speed_dec(1);
+ breathing_period_dec();
}
break;
@@ -361,7 +361,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed)
{
layer_on(LAYER_UPPER);
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
}
@@ -376,7 +376,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed)
{
layer_on(LAYER_LOWER);
- breathing_speed_set(2);
+ breathing_period_set(2);
breathing_pulse();
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
}
@@ -390,13 +390,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case MACRO_FUNCTION:
if (record->event.pressed)
{
- breathing_speed_set(3);
+ breathing_period_set(3);
breathing_enable();
layer_on(LAYER_FUNCTION);
}
else
{
- breathing_speed_set(1);
+ breathing_period_set(1);
breathing_self_disable();
layer_off(LAYER_FUNCTION);
}