summaryrefslogtreecommitdiff
path: root/app/src/behaviors
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2021-02-02 14:50:02 -0500
committerPete Johanson <peter@peterjohanson.com>2021-02-09 01:27:50 -0500
commit2af794eed3fe03b3c3ab904bb02b3953d234adc0 (patch)
treec55adef1b046a31ee1e2ff9907eaef1768132c6c /app/src/behaviors
parente6f168d6dfe0a27407a7229a549f2dbab37b0f2d (diff)
feat(underglow): Convert HSB changes to absolute.
* Public type for HSB led color. * New API for calculating "next" HSB based on current state. * Update behavior to convert the increment/decrement commands to absolute command as well.
Diffstat (limited to 'app/src/behaviors')
-rw-r--r--app/src/behaviors/behavior_rgb_underglow.c54
1 files changed, 50 insertions, 4 deletions
diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c
index fe33e04..79592ca 100644
--- a/app/src/behaviors/behavior_rgb_underglow.c
+++ b/app/src/behaviors/behavior_rgb_underglow.c
@@ -33,12 +33,57 @@ on_keymap_binding_convert_central_state_dependent_params(struct zmk_behavior_bin
}
binding->param1 = state ? RGB_OFF_CMD : RGB_ON_CMD;
- LOG_DBG("RGB relative toggle convert to absolute %s", state ? "OFF" : "ON");
- return 0;
+ break;
+ }
+ case RGB_BRI_CMD: {
+ struct zmk_led_hsb color = zmk_rgb_underglow_calc_brt(1);
+
+ binding->param1 = RGB_COLOR_HSB_CMD;
+ binding->param2 = RGB_COLOR_HSB_VAL(color.h, color.s, color.b);
+ break;
+ }
+ case RGB_BRD_CMD: {
+ struct zmk_led_hsb color = zmk_rgb_underglow_calc_brt(-1);
+
+ binding->param1 = RGB_COLOR_HSB_CMD;
+ binding->param2 = RGB_COLOR_HSB_VAL(color.h, color.s, color.b);
+ break;
+ }
+ case RGB_HUI_CMD: {
+ struct zmk_led_hsb color = zmk_rgb_underglow_calc_hue(1);
+
+ binding->param1 = RGB_COLOR_HSB_CMD;
+ binding->param2 = RGB_COLOR_HSB_VAL(color.h, color.s, color.b);
+ break;
+ }
+ case RGB_HUD_CMD: {
+ struct zmk_led_hsb color = zmk_rgb_underglow_calc_hue(-1);
+
+ binding->param1 = RGB_COLOR_HSB_CMD;
+ binding->param2 = RGB_COLOR_HSB_VAL(color.h, color.s, color.b);
+ break;
+ }
+ case RGB_SAI_CMD: {
+ struct zmk_led_hsb color = zmk_rgb_underglow_calc_sat(1);
+
+ binding->param1 = RGB_COLOR_HSB_CMD;
+ binding->param2 = RGB_COLOR_HSB_VAL(color.h, color.s, color.b);
+ break;
+ }
+ case RGB_SAD_CMD: {
+ struct zmk_led_hsb color = zmk_rgb_underglow_calc_sat(-1);
+
+ binding->param1 = RGB_COLOR_HSB_CMD;
+ binding->param2 = RGB_COLOR_HSB_VAL(color.h, color.s, color.b);
+ break;
}
default:
return 0;
}
+
+ LOG_DBG("RGB relative convert to absolute (%d/%d)", binding->param1, binding->param2);
+
+ return 0;
};
static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
@@ -71,8 +116,9 @@ static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
case RGB_EFR_CMD:
return zmk_rgb_underglow_cycle_effect(-1);
case RGB_COLOR_HSB_CMD:
- return zmk_rgb_underglow_set_hsb((binding->param2 >> 16) & 0xFFFF,
- (binding->param2 >> 8) & 0xFF, binding->param2 & 0xFF);
+ return zmk_rgb_underglow_set_hsb((struct zmk_led_hsb){.h = (binding->param2 >> 16) & 0xFFFF,
+ .s = (binding->param2 >> 8) & 0xFF,
+ .b = binding->param2 & 0xFF});
}
return -ENOTSUP;