Merge branch 'feat/lightbulb_support_c5' into 'master'

feat(lightbulb): Adapt to C5 chip See merge request ae_group/esp-iot-solution!1143
espressif · Nov 19, 2024 · 224d004 · 224d004
2 parents db24130 + 04101ea
commit 224d004
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/components/led/lightbulb_driver/CHANGELOG.md b/components/led/lightbulb_driver/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.4.0 - 2024-11-15
+
+### Enhancements:
+
+* Example adapted to ESP32-C5 chip
+
 ## v1.3.3 - 2024-11-07
 
 ### Bug Fixes:

diff --git a/components/led/lightbulb_driver/idf_component.yml b/components/led/lightbulb_driver/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.3.3"
+version: "1.4.0"
 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:

diff --git a/examples/lighting/lightbulb/main/Kconfig.projbuild b/examples/lighting/lightbulb/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Lightbulb Demo Configuration"
 
     choice LIGHTBULB_DEMO_DRIVER_SELECT
             bool "Demo select"
-            default LIGHTBULB_DEMO_DRIVER_SELECT_WS2812 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C6
+            default LIGHTBULB_DEMO_DRIVER_SELECT_WS2812 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
             default LIGHTBULB_DEMO_DRIVER_SELECT_PWM
             help
                 Select the driver type you want to demonstrate
@@ -21,6 +21,7 @@ menu "Lightbulb Demo Configuration"
         default 18 if IDF_TARGET_ESP32S2
         default 48 if IDF_TARGET_ESP32S3
         default 4 if IDF_TARGET_ESP32C2
+        default 27 if IDF_TARGET_ESP32C5
         default 18
         depends on LIGHTBULB_DEMO_DRIVER_SELECT_WS2812
         help
@@ -43,7 +44,7 @@ menu "Lightbulb Demo Configuration"
 
     config PWM_RED_GPIO
         int "PWM Red GPIO"
-        default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C6
+        default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
         default 15 if IDF_TARGET_ESP32S3
         default 0 if IDF_TARGET_ESP32C2
         default 23 if IDF_TARGET_ESP32H2
@@ -54,7 +55,7 @@ menu "Lightbulb Demo Configuration"
 
     config PWM_GREEN_GPIO
         int "PWM Green GPIO"
-        default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C6
+        default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
         default 16 if IDF_TARGET_ESP32S3
         default 1 if IDF_TARGET_ESP32C2
         default 24 if IDF_TARGET_ESP32H2
@@ -65,7 +66,7 @@ menu "Lightbulb Demo Configuration"
 
     config PWM_BLUE_GPIO
         int "PWM Blue GPIO"
-        default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C6
+        default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
         default 17 if IDF_TARGET_ESP32S3
         default 8 if IDF_TARGET_ESP32C2
         default 25 if IDF_TARGET_ESP32H2