Skip to content

fix(servo): Add missing component requirements #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meanwhile131 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(servo): Add missing component requirements #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab/ci/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions components/motor/servo/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog

## v0.1.1 - 2026-5-03

* Fix requires in CMake for IDF6.

## v0.1.0 - 2024-11-27

### Enhancements:
Expand Down
8 changes: 7 additions & 1 deletion components/motor/servo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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})
2 changes: 1 addition & 1 deletion components/motor/servo/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 7 additions & 2 deletions components/motor/servo/test_apps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 5 additions & 0 deletions components/motor/servo/test_apps/main/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies:
idf:
version: ">=4.4"
servo:
override_path: "../.."
Loading