Skip to content

fix(zigbee): Fixes of timeout, example, warnings and bounding + add a 2MB part scheme for Zigbee ED#10817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
me-no-dev merged 9 commits into from
Jan 8, 2025
Merged

fix(zigbee): Fixes of timeout, example, warnings and bounding + add a 2MB part scheme for Zigbee ED #10817

me-no-dev merged 9 commits into from
Jan 8, 2025

Conversation

@P-R-O-C-H-Y
Copy link
Member

@P-R-O-C-H-YP-R-O-C-H-Y commented Jan 6, 2025•
edited
Loading

Description of Change

This PR:

  • fixes a blocking getSensorSettings() function for a Thermostat EP, which is now set to 10s.
  • adds a check in the on/off switch example manufacturer/model read, so if reading fails it does not crash.
  • adds a 2MB partition scheme for Zigbee End Device for C6 and H2
  • fixes a device bounding multiple times, if its rejoining the network. If it was bounded it won't bound again.
  • fixes warnings of missing initializer for member in EPs reporting function

Tests scenarios

Tested ESP32-H2 with 2MB Flash with the pressure sensor example.
Tested with multiple devices C6/H2 - lights/switch

Related links

#10808
Closes#10777

@P-R-O-C-H-YP-R-O-C-H-Y added Status: Review needed Issue or PR is awaiting review Area: Zigbee Issues and Feature Request about Zigbee labels Jan 6, 2025
@P-R-O-C-H-YP-R-O-C-H-Y self-assigned this Jan 6, 2025
@github-actions
Copy link
Contributor

github-actionsbot commented Jan 6, 2025•
edited
Loading

Messages
📖🎉 Good Job! All checks are passing!

👋 Hello P-R-O-C-H-Y, we appreciate your contribution to this project!

📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.
🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.
Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against 5f54c76

@P-R-O-C-H-YP-R-O-C-H-Y mentioned this pull request Jan 6, 2025
Closed
1 task
@github-actions
Copy link
Contributor

github-actionsbot commented Jan 6, 2025•
edited
Loading

Test Results

62 files 62 suites 5m 41s ⏱️
21 tests 21 ✅ 0 💤 0 ❌
154 runs 154 ✅ 0 💤 0 ❌

Results for commit 5f54c76.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actionsbot commented Jan 6, 2025•
edited
Loading

Memory usage test (comparing PR against master branch)

The table below shows the summary of memory usage change (decrease - increase) in bytes and percentage for each target.

