Refactor IS31FL3741 driver gamma settings
This commit is contained in:
Kuba Birecki
parent
88882ab417
commit
35e269ee8d
2 changed files with 60 additions and 48 deletions
|
|
@ -39,17 +39,20 @@ struct is31fl3741_config {
|
|||
char *sdb_port;
|
||||
gpio_pin_t sdb_pin;
|
||||
gpio_dt_flags_t sdb_flags;
|
||||
uint8_t *px_buffer;
|
||||
size_t px_buffer_size;
|
||||
uint8_t gcc;
|
||||
uint8_t sws;
|
||||
uint16_t *rgb_map;
|
||||
uint8_t (*gamma)[256];
|
||||
uint8_t *gamma;
|
||||
uint8_t scaling_red;
|
||||
uint8_t scaling_blue;
|
||||
uint8_t scaling_green;
|
||||
};
|
||||
|
||||
struct is31fl3741_data {
|
||||
const struct device *i2c;
|
||||
const struct device *gpio;
|
||||
uint8_t *px_buffer;
|
||||
};
|
||||
|
||||
static int is31fl3741_reg_write(const struct device *dev, uint8_t addr, uint8_t value) {
|
||||
|
|
@ -133,9 +136,7 @@ static int is31fl3741_strip_update_channels(const struct device *dev, uint8_t *c
|
|||
static int is31fl3741_strip_update_rgb(const struct device *dev, struct led_rgb *pixels,
|
||||
size_t num_pixels) {
|
||||
const struct is31fl3741_config *config = dev->config;
|
||||
|
||||
uint8_t *px_buffer = config->px_buffer;
|
||||
uint16_t *rgb_map = config->rgb_map;
|
||||
struct is31fl3741_data *data = dev->data;
|
||||
|
||||
size_t i = 0;
|
||||
size_t j = 0;
|
||||
|
|
@ -145,14 +146,14 @@ static int is31fl3741_strip_update_rgb(const struct device *dev, struct led_rgb
|
|||
}
|
||||
|
||||
while (i < num_pixels) {
|
||||
px_buffer[rgb_map[j++]] = config->gamma[0][pixels[i].r];
|
||||
px_buffer[rgb_map[j++]] = config->gamma[1][pixels[i].g];
|
||||
px_buffer[rgb_map[j++]] = config->gamma[2][pixels[i].b];
|
||||
data->px_buffer[config->rgb_map[j++]] = config->gamma[pixels[i].r];
|
||||
data->px_buffer[config->rgb_map[j++]] = config->gamma[pixels[i].g];
|
||||
data->px_buffer[config->rgb_map[j++]] = config->gamma[pixels[i].b];
|
||||
|
||||
++i;
|
||||
}
|
||||
|
||||
return is31fl3741_strip_update_channels(dev, px_buffer, config->px_buffer_size);
|
||||
return is31fl3741_strip_update_channels(dev, data->px_buffer, config->px_buffer_size);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -164,8 +165,8 @@ static int is31fl3741_strip_update_rgb(const struct device *dev, struct led_rgb
|
|||
* Function and scaling registers are then pre-configured based on devicetree settings.
|
||||
*/
|
||||
int static is31fl3741_init(const struct device *dev) {
|
||||
struct is31fl3741_data *data = dev->data;
|
||||
const struct is31fl3741_config *config = dev->config;
|
||||
struct is31fl3741_data *data = dev->data;
|
||||
|
||||
data->i2c = device_get_binding(config->bus);
|
||||
|
||||
|
|
@ -208,24 +209,28 @@ int static is31fl3741_init(const struct device *dev) {
|
|||
(config->sws << 4) | (0x01 << 3) | 0x01); // SWS, H logic, Normal operation
|
||||
is31fl3741_reg_write(dev, 0x01, config->gcc); // Set GCC
|
||||
|
||||
// Set all scaling registers to 0xff, brightness is controlled using PWM
|
||||
uint8_t scaling_buffer[0xb4];
|
||||
for (size_t i = 0; i < 0xb4; ++i) {
|
||||
scaling_buffer[i] = 0xff;
|
||||
// Set scaling registers
|
||||
uint8_t *px_buffer = data->px_buffer;
|
||||
uint16_t *rgb_map = config->rgb_map;
|
||||
|
||||
for (int i = 0; i < config->px_buffer_size; i += 3) {
|
||||
px_buffer[rgb_map[i]] = config->scaling_red;
|
||||
px_buffer[rgb_map[i + 1]] = config->scaling_green;
|
||||
px_buffer[rgb_map[i + 2]] = config->scaling_blue;
|
||||
}
|
||||
|
||||
if (is31fl3741_set_page(dev, IS31FL3741_PAGE_SCALING_A)) {
|
||||
LOG_ERR("Couldn't switch to scaling register A on %s", config->label);
|
||||
is31fl3741_set_page(dev, IS31FL3741_PAGE_SCALING_A);
|
||||
is31fl3741_reg_burst_write(dev, 0x00, px_buffer, 0xb4);
|
||||
|
||||
is31fl3741_set_page(dev, IS31FL3741_PAGE_SCALING_B);
|
||||
is31fl3741_reg_burst_write(dev, 0x00, px_buffer + 0xb4, 0xab);
|
||||
|
||||
// Re-initialize px_buffer to prevent any scaling values from being sent
|
||||
// to PWM registers during normal operation.
|
||||
for (size_t i = 0; i < config->px_buffer_size; ++i) {
|
||||
px_buffer[i] = 0;
|
||||
}
|
||||
|
||||
is31fl3741_reg_burst_write(dev, 0x00, scaling_buffer, 0xb4);
|
||||
|
||||
if (is31fl3741_set_page(dev, IS31FL3741_PAGE_SCALING_B)) {
|
||||
LOG_ERR("Couldn't switch to scaling register B on %s", config->label);
|
||||
}
|
||||
|
||||
is31fl3741_reg_burst_write(dev, 0x00, scaling_buffer, 0xab);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -239,17 +244,15 @@ static const struct led_strip_driver_api is31fl3741_api = {
|
|||
|
||||
#define IS31FL3741_DEVICE(idx) \
|
||||
\
|
||||
static struct is31fl3741_data is31fl3741_##idx##_data; \
|
||||
\
|
||||
static uint8_t is31fl3741_##idx##_px_buffer[IS31FL3741_BUFFER_SIZE]; \
|
||||
\
|
||||
static struct is31fl3741_data is31fl3741_##idx##_data = { \
|
||||
.px_buffer = is31fl3741_##idx##_px_buffer, \
|
||||
}; \
|
||||
\
|
||||
static uint16_t is31fl3741_##idx##_rgb_map[IS31FL3741_BUFFER_SIZE] = DT_INST_PROP(idx, map); \
|
||||
\
|
||||
static uint8_t is31fl3741_##idx##_gamma[3][256] = { \
|
||||
DT_INST_PROP(idx, red_gamma), \
|
||||
DT_INST_PROP(idx, green_gamma), \
|
||||
DT_INST_PROP(idx, blue_gamma), \
|
||||
}; \
|
||||
static uint8_t is31fl3741_##idx##_gamma[] = DT_INST_PROP(idx, gamma); \
|
||||
\
|
||||
static const struct is31fl3741_config is31fl3741_##idx##_config = { \
|
||||
.bus = DT_INST_BUS_LABEL(idx), \
|
||||
|
|
@ -258,12 +261,14 @@ static const struct led_strip_driver_api is31fl3741_api = {
|
|||
.sdb_port = DT_INST_GPIO_LABEL(idx, sdb_gpios), \
|
||||
.sdb_pin = DT_INST_GPIO_PIN(idx, sdb_gpios), \
|
||||
.sdb_flags = DT_INST_GPIO_FLAGS(idx, sdb_gpios), \
|
||||
.px_buffer = is31fl3741_##idx##_px_buffer, \
|
||||
.px_buffer_size = IS31FL3741_BUFFER_SIZE, \
|
||||
.gcc = IS31FL3741_GCC(idx), \
|
||||
.sws = DT_INST_PROP(idx, sw_setting), \
|
||||
.rgb_map = is31fl3741_##idx##_rgb_map, \
|
||||
.gamma = is31fl3741_##idx##_gamma, \
|
||||
.scaling_red = DT_INST_PROP(idx, red_scaling), \
|
||||
.scaling_green = DT_INST_PROP(idx, green_scaling), \
|
||||
.scaling_blue = DT_INST_PROP(idx, blue_scaling), \
|
||||
}; \
|
||||
\
|
||||
DEVICE_DT_INST_DEFINE(idx, &is31fl3741_init, NULL, &is31fl3741_##idx##_data, \
|
||||
|
|
|
|||
|
|
@ -54,32 +54,39 @@ properties:
|
|||
description: |
|
||||
How many RGB LEDs are driven by the IC.
|
||||
|
||||
red-gamma:
|
||||
gamma:
|
||||
type: array
|
||||
required: false
|
||||
default: [ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 10, 10, 10, 10, 12, 12, 12, 12, 14, 14, 14, 14, 16, 16, 16, 16, 18, 18, 18, 18, 20, 20, 20, 20, 22, 22, 22, 22, 24, 24, 24, 24, 26, 26, 26, 26, 29, 29, 29, 29, 32, 32, 32, 32, 35, 35, 35, 35, 38, 38, 38, 38, 41, 41, 41, 41, 44, 44, 44, 44, 47, 47, 47, 47, 50, 50, 50, 50, 53, 53, 53, 53, 57, 57, 57, 57, 61, 61, 61, 61, 65, 65, 65, 65, 69, 69, 69, 69, 73, 73, 73, 73, 77, 77, 77, 77, 81, 81, 81, 81, 85, 85, 85, 85, 89, 89, 89, 89, 94, 94, 94, 94, 99, 99, 99, 99, 104, 104, 104, 104, 109, 109, 109, 109, 114, 114, 114, 114, 119, 119, 119, 119, 124, 124, 124, 124, 129, 129, 129, 129, 134, 134, 134, 134, 140, 140, 140, 140, 146, 146, 146, 146, 152, 152, 152, 152, 158, 158, 158, 158, 164, 164, 164, 164, 170, 170, 170, 170, 176, 176, 176, 176, 182, 182, 182, 182, 188, 188, 188, 188, 195, 195, 195, 195, 202, 202, 202, 202, 209, 209, 209, 209, 216, 216, 216, 216, 223, 223, 223, 223, 230, 230, 230, 230, 237, 237, 237, 237, 244, 244, 244, 244, 251, 251, 251, 251, 255, 255, 255, 255 ]
|
||||
description: |
|
||||
Gamma correction lookup values for the red channel.
|
||||
Gamma correction lookup values.
|
||||
The gamma values make the LED brightness seem more linear to human eyes.
|
||||
Default values match the recommendation from the IC datasheet but note this may
|
||||
or may not work for your particular LEDs.
|
||||
|
||||
green-gamma:
|
||||
type: array
|
||||
red-scaling:
|
||||
type: int
|
||||
required: false
|
||||
default: [ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 10, 10, 10, 10, 12, 12, 12, 12, 14, 14, 14, 14, 16, 16, 16, 16, 18, 18, 18, 18, 20, 20, 20, 20, 22, 22, 22, 22, 24, 24, 24, 24, 26, 26, 26, 26, 29, 29, 29, 29, 32, 32, 32, 32, 35, 35, 35, 35, 38, 38, 38, 38, 41, 41, 41, 41, 44, 44, 44, 44, 47, 47, 47, 47, 50, 50, 50, 50, 53, 53, 53, 53, 57, 57, 57, 57, 61, 61, 61, 61, 65, 65, 65, 65, 69, 69, 69, 69, 73, 73, 73, 73, 77, 77, 77, 77, 81, 81, 81, 81, 85, 85, 85, 85, 89, 89, 89, 89, 94, 94, 94, 94, 99, 99, 99, 99, 104, 104, 104, 104, 109, 109, 109, 109, 114, 114, 114, 114, 119, 119, 119, 119, 124, 124, 124, 124, 129, 129, 129, 129, 134, 134, 134, 134, 140, 140, 140, 140, 146, 146, 146, 146, 152, 152, 152, 152, 158, 158, 158, 158, 164, 164, 164, 164, 170, 170, 170, 170, 176, 176, 176, 176, 182, 182, 182, 182, 188, 188, 188, 188, 195, 195, 195, 195, 202, 202, 202, 202, 209, 209, 209, 209, 216, 216, 216, 216, 223, 223, 223, 223, 230, 230, 230, 230, 237, 237, 237, 237, 244, 244, 244, 244, 251, 251, 251, 251, 255, 255, 255, 255 ]
|
||||
default: 255
|
||||
description: |
|
||||
Gamma correction lookup values for the red channel.
|
||||
The gamma values make the LED brightness seem more linear to human eyes.
|
||||
Default values match the recommendation from the IC datasheet but note this may
|
||||
or may not work for your particular LEDs.
|
||||
Red channel scaling factor on a scale of 0-255.
|
||||
This setting adjusts the brightness of red pixels relative to other channels by scaling the amount
|
||||
of current flowing through them. 255 being equivalent to the value of led-max-current.
|
||||
|
||||
blue-gamma:
|
||||
type: array
|
||||
green-scaling:
|
||||
type: int
|
||||
required: false
|
||||
default: [ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 10, 10, 10, 10, 12, 12, 12, 12, 14, 14, 14, 14, 16, 16, 16, 16, 18, 18, 18, 18, 20, 20, 20, 20, 22, 22, 22, 22, 24, 24, 24, 24, 26, 26, 26, 26, 29, 29, 29, 29, 32, 32, 32, 32, 35, 35, 35, 35, 38, 38, 38, 38, 41, 41, 41, 41, 44, 44, 44, 44, 47, 47, 47, 47, 50, 50, 50, 50, 53, 53, 53, 53, 57, 57, 57, 57, 61, 61, 61, 61, 65, 65, 65, 65, 69, 69, 69, 69, 73, 73, 73, 73, 77, 77, 77, 77, 81, 81, 81, 81, 85, 85, 85, 85, 89, 89, 89, 89, 94, 94, 94, 94, 99, 99, 99, 99, 104, 104, 104, 104, 109, 109, 109, 109, 114, 114, 114, 114, 119, 119, 119, 119, 124, 124, 124, 124, 129, 129, 129, 129, 134, 134, 134, 134, 140, 140, 140, 140, 146, 146, 146, 146, 152, 152, 152, 152, 158, 158, 158, 158, 164, 164, 164, 164, 170, 170, 170, 170, 176, 176, 176, 176, 182, 182, 182, 182, 188, 188, 188, 188, 195, 195, 195, 195, 202, 202, 202, 202, 209, 209, 209, 209, 216, 216, 216, 216, 223, 223, 223, 223, 230, 230, 230, 230, 237, 237, 237, 237, 244, 244, 244, 244, 251, 251, 251, 251, 255, 255, 255, 255 ]
|
||||
default: 255
|
||||
description: |
|
||||
Gamma correction lookup values for the red channel.
|
||||
The gamma values make the LED brightness seem more linear to human eyes.
|
||||
Default values match the recommendation from the IC datasheet but note this may
|
||||
or may not work for your particular LEDs.
|
||||
Green channel scaling factor on a scale of 0-255.
|
||||
This setting adjusts the brightness of green pixels relative to other channels by scaling the amount
|
||||
of current flowing through them. 255 being equivalent to the value of led-max-current.
|
||||
|
||||
blue-scaling:
|
||||
type: int
|
||||
required: false
|
||||
default: 255
|
||||
description: |
|
||||
Blue channel scaling factor on a scale of 0-255.
|
||||
This setting adjusts the brightness of blue pixels relative to other channels by scaling the amount
|
||||
of current flowing through them. 255 being equivalent to the value of led-max-current.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue