Skip to content

Commit b5940f3

Browse files
authored
Merge pull request #5 from esp-idf-lib/fix_helper_cmake
Fix helper cmake, update version, cherry-pick single chip brithness commit
2 parents 664db97 + f1f8ed2 commit b5940f3

File tree

13 files changed

+39
-38
lines changed

13 files changed

+39
-38
lines changed

.eil.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: max7219
33
description: Driver for 8-Digit LED display drivers, MAX7219/MAX7221
4-
version: 1.1.0
4+
version: 1.1.1
55
groups:
66
- led
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: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
set(REQUIRED_COMPONENTS log)
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()
24

3-
# Flag indicating availability of ESP driver components (esp_driver_*)
4-
# Note: Disabled for ESP-IDF v5.x where minor version < 3 due to API changes
5-
set(HAS_ESP_DRIVERS TRUE)
6-
if(${IDF_VERSION_MAJOR} STREQUAL 5 AND ${IDF_VERSION_MINOR} LESS 3)
7-
set(HAS_ESP_DRIVERS FALSE)
8-
endif()
5+
set(REQUIRED_COMPONENTS log)
96

10-
if(HAS_ESP_DRIVERS)
11-
list(APPEND REQUIRED_COMPONENTS esp_driver_spi esp_driver_gpio)
7+
if(EIL_IDF_HAS_ESP_DRIVERS)
8+
list(APPEND REQUIRED_COMPONENTS esp_driver_gpio esp_driver_spi)
129
else()
1310
list(APPEND REQUIRED_COMPONENTS driver)
1411
endif()
@@ -19,10 +16,4 @@ idf_component_register(
1916
REQUIRES ${REQUIRED_COMPONENTS}
2017
)
2118

22-
# include common cmake file for components
23-
set(ESP_IDF_LIB_CMAKE ${CMAKE_CURRENT_LIST_DIR}/common/cmake/esp-idf-lib.cmake)
24-
if(EXISTS ${ESP_IDF_LIB_CMAKE})
25-
include(${ESP_IDF_LIB_CMAKE})
26-
else()
27-
message(WARNING "${ESP_IDF_LIB_CMAKE} not found")
28-
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/7seg/Makefile

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

examples/7seg/main/component.mk

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

examples/8x8/Makefile

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

examples/8x8/main/component.mk

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

0 commit comments

Comments
 (0)