Skip to content

Commit

Permalink
Merge branch 'fix/lightbulb_initialization_failed' into 'master'
Browse files Browse the repository at this point in the history
fix(lightrbulb): Delete some conditional judgments and allow external input mix table

See merge request ae_group/esp-iot-solution!1073
  • Loading branch information
Yuan Ming Fu committed Sep 4, 2024
2 parents 59ebd6b + abde688 commit 02dfaf8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
7 changes: 7 additions & 0 deletions components/led/lightbulb_driver/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# ChangeLog

## v1.3.1 - 2024-08-28

### Bug Fixes:

* Delete some conditional judgments and allow external input mix table

## v1.3.0 - 2024-06-05

### Enhancements:
Expand Down
2 changes: 1 addition & 1 deletion components/led/lightbulb_driver/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "1.3.0"
version: "1.3.1"
description: Provide multiple dimming driver solutions to easily build lightbulb applications
url: https://github.com/espressif/esp-iot-solution/tree/master/components/led/lightbulb_driver
dependencies:
Expand Down
2 changes: 0 additions & 2 deletions components/led/lightbulb_driver/src/lightbulb.c
Original file line number Diff line number Diff line change
Expand Up @@ -779,8 +779,6 @@ esp_err_t lightbulb_init(lightbulb_config_t *config)
// Check cct output mode
if (IS_WHITE_CHANNEL_SELECTED()) {
if (s_lb_obj->cap.enable_precise_cct_control) {
LIGHTBULB_CHECK(config->cct_mix_mode.precise.table_size > 0, "mix table size error", goto EXIT);

s_lb_obj->cct_manager.table_size = config->cct_mix_mode.precise.table_size;
s_lb_obj->cct_manager.kelvin_to_percentage = precise_kelvin_convert_to_percentage;
s_lb_obj->cct_manager.percentage_to_kelvin = precise_percentage_convert_to_kelvin;
Expand Down

0 comments on commit 02dfaf8

Please sign in to comment.