MemoryFLASH [bytes]FLASH [%]RAM [bytes]RAM [%]
TargetDECINCDECINCDECINCDECINC
ESP32P4000.000.00000.000.00
ESP32S30‼️ +5K0.00⚠️ +0.500⚠️ +4960.00⚠️ +0.83
ESP32S20‼️ +4K0.00⚠️ +0.400⚠️ +120.00⚠️ +0.02
ESP32C3000.000.00000.000.00
ESP32C60⚠️ +4480.00⚠️ +0.09000.000.00
ESP32H20⚠️ +4460.00⚠️ +0.08000.000.00
ESP320‼️ +12K0.00‼️ +1.230⚠️ +680.00⚠️ +0.11
Click to expand the detailed deltas report [usage change in BYTES]
TargetESP32P4ESP32S3ESP32S2ESP32C3ESP32C6ESP32H2ESP32
ExampleFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAM
ArduinoOTA/examples/BasicOTA0000000000--00
AsyncUDP/examples/AsyncUDPClient0000000000--00
AsyncUDP/examples/AsyncUDPMulticastServer0000000000--00
AsyncUDP/examples/AsyncUDPServer0000000000--00
DNSServer/examples/CaptivePortal0000000000--00
EEPROM/examples/eeprom_class00000000000000
EEPROM/examples/eeprom_extra00000000000000
EEPROM/examples/eeprom_write00000000000000
ESP32/examples/AnalogOut/LEDCFade00000000000000
ESP32/examples/AnalogOut/LEDCSingleChannel00000000000000
ESP32/examples/AnalogOut/LEDCSoftwareFade00000000000000
ESP32/examples/AnalogOut/SigmaDelta00000000000000
ESP32/examples/AnalogOut/ledcFrequency00000000000000
ESP32/examples/AnalogOut/ledcWrite_RGB00000000000000
ESP32/examples/AnalogRead00000000000000
ESP32/examples/AnalogReadContinuous00000000000000
ESP32/examples/ArduinoStackSize00000000000000
ESP32/examples/CI/CIBoardsTest00000000000000
ESP32/examples/ChipID/GetChipID00000000000000
ESP32/examples/DeepSleep/TimerWakeUp0000000000--00
ESP32/examples/DeepSleep/TouchWakeUp000000------00
ESP32/examples/FreeRTOS/BasicMultiThreading00000000000000
ESP32/examples/FreeRTOS/Mutex00000000000000
ESP32/examples/FreeRTOS/Queue00000000000000
ESP32/examples/FreeRTOS/Semaphore00000000000000
ESP32/examples/GPIO/BlinkRGB00000000000000
ESP32/examples/GPIO/FunctionalInterrupt00000000000000
ESP32/examples/GPIO/FunctionalInterruptStruct00000000000000
ESP32/examples/GPIO/GPIOInterrupt00000000000000
ESP32/examples/HWCDC_Events0000--000000--
ESP32/examples/MacAddress/GetMacAddress00000000000000
ESP32/examples/RMT/Legacy_RMT_Driver_Compatible00000000000000
ESP32/examples/RMT/RMTCallback00000000000000
ESP32/examples/RMT/RMTLoopback00000000000000
ESP32/examples/RMT/RMTReadXJT00000000000000
ESP32/examples/RMT/RMTWrite_RGB_LED00000000000000
ESP32/examples/RMT/RMT_CPUFreq_Test00000000000000
ESP32/examples/RMT/RMT_EndOfTransmissionState00000000000000
ESP32/examples/RMT/RMT_LED_Blink00000000000000
ESP32/examples/ResetReason/ResetReason00000000000000
ESP32/examples/ResetReason/ResetReason200000000000000
ESP32/examples/Serial/BaudRateDetect_Demo00000000000000
ESP32/examples/Serial/OnReceiveError_BREAK_Demo00000000000000
ESP32/examples/Serial/OnReceive_Demo00000000000000
ESP32/examples/Serial/RS485_Echo_Demo00000000000000
ESP32/examples/Serial/RxFIFOFull_Demo00000000000000
ESP32/examples/Serial/RxTimeout_Demo00000000000000
ESP32/examples/Serial/Serial_All_CPU_Freqs00000000000000
ESP32/examples/Serial/Serial_STD_Func_OnReceive00000000000000
ESP32/examples/Serial/onReceiveExample00000000000000
ESP32/examples/TWAI/TWAIreceive00000000000000
ESP32/examples/TWAI/TWAItransmit00000000000000
ESP32/examples/Template/ExampleTemplate00000000000000
ESP32/examples/Time/SimpleTime0000000000--00
ESP32/examples/Timer/RepeatTimer00000000000000
ESP32/examples/Timer/WatchdogTimer00000000000000
ESP32/examples/Touch/TouchInterrupt000000------00
ESP32/examples/Touch/TouchRead000000------00
ESP32/examples/Utilities/HEXBuilder00000000000000
ESP32/examples/Utilities/MD5Builder00000000000000
ESP32/examples/Utilities/SHA1Builder00000000000000
ESP_I2S/examples/ES8388_loopback00000000000000
ESP_I2S/examples/Record_to_WAV0000--------00
ESP_I2S/examples/Simple_tone00000000000000
ESPmDNS/examples/mDNS-SD_Extended0000000000--00
ESPmDNS/examples/mDNS_Web_Server0000000000--00
Ethernet/examples/ETH_TLK11000----------00
Ethernet/examples/ETH_W5500_Arduino_SPI00000000000000
Ethernet/examples/ETH_W5500_IDF_SPI00000000000000
Ethernet/examples/ETH_WIFI_BRIDGE0000000000--00
FFat/examples/FFat_Test00000000000000
FFat/examples/FFat_time0000000000--00
HTTPClient/examples/Authorization0000000000--00
HTTPClient/examples/BasicHttpClient0000000000--00
HTTPClient/examples/BasicHttpsClient0000000000--00
HTTPClient/examples/ReuseConnection0000000000--00
HTTPClient/examples/StreamHttpClient0000000000--00
HTTPUpdate/examples/httpUpdate0000000000--00
HTTPUpdate/examples/httpUpdateSPIFFS0000000000--00
HTTPUpdate/examples/httpUpdateSecure0000000000--00
HTTPUpdateServer/examples/WebUpdater0000000000--00
LittleFS/examples/LITTLEFS_test00000000000000
LittleFS/examples/LITTLEFS_time0000000000--00
NetBIOS/examples/ESP_NBNST0000000000--00
NetworkClientSecure/examples/WiFiClientInsecure0000000000--00
NetworkClientSecure/examples/WiFiClientPSK0000000000--00
NetworkClientSecure/examples/WiFiClientSecure0000000000--00
NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade0000000000--00
NetworkClientSecure/examples/WiFiClientShowPeerCredentials0000000000--00
NetworkClientSecure/examples/WiFiClientTrustOnFirstUse0000000000--00
PPP/examples/PPP_Basic00000000000000
PPP/examples/PPP_WIFI_BRIDGE0000000000--00
Preferences/examples/Prefs2Struct00000000000000
Preferences/examples/StartCounter00000000000000
SD/examples/SD_Test00000000000000
SD/examples/SD_time0000000000--00
SD_MMC/examples/SD2USBMSC0000----------
SD_MMC/examples/SDMMC_Test0000--------00
SD_MMC/examples/SDMMC_time0000--------00
SPI/examples/SPI_Multiple_Buses00000000000000
SPIFFS/examples/SPIFFS_Test00000000000000
SPIFFS/examples/SPIFFS_time0000000000--00
TFLiteMicro/examples/hello_world00000000000000
Ticker/examples/Blinker00000000000000
Ticker/examples/TickerBasic00000000000000
Ticker/examples/TickerParameter00000000000000
USB/examples/CompositeDevice000000--------
USB/examples/ConsumerControl000000--------
USB/examples/CustomHIDDevice000000--------
USB/examples/FirmwareMSC000000--------
USB/examples/Gamepad000000--------
USB/examples/HIDVendor000000--------
USB/examples/Keyboard/KeyboardLogout000000--------
USB/examples/Keyboard/KeyboardMessage000000--------
USB/examples/Keyboard/KeyboardReprogram000000--------
USB/examples/Keyboard/KeyboardSerial000000--------
USB/examples/KeyboardAndMouseControl000000--------
USB/examples/MIDI/MidiController000000--------
USB/examples/MIDI/MidiInterface000000--------
USB/examples/MIDI/MidiMusicBox000000--------
USB/examples/MIDI/ReceiveMidi000000--------
USB/examples/Mouse/ButtonMouseControl000000--------
USB/examples/SystemControl000000--------
USB/examples/USBMSC000000--------
USB/examples/USBSerial000000--------
USB/examples/USBVendor000000--------
Update/examples/AWS_S3_OTA_Update0000000000--00
Update/examples/HTTPS_OTA_Update0000000000--00
Update/examples/HTTP_Client_AES_OTA_Update0000000000--00
Update/examples/HTTP_Server_AES_OTA_Update0000000000--00
Update/examples/OTAWebUpdater0000000000--00
Update/examples/SD_Update00000000000000
WebServer/examples/AdvancedWebServer0000000000--00
WebServer/examples/FSBrowser0000000000--00
WebServer/examples/Filters0000000000--00
WebServer/examples/HelloServer0000000000--00
WebServer/examples/HttpAdvancedAuth0000000000--00
WebServer/examples/HttpAuthCallback0000000000--00
WebServer/examples/HttpAuthCallbackInline0000000000--00
WebServer/examples/HttpBasicAuth0000000000--00
WebServer/examples/HttpBasicAuthSHA10000000000--00
WebServer/examples/HttpBasicAuthSHA1orBearerToken0000000000--00
WebServer/examples/MultiHomedServers0000000000--00
WebServer/examples/PathArgServer0000000000--00
WebServer/examples/SDWebServer0000000000--00
WebServer/examples/SimpleAuthentification0000000000--00
WebServer/examples/UploadHugeFile0000000000--00
WebServer/examples/WebServer0000000000--00
WebServer/examples/WebUpdate0000000000--00
WiFi/examples/FTM/FTM_Initiator0000000000--00
WiFi/examples/FTM/FTM_Responder0000000000--00
WiFi/examples/SimpleWiFiServer0000000000--00
WiFi/examples/WiFiAccessPoint0000000000--00
WiFi/examples/WiFiClient0000000000--00
WiFi/examples/WiFiClientBasic0000000000--00
WiFi/examples/WiFiClientConnect0000000000--00
WiFi/examples/WiFiClientEvents0000000000--00
WiFi/examples/WiFiClientStaticIP0000000000--00
WiFi/examples/WiFiExtender0000000000--00
WiFi/examples/WiFiIPv60000000000--00
WiFi/examples/WiFiMulti0000000000--00
WiFi/examples/WiFiMultiAdvanced0000000000--00
WiFi/examples/WiFiScan0000000000--00
WiFi/examples/WiFiScanAsync0000000000--00
WiFi/examples/WiFiScanDualAntenna0000000000--00
WiFi/examples/WiFiScanTime0000000000--00
WiFi/examples/WiFiTelnetToSerial0000000000--00
WiFi/examples/WiFiUDPClient0000000000--00
Wire/examples/WireMaster00000000000000
Wire/examples/WireScan00000000000000
Wire/examples/WireSlave00000000000000
BLE/examples/BLE5_extended_scan--00--000000--
BLE/examples/BLE5_multi_advertising--00--000000--
BLE/examples/BLE5_periodic_advertising--00--000000--
BLE/examples/BLE5_periodic_sync--00--000000--
BLE/examples/Beacon_Scanner--00--00000000
BLE/examples/Client--00--00000000
BLE/examples/EddystoneTLM_Beacon--00--00000000
BLE/examples/EddystoneURL_Beacon--00--00000000
BLE/examples/Notify--00--00000000
BLE/examples/Scan--00--00000000
BLE/examples/Server--00--00000000
BLE/examples/Server_multiconnect--00--00000000
BLE/examples/UART--00--00000000
BLE/examples/Write--00--00000000
BLE/examples/iBeacon--00--00000000
ESP32/examples/Camera/CameraWebServer--‼️ +5K⚠️ +496‼️ +4K⚠️ +12------‼️ +12K⚠️ +68
ESP32/examples/DeepSleep/ExternalWakeUp--0000------00
ESP_NOW/examples/ESP_NOW_Broadcast_Master--00000000--00
ESP_NOW/examples/ESP_NOW_Broadcast_Slave--00000000--00
ESP_NOW/examples/ESP_NOW_Network--00000000--00
ESP_NOW/examples/ESP_NOW_Serial--00000000--00
ESP_SR/examples/Basic--00----------
HTTPClient/examples/HTTPClientEnterprise--00000000--00
Insights/examples/DiagnosticsSmokeTest--00000000--00
Insights/examples/MinimalDiagnostics--00000000--00
Matter/examples/MatterColorLight--00000000--00
Matter/examples/MatterCommissionTest--00000000--00
Matter/examples/MatterComposedLights--00000000--00
Matter/examples/MatterContactSensor--00000000--00
Matter/examples/MatterDimmableLight--00000000--00
Matter/examples/MatterEnhancedColorLight--00000000--00
Matter/examples/MatterFan--00000000--00
Matter/examples/MatterHumiditySensor--00000000--00
Matter/examples/MatterMinimum--00000000--00
Matter/examples/MatterOccupancySensor--00000000--00
Matter/examples/MatterOnIdentify--00000000--00
Matter/examples/MatterOnOffLight--00000000--00
Matter/examples/MatterOnOffPlugin--00000000--00
Matter/examples/MatterPressureSensor--00000000--00
Matter/examples/MatterSmartButon--00000000--00
Matter/examples/MatterTemperatureLight--00000000--00
Matter/examples/MatterTemperatureSensor--00000000--00
Matter/examples/MatterThermostat--00000000--00
Matter/examples/WiFiProvWithinMatter--00000000--00
NetworkClientSecure/examples/WiFiClientSecureEnterprise--00000000--00
RainMaker/examples/RMakerCustom--00000000--00
RainMaker/examples/RMakerCustomAirCooler--00000000--00
RainMaker/examples/RMakerSonoffDualR3--00000000--00
RainMaker/examples/RMakerSwitch--00000000--00
SimpleBLE/examples/SimpleBleDevice--00--00000000
WebServer/examples/Middleware--00000000--00
WiFi/examples/WPS--00000000--00
WiFi/examples/WiFiBlueToothSwitch--00--0000--00
WiFi/examples/WiFiClientEnterprise--00000000--00
WiFi/examples/WiFiSmartConfig--00000000--00
WiFiProv/examples/WiFiProv--00000000--00
OpenThread/examples/COAP/coap_lamp--------0000--
OpenThread/examples/COAP/coap_switch--------0000--
OpenThread/examples/SimpleCLI--------0000--
OpenThread/examples/SimpleNode--------0000--
OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode--------0000--
OpenThread/examples/SimpleThreadNetwork/LeaderNode--------0000--
OpenThread/examples/SimpleThreadNetwork/RouterNode--------0000--
OpenThread/examples/ThreadScan--------0000--
OpenThread/examples/onReceive--------0000--
Zigbee/examples/Zigbee_CarbonDioxide_Sensor--------⚠️ +3740⚠️ +3760--
Zigbee/examples/Zigbee_Color_Dimmable_Light--------⚠️ +3740⚠️ +3740--
Zigbee/examples/Zigbee_Color_Dimmer_Switch--------⚠️ +3720⚠️ +3700--
Zigbee/examples/Zigbee_Dimmable_Light--------⚠️ +3760⚠️ +3780--
Zigbee/examples/Zigbee_Occupancy_Sensor--------⚠️ +3760⚠️ +3780--
Zigbee/examples/Zigbee_On_Off_Light--------⚠️ +3760⚠️ +3760--
Zigbee/examples/Zigbee_On_Off_Switch--------⚠️ +4060⚠️ +4100--
Zigbee/examples/Zigbee_Pressure_Flow_Sensor--------⚠️ +3760⚠️ +3780--
Zigbee/examples/Zigbee_Scan_Networks--------⚠️ +4480⚠️ +4460--
Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy--------⚠️ +3760⚠️ +3740--
Zigbee/examples/Zigbee_Temperature_Sensor--------⚠️ +3780⚠️ +3800--
Zigbee/examples/Zigbee_Thermostat--------⚠️ +3780⚠️ +3840--
BluetoothSerial/examples/DiscoverConnect------------00
BluetoothSerial/examples/GetLocalMAC------------00
BluetoothSerial/examples/SerialToSerialBT------------00
BluetoothSerial/examples/SerialToSerialBTM------------00
BluetoothSerial/examples/SerialToSerialBT_Legacy------------00
BluetoothSerial/examples/SerialToSerialBT_SSP------------00
BluetoothSerial/examples/bt_classic_device_discovery------------00
BluetoothSerial/examples/bt_remove_paired_devices------------00
ESP32/examples/DeepSleep/SmoothBlink_ULP_Code------------00
Ethernet/examples/ETH_LAN8720------------00

