Skip to content

Commit 5fa7512

Browse files
authored
Merge pull request #6575 from s-hadinger/zigbee_probing
Add Zigbee tracking of connected devices and auto-probing of Manuf/Model Ids
2 parents dea8f03 + cccd777 commit 5fa7512

9 files changed

+557
-230
lines changed

sonoff/_changelog.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Add support for Chint DDSU666 Modbus energy meter by Pablo Zerón
55
* Add support for SM2135 as used in Action LSC Smart Led E14 (#6495)
66
* Add command SetOption72 0/1 to switch between software (0) or hardware (1) energy total counter (#6561)
7+
* Add Zigbee tracking of connected devices and auto-probing of Manuf/Model Ids
78
*
89
* 6.6.0.14 20190925
910
* Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488)

sonoff/i18n.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,12 +458,13 @@
458458

459459
// Commands xdrv_23_zigbee.ino
460460
#define D_CMND_ZIGBEE_PERMITJOIN "ZigbeePermitJoin"
461-
#define D_CMND_ZIGBEE_DUMP "ZigbeeDump"
461+
#define D_CMND_ZIGBEE_STATUS "ZigbeeStatus"
462462
#define D_CMND_ZIGBEEZNPSEND "ZigbeeZNPSend"
463463
#define D_JSON_ZIGBEE_STATUS "ZigbeeStatus"
464464
#define D_JSON_ZIGBEEZNPRECEIVED "ZigbeeZNPReceived"
465465
#define D_JSON_ZIGBEEZNPSENT "ZigbeeZNPSent"
466-
#define D_JSON_ZIGBEEZCLRECEIVED "ZigbeeZCLReceived"
466+
#define D_JSON_ZIGBEEZCL_RECEIVED "ZigbeeZCLReceived"
467+
#define D_JSON_ZIGBEEZCL_RAW_RECEIVED "ZigbeeZCLRawReceived"
467468
#define D_JSON_ZIGBEEZCLSENT "ZigbeeZCLSent"
468469

469470
// Commands xdrv_25_A4988_Stepper.ino

sonoff/xdrv_23_zigbee_0_constants.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ enum ZCL_Global_Commands {
422422

423423
};
424424

425-
enum class ZclGlobalCommandId : uint8_t {
426-
};
425+
const uint16_t Z_ProfileIds[] PROGMEM = { 0x0104, 0x0109, 0xA10E, 0xC05E };
426+
const char Z_ProfileNames[] PROGMEM = "ZigBee Home Automation|ZigBee Smart Energy|ZigBee Green Power|ZigBee Light Link";
427427

428428
#endif // USE_ZIGBEE

0 commit comments

Comments
 (0)