Skip to content

Commit b4acc3d

Browse files
authored
Merge pull request #2 from ivanholmes/patch-1
Fix CMakeLists.txt for ESP-IDF 6.0
2 parents 557dcfe + 049cdbc commit b4acc3d

9 files changed

Lines changed: 20 additions & 23 deletions

File tree

.eil.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: max31855
33
description: Driver for MAX31855 cold-junction compensated thermocouple-to-digital converter
4-
version: 1.0.7
4+
version: 1.0.8
55
groups:
66
- temperature
77
code_owners: UncleRus

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "common"]
2-
path = common
3-
url = https://github.com/esp-idf-lib/common.git
1+
[submodule "eil-cmake-utils"]
2+
path = eil-cmake-utils
3+
url = git@github.com:esp-idf-lib/eil-cmake-utils.git

CMakeLists.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/eil-cmake-utils/cmake)
2+
include(eil_check_idf_features)
3+
eil_check_idf_has_esp_drivers()
4+
5+
set(REQUIRED_COMPONENTS log)
6+
7+
if(EIL_IDF_HAS_ESP_DRIVERS)
8+
list(APPEND REQUIRED_COMPONENTS esp_driver_gpio esp_driver_spi)
9+
else()
10+
list(APPEND REQUIRED_COMPONENTS driver)
11+
endif()
12+
113
idf_component_register(
214
SRCS max31855.c
315
INCLUDE_DIRS .
4-
REQUIRES driver log
16+
REQUIRES ${REQUIRED_COMPONENTS}
517
)
618

7-
# include common cmake file for components
8-
set(ESP_IDF_LIB_CMAKE ${CMAKE_CURRENT_LIST_DIR}/common/cmake/esp-idf-lib.cmake)
9-
if(EXISTS ${ESP_IDF_LIB_CMAKE})
10-
include(${ESP_IDF_LIB_CMAKE})
11-
else()
12-
message(WARNING "${ESP_IDF_LIB_CMAKE} not found")
13-
endif()
19+
include(eil_ci)

common

Lines changed: 0 additions & 1 deletion
This file was deleted.

component.mk

Lines changed: 0 additions & 2 deletions
This file was deleted.

eil-cmake-utils

Submodule eil-cmake-utils added at c91055e

examples/default/Makefile

Lines changed: 0 additions & 6 deletions
This file was deleted.

examples/default/main/component.mk

Lines changed: 0 additions & 1 deletion
This file was deleted.

idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
version: 1.0.7
2+
version: 1.0.8
33
description: Driver for MAX31855 cold-junction compensated thermocouple-to-digital converter
44
license: BSD-3
55
targets:

0 commit comments

Comments
 (0)