Skip to content

Commit 1a40b7b

Browse files
committed
fix(servo): update for IDF6
1 parent ab9021a commit 1a40b7b

6 files changed

Lines changed: 27 additions & 6 deletions

File tree

.gitlab/ci/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ build_example_motor_servo_control:
690690
extends:
691691
- .build_examples_template
692692
- .rules:build:example_motor_servo_control
693-
- .build_idf_active_release_version
693+
- .build_idf_active_release_version_with_pre_release
694694
variables:
695695
EXAMPLE_DIR: components/motor/servo/examples/servo_control
696696

@@ -1379,7 +1379,7 @@ build_components_motor_servo_test_apps:
13791379
extends:
13801380
- .build_examples_template
13811381
- .rules:build:components_motor_servo_test_apps
1382-
- .build_idf_active_release_version
1382+
- .build_idf_active_release_version_with_pre_release
13831383
variables:
13841384
EXAMPLE_DIR: components/motor/servo/test_apps
13851385

components/motor/servo/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# ChangeLog
22

3+
4+
## v1.0.1 - 2026-5-03
5+
6+
* Fix requires in CMake for IDF6.
7+
38
## v0.1.0 - 2024-11-27
49

510
### Enhancements:
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.3")
2+
set(REQ esp_driver_ledc esp_driver_gpio)
3+
else()
4+
set(REQ driver)
5+
endif()
6+
17
idf_component_register(SRCS "iot_servo.c"
28
INCLUDE_DIRS include
3-
REQUIRES driver)
9+
REQUIRES ${REQ})

components/motor/servo/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 0.1.0
1+
version: 0.1.1
22
description: Espressif's Servo Motor Component
33
url: https://github.com/espressif/esp-iot-solution/tree/master/components/motor/servo
44
repository: https://github.com/espressif/esp-iot-solution.git

components/motor/servo/test_apps/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
# in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components"
6-
"../../servo")
5+
if (EXISTS "$ENV{IDF_PATH}/tools/unit-test-app/components")
6+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
7+
elseif (EXISTS "$ENV{IDF_PATH}/tools/test_apps/components")
8+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
9+
else()
10+
message(FATAL_ERROR "Could not find unit-test-app or test_apps components")
11+
endif()
712

813
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
914
project(servo_test)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependencies:
2+
idf:
3+
version: ">=4.4"
4+
servo:
5+
override_path: "../.."

0 commit comments

Comments
 (0)