Skip to content

Commit 753dc3e

Browse files
dhrishidhrishi
committed
Merge branch 'example/fan' into 'main'
example: improve fan data-model, add motor driver See merge request app-frameworks/esp-matter!615
2 parents b70bf31 + 22a52a2 commit 753dc3e

13 files changed

+1285
-27
lines changed

‎examples/all_device_types_app/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
1111
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
1212
elseif("${IDF_TARGET}" STREQUAL "esp32c3")
1313
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
14+
elseif("${IDF_TARGET}" STREQUAL "esp32c2")
15+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c2_devkit_m)
1416
elseif("${IDF_TARGET}" STREQUAL "esp32h2")
1517
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
16-
elseif("${IDF_TARGET}" STREQUAL "esp32c2")
17-
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c2_devkit_m)
1818
elseif("${IDF_TARGET}" STREQUAL "esp32c6")
1919
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c6_devkit_c)
2020
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
@@ -24,7 +24,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
2424
endif()
2525
endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
2626

27-
set(PROJECT_VER "v1.0")
27+
set(PROJECT_VER "1.0")
2828
set(PROJECT_VER_NUMBER 1)
2929

3030
set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH})
@@ -52,4 +52,4 @@ idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DCHIP_HAVE_CONFIG_
5252
idf_build_set_property(C_COMPILE_OPTIONS "-Os" APPEND)
5353
# For RISCV chips, project_include.cmake sets -Wno-format, but does not clear various
5454
# flags that depend on -Wformat
55-
idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-security;-Wformat=0" APPEND)
55+
idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-security;-Wformat=0" APPEND)

‎examples/all_device_types_app/main/CMakeLists.txt

+26-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
1-
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_thread_br app_reset console fatfs hal)
1+
set(SRC_DIRS_LIST ".")
2+
set(INCLUDE_DIRS_LIST ".")
23
set(ldfragments linker.lf)
3-
idf_component_register(SRC_DIRS "."
4+
# set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_thread_br app_reset console fatfs hal)
5+
6+
if(CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S3)
7+
list(APPEND SRC_DIRS_LIST "driver/fan")
8+
list(APPEND INCLUDE_DIRS_LIST "driver/fan/include")
9+
endif()
10+
11+
idf_component_register(SRC_DIRS ${SRC_DIRS_LIST}
412
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils"
5-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST}
6-
LDFRAGMENTS "${ldfragments}"
7-
)
13+
# PRIV_REQUIRES ${PRIV_REQUIRES_LIST}
14+
INCLUDE_DIRS ${INCLUDE_DIRS_LIST}
15+
LDFRAGMENTS "${ldfragments}")
816

917
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
1018
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
19+
20+
if(CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S3)
21+
idf_build_get_property(build_components BUILD_COMPONENTS)
22+
#To distinguish between a local component and a component manager
23+
if("espressif__esp_sensorless_bldc_control" IN_LIST build_components)
24+
idf_component_get_property(bldc_lib espressif__esp_sensorless_bldc_control COMPONENT_LIB)
25+
else()
26+
idf_component_get_property(bldc_lib esp_sensorless_bldc_control COMPONENT_LIB)
27+
endif()
28+
29+
cmake_policy(SET CMP0079 NEW)
30+
target_link_libraries(${bldc_lib} PUBLIC ${COMPONENT_LIB})
31+
endif()

‎examples/all_device_types_app/main/Kconfig.projbuild

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
menu "App Driver Configuration"
2+
menu "Fan driver configuration"
3+
4+
menu "upper switch config"
5+
config UPPER_SWITCH_PHASE_U_GPIO
6+
int "upper switch PHASE_U GPIO"
7+
default 25 if IDF_TARGET_ESP32
8+
default 17 if IDF_TARGET_ESP32S3
9+
default 17
10+
config UPPER_SWITCH_PHASE_V_GPIO
11+
int "upper switch PHASE_V GPIO"
12+
default 26 if IDF_TARGET_ESP32
13+
default 16 if IDF_TARGET_ESP32S3
14+
default 16
15+
config UPPER_SWITCH_PHASE_W_GPIO
16+
int "upper switch PHASE_W GPIO"
17+
default 27 if IDF_TARGET_ESP32
18+
default 15 if IDF_TARGET_ESP32S3
19+
default 15
20+
endmenu
21+
22+
menu "lower switch config"
23+
config LOWER_SWITCH_PHASE_U_GPIO
24+
int "lower switch PHASE_U GPIO"
25+
default 16 if IDF_TARGET_ESP32
26+
default 12 if IDF_TARGET_ESP32S3
27+
default 12
28+
config LOWER_SWITCH_PHASE_V_GPIO
29+
int "lower switch PHASE_V GPIO"
30+
default 17 if IDF_TARGET_ESP32
31+
default 11 if IDF_TARGET_ESP32S3
32+
default 11
33+
config LOWER_SWITCH_PHASE_W_GPIO
34+
int "lower switch PHASE_W GPIO"
35+
default 5 if IDF_TARGET_ESP32
36+
default 10 if IDF_TARGET_ESP32S3
37+
default 10
38+
39+
endmenu
40+
41+
menu "zero cross comparer config"
42+
config ZERO_CROSS_COMPARER_PHASE_U_GPIO
43+
int "zero cross comparer PHASE_U GPIO"
44+
default 3 if IDF_TARGET_ESP32
45+
default 3 if IDF_TARGET_ESP32S3
46+
default 3
47+
config ZERO_CROSS_COMPARER_PHASE_V_GPIO
48+
int "zero cross comparer PHASE_V GPIO"
49+
default 18 if IDF_TARGET_ESP32
50+
default 46 if IDF_TARGET_ESP32S3
51+
default 46
52+
config ZERO_CROSS_COMPARER_PHASE_W_GPIO
53+
int "zero cross comparer PHASE_W GPIO"
54+
default 2 if IDF_TARGET_ESP32
55+
default 9 if IDF_TARGET_ESP32S3
56+
default 9
57+
endmenu
58+
59+
menu "Step motor config"
60+
config STEP_MOTOR_A0_GPIO
61+
int "Step motor A+ GPIO"
62+
default 12 if IDF_TARGET_ESP32
63+
default 14 if IDF_TARGET_ESP32S3
64+
default 14
65+
config STEP_MOTOR_A1_GPIO
66+
int "Step motor A- GPIO"
67+
default 13 if IDF_TARGET_ESP32
68+
default 21 if IDF_TARGET_ESP32S3
69+
default 21
70+
config STEP_MOTOR_B0_GPIO
71+
int "Step motor B+ GPIO"
72+
default 14 if IDF_TARGET_ESP32
73+
default 47 if IDF_TARGET_ESP32S3
74+
default 47
75+
config STEP_MOTOR_B1_GPIO
76+
int "Step motor B- GPIO"
77+
default 15 if IDF_TARGET_ESP32
78+
default 48 if IDF_TARGET_ESP32S3
79+
default 48
80+
endmenu
81+
82+
config POWER_BUTTON_GPIO
83+
int "Power Button GPIO"
84+
default 0
85+
86+
endmenu
87+
endmenu

0 commit comments

Comments
 (0)