8000 Merge branch 'master' into master · espressif/arduino-esp32@034d303 · GitHub
[go: up one dir, main page]

Skip to content

Commit 034d303

Browse files
authored
Merge branch 'master' into master
2 parents a21cae5 + 473b851 commit 034d303

Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ set(ARDUINO_ALL_LIBRARIES
112112
WiFi
113113
WiFiProv
114114
Wire
115+
Zigbee
115116
)
116117

117118
set(ARDUINO_LIBRARY_ArduinoOTA_SRCS libraries/ArduinoOTA/src/ArduinoOTA.cpp)
@@ -240,6 +241,18 @@ set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
240241

241242
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
242243

244+
set(ARDUINO_LIBRARY_Zigbee_SRCS
245+
libraries/Zigbee/src/ZigbeeCore.cpp
246+
libraries/Zigbee/src/ZigbeeEP.cpp
247+
libraries/Zigbee/src/ZigbeeHandlers.cpp
248+
libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
249+
libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
250+
libraries/Zigbee/src/ep/ZigbeeLight.cpp
251+
libraries/Zigbee/src/ep/ZigbeeSwitch.cpp
252+
libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp
253+
libraries/Zigbee/src/ep/ZigbeeThermostat.cpp
254+
)
255+
243256
set(ARDUINO_LIBRARY_BLE_SRCS
244257
libraries/BLE/src/BLE2901.cpp
245258
libraries/BLE/src/BLE2902.cpp