SymbX/feedbackd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fbd-dev-led: Rework color API

Browse Source 
Drop has_color API since supported colors are set during probing
and can be handled completely separately from the classes for
each type of hardware.

Rename set_color to set_supported_color because the usage
of this API is to check if the color is supported, but not
setting it. Setting the color is also separated from
start_periodic API to re-use multicolor across multiple LED types
with a set_color API. Multicolor LEDs are actually the same as
regular LEDs but they require a few additional sysfs entries to
actually set the color. Single color LEDs only have a single color
so the set_color method just returns TRUE for these LEDs.

Supported colors are advertised through the supports_color API now.
This way, each LED driver define which colors are supported
through supports_color API. RGB multicolor LEDs will report only fixed colors
like red, blue, green and white until the kernel can expose if a diffusor
is present to mix these colors.
This commit is contained in:
Dylan Van Assche
2024-06-09 11:21:19 +02:00
committed by Guido Günther
parent bcd37b0aa5
commit e43126b007
6 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fbd-dev-led.c
+43 -27
View File
@@ -16,11 +16,6 @@
#include <gio/gio.h>
#define LED_BRIGHTNESS_ATTR "brightness"
#define LED_MULTI_INDEX_ATTR "multi_index"
#define LED_MULTI_INDEX_RED "red"
#define LED_MULTI_INDEX_GREEN "green"
#define LED_MULTI_INDEX_BLUE "blue"
#define LED_MULTI_INTENSITY_ATTR "multi_intensity"
#define LED_PATTERN_ATTR "pattern"
enum {
@@ -98,10 +93,31 @@ fbd_dev_led_probe_default (FbdDevLed *led, GError **error)
static gboolean
fbd_dev_led_start_periodic_default (FbdDevLed *led,
FbdFeedbackLedColor color,
guint max_brightness_percentage,
guint freq)
fbd_dev_led_set_color_default (FbdDevLed *led,
FbdFeedbackLedColor color)
{
/* Ignore setting color as we have a single color only */
return TRUE;
}
static gboolean
fbd_dev_led_supports_color_default (FbdDevLed *led,
FbdFeedbackLedColor color)
{
FbdDevLedPrivate *priv;
g_return_val_if_fail (FBD_IS_DEV_LED (led), FALSE);
priv = fbd_dev_led_get_instance_private (led);
return priv->color == color;
}
static gboolean
fbd_dev_led_start_periodic_default (FbdDevLed *led,
guint max_brightness_percentage,
guint freq)
{
FbdDevLedPrivate *priv;
g_autoptr (GError) err = NULL;
@@ -127,18 +143,6 @@ fbd_dev_led_start_periodic_default (FbdDevLed *led,
}
static gboolean
fbd_dev_led_has_color_default (FbdDevLed *led, FbdFeedbackLedColor color)
{
FbdDevLedPrivate *priv;
g_return_val_if_fail (FBD_IS_DEV_LED (led), FALSE);
priv = fbd_dev_led_get_instance_private (led);
return priv->color == color;
}
static void
fbd_dev_led_set_property (GObject *object,
guint property_id,
@@ -221,7 +225,8 @@ fbd_dev_led_class_init (FbdDevLedClass *klass)
fbd_dev_led_class->probe = fbd_dev_led_probe_default;
fbd_dev_led_class->start_periodic = fbd_dev_led_start_periodic_default;
fbd_dev_led_class->has_color = fbd_dev_led_has_color_default;
fbd_dev_led_class->set_color = fbd_dev_led_set_color_default;
fbd_dev_led_class->supports_color = fbd_dev_led_supports_color_default;
props[PROP_DEV] =
g_param_spec_object ("dev", "", "",
@@ -265,7 +270,6 @@ fbd_dev_led_set_brightness (FbdDevLed *led, guint brightness)
gboolean
fbd_dev_led_start_periodic (FbdDevLed *led,
FbdFeedbackLedColor color,
guint max_brightness_percentage,
guint freq)
{
@@ -273,18 +277,30 @@ fbd_dev_led_start_periodic (FbdDevLed *led,
g_return_val_if_fail (FBD_IS_DEV_LED (led), FALSE);
return fbd_dev_led_class->start_periodic (led, color, max_brightness_percentage, freq);
return fbd_dev_led_class->start_periodic (led, max_brightness_percentage, freq);
}
gboolean
fbd_dev_led_has_color (FbdDevLed *led, FbdFeedbackLedColor color)
fbd_dev_led_set_color (FbdDevLed *led,
FbdFeedbackLedColor color)
{
FbdDevLedClass *fbd_dev_led_class = FBD_DEV_LED_GET_CLASS (led);
g_return_val_if_fail (FBD_IS_DEV_LED (led), FALSE);
return fbd_dev_led_class->has_color (led, color);
return fbd_dev_led_class->set_color (led, color);
}
gboolean
fbd_dev_led_supports_color (FbdDevLed *led, FbdFeedbackLedColor color)
{
FbdDevLedClass *fbd_dev_led_class = FBD_DEV_LED_GET_CLASS (led);
g_return_val_if_fail (FBD_IS_DEV_LED (led), FALSE);
return fbd_dev_led_class->supports_color (led, color);
}
@@ -314,7 +330,7 @@ fbd_dev_led_get_device (FbdDevLed *led)
void
fbd_dev_led_set_color (FbdDevLed *led, FbdFeedbackLedColor color)
fbd_dev_led_set_supported_color (FbdDevLed *led, FbdFeedbackLedColor color)
{
FbdDevLedPrivate *priv;