espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2025-07-30 10:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_timer_deps' into 'master'

Browse Source 
cmake: add dependency on esp_timer component

See merge request idf/esp-modbus!8
This commit is contained in:
Ivan Grokhotkov
2022-04-20 16:15:04 +08:00
parent 028bfd36c0 cc3a304fb7
commit 436bc70b3d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -59,7 +59,14 @@ add_prefix(priv_include_dirs "${CMAKE_CURRENT_LIST_DIR}/freemodbus/" ${priv_incl
message(STATUS "DEBUG: Use esp-modbus component folder: ${CMAKE_CURRENT_LIST_DIR}.") message(STATUS "DEBUG: Use esp-modbus component folder: ${CMAKE_CURRENT_LIST_DIR}.")
set(requires driver lwip)
# esp_timer component was introduced in v4.2
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER "4.1")
list(APPEND requires esp_timer)
endif()
idf_component_register(SRCS "${srcs}" idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}" INCLUDE_DIRS "${include_dirs}"
PRIV_INCLUDE_DIRS "${priv_include_dirs}" PRIV_INCLUDE_DIRS "${priv_include_dirs}"
REQUIRES driver lwip) REQUIRES ${requires})

9
docs/_static/modbus_docs_versions.js vendored
View File

@ -1,10 +1,11 @@
var DOCUMENTATION_VERSIONS = { var DOCUMENTATION_VERSIONS = {
DEFAULTS: { has_targets: false, DEFAULTS: { has_targets: true,
supported_targets: [ "esp32" ] supported_targets: [ "esp32", "esp32s2", "esp32s3", "esp32c3" ]
}, },
VERSIONS: [ VERSIONS: [
{ name: "latest", has_targets: false, supported_targets: [ "esp32", "esp32s2", "esp32s3", "esp32c3" ] }, { name: "latest" },
{ name: "v1.0.0", old:false, has_targets:true, supported_targets: [ "esp32", "esp32s2", "esp32s3", "esp32c3" ]} { name: "v1.0.1", old:false },
{ name: "v1.0.0", old:true }
], ],
IDF_TARGETS: [ IDF_TARGETS: [
{ text: "ESP32", value: "esp32"}, { text: "ESP32", value: "esp32"},

2
idf_component.yml
View File

@ -1,4 +1,4 @@
version: "1.0.0" version: "1.0.1"
description: ESP-MODBUS is the official Modbus library for Espressif SoCs. description: ESP-MODBUS is the official Modbus library for Espressif SoCs.
url: https://github.com/espressif/esp-modbus url: https://github.com/espressif/esp-modbus
dependencies: dependencies: