fix(servo): update for IDF6

Author: meanwhile131

.gitlab/ci/build.yml

@@ -690,7 +690,7 @@ build_example_motor_servo_control:
   extends:
     - .build_examples_template
     - .rules:build:example_motor_servo_control
-    - .build_idf_active_release_version
+    - .build_idf_active_release_version_with_pre_release
   variables:
     EXAMPLE_DIR: components/motor/servo/examples/servo_control
 
@@ -1379,7 +1379,7 @@ build_components_motor_servo_test_apps:
   extends:
     - .build_examples_template
     - .rules:build:components_motor_servo_test_apps
-    - .build_idf_active_release_version
+    - .build_idf_active_release_version_with_pre_release
   variables:
     EXAMPLE_DIR: components/motor/servo/test_apps
 

components/motor/servo/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v0.1.1 - 2026-5-03
+
+* Fix requires in CMake for IDF6.
+
 ## v0.1.0 - 2024-11-27
 
 ### Enhancements:

components/motor/servo/CMakeLists.txt

@@ -1,3 +1,9 @@
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.3")
+    set(REQ esp_driver_ledc esp_driver_gpio)
+else()
+    set(REQ driver)
+endif()
+
 idf_component_register(SRCS "iot_servo.c"
                         INCLUDE_DIRS include
-                        REQUIRES driver)
+                        REQUIRES ${REQ})

components/motor/servo/idf_component.yml

@@ -1,4 +1,4 @@
-version: 0.1.0
+version: 0.1.1
 description: Espressif's Servo Motor Component
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/motor/servo
 repository: https://github.com/espressif/esp-iot-solution.git

components/motor/servo/test_apps/CMakeLists.txt

@@ -2,8 +2,13 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components"
-                         "../../servo")
+if (EXISTS "$ENV{IDF_PATH}/tools/unit-test-app/components")
+    set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
+elseif (EXISTS "$ENV{IDF_PATH}/tools/test_apps/components")
+    set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
+else()
+    message(FATAL_ERROR "Could not find unit-test-app or test_apps components")
+endif()
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(servo_test)

components/motor/servo/test_apps/main/idf_component.yml

@@ -0,0 +1,5 @@
+dependencies:
+  idf:
+    version: ">=4.4"
+  servo:
+    override_path: "../.."