Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ca0581b

Browse filesBrowse files
lucasssvazlucasssvaz
authored
Merge branch 'master' into test/linpack
2 parents 0573b36 + ea50cf6 commit ca0581b
Copy full SHA for ca0581b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

55 files changed

+3738
-1555
lines changed

‎CMakeLists.txt

Copy file name to clipboardExpand all lines: CMakeLists.txt
+13Lines changed: 13 additions & 0 deletions
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

‎boards.txt

Copy file name to clipboardExpand all lines: boards.txt
+42-42Lines changed: 42 additions & 42 deletions
Large diffs are not rendered by default.

‎cores/esp32/esp32-hal-misc.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-misc.c
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,11 @@ extern bool btInUse();
251251
#endif
252252

253253
#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
254-
#ifndef CONFIG_SPIRAM_BOOT_INIT
255254
ESP_SYSTEM_INIT_FN(init_psram_new, BIT(0), 99) {
256255
psramInit();
257256
return ESP_OK;
258257
}
259258
#endif
260-
#endif
261259

262260
void initArduino() {
263261
//init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)

‎cores/esp32/esp32-hal-tinyusb.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-tinyusb.c
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,15 @@ __attribute__((weak)) int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cm
453453
__attribute__((weak)) bool tud_msc_is_writable_cb(uint8_t lun) {
454454
return false;
455455
}
456-
456+
#endif
457+
#if CFG_TUD_NCM
458+
__attribute__((weak)) bool tud_network_recv_cb(const uint8_t *src, uint16_t size) {
459+
return false;
460+
}
461+
__attribute__((weak)) uint16_t tud_network_xmit_cb(uint8_t *dst, void *ref, uint16_t arg) {
462+
return 0;
463+
}
464+
__attribute__((weak)) void tud_network_init_cb(void) {}
457465
#endif
458466

459467
/*

‎libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino

Copy file name to clipboardExpand all lines: libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino
-183Lines changed: 0 additions & 183 deletions
This file was deleted.

‎libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/ci.json

Copy file name to clipboardExpand all lines: libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/ci.json
-10Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.