@P-R-O-C-H-YP-R-O-C-H-Y marked this pull request as draft January 7, 2025 13:32
@P-R-O-C-H-YP-R-O-C-H-Y added Status: In Progress ⚠️ Issue is in progress and removed Status: Review needed Issue or PR is awaiting review labels Jan 7, 2025
@me-no-devme-no-dev self-requested a review January 7, 2025 13:52
@P-R-O-C-H-YP-R-O-C-H-Y marked this pull request as ready for review January 7, 2025 13:53
@P-R-O-C-H-YP-R-O-C-H-Y mentioned this pull request Jan 7, 2025
Closed
1 task
@P-R-O-C-H-YP-R-O-C-H-Y added Status: Review needed Issue or PR is awaiting review and removed Status: In Progress ⚠️ Issue is in progress labels Jan 7, 2025
@P-R-O-C-H-YP-R-O-C-H-Y changed the title fix(zigbee): Fix timeout, switch example and add a 2MB part scheme for Zigbee EDfix(zigbee): Fixes of timeout, example, warnings and bounding + add a 2MB part scheme for Zigbee EDJan 7, 2025
lucasssvaz
lucasssvaz reviewed Jan 8, 2025
View reviewed changes
lucasssvaz
lucasssvaz approved these changes Jan 8, 2025
View reviewed changes
Copy link
Member

@lucasssvazlucasssvaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@P-R-O-C-H-Y@lucasssvaz
fix(zigbee): Fix typo in the comment
d163478
Co-authored-by: Lucas Saavedra Vaz <[email protected]>
@me-no-devme-no-dev removed the Status: Review needed Issue or PR is awaiting review label Jan 8, 2025
@me-no-devme-no-dev added the Status: Pending Merge Pull Request is ready to be merged label Jan 8, 2025
@me-no-devme-no-dev merged commit 2f423af into espressif:masterJan 8, 2025
59 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@me-no-devme-no-devme-no-dev approved these changes

@lucasssvazlucasssvazlucasssvaz approved these changes

@SuGliderSuGliderSuGlider approved these changes

Assignees

@P-R-O-C-H-YP-R-O-C-H-Y

Labels

Area: ZigbeeIssues and Feature Request about ZigbeeStatus: Pending MergePull Request is ready to be merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Zigbee readManufacturer fail leads to reboot

4 participants

@P-R-O-C-H-Y@me-no-dev@lucasssvaz@SuGlider