From 0c4eabeff3aa950b393afcfb1dda9ae7579d2762 Mon Sep 17 00:00:00 2001 From: Denis Shulyaka Date: Tue, 6 Oct 2020 03:23:04 +0300 Subject: [PATCH 1/2] Fix XBee manufacturer and model --- zhaquirks/xbee/__init__.py | 5 ++--- zhaquirks/xbee/xbee3_io.py | 46 +++++++++++++------------------------- zhaquirks/xbee/xbee_io.py | 46 +++++++++++++------------------------- 3 files changed, 34 insertions(+), 63 deletions(-) diff --git a/zhaquirks/xbee/__init__.py b/zhaquirks/xbee/__init__.py index af2a5fb816..bab94d9abf 100644 --- a/zhaquirks/xbee/__init__.py +++ b/zhaquirks/xbee/__init__.py @@ -332,10 +332,9 @@ def handle_cluster_request(self, tsn, command_id, args): replacement = { ENDPOINTS: { 232: { - "manufacturer": "XBEE", - "model": "xbee.io", INPUT_CLUSTERS: [DigitalIOCluster, SerialDataCluster], OUTPUT_CLUSTERS: [SerialDataCluster, EventRelayCluster], } - } + }, + "manufacturer": "XBee", } diff --git a/zhaquirks/xbee/xbee3_io.py b/zhaquirks/xbee/xbee3_io.py index 5612567580..0b36e004b5 100644 --- a/zhaquirks/xbee/xbee3_io.py +++ b/zhaquirks/xbee/xbee3_io.py @@ -11,123 +11,109 @@ class XBee3Sensor(XBeeCommon): def __init__(self, application, ieee, nwk, replaces): """Initialize device-specific properties.""" + self.replacement["model"] = "XBee3" self.replacement[ENDPOINTS].update( { 0xD0: { - "manufacturer": "XBEE", - "model": "AD0/DIO0/Commissioning", + # AD0/DIO0/Commissioning DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD1: { - "manufacturer": "XBEE", - "model": "AD1/DIO1/SPI_nATTN", + # AD1/DIO1/SPI_nATTN DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD2: { - "manufacturer": "XBEE", - "model": "AD2/DIO2/SPI_CLK", + # AD2/DIO2/SPI_CLK DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD3: { - "manufacturer": "XBEE", - "model": "AD3/DIO3", + # AD3/DIO3 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD4: { - "manufacturer": "XBEE", - "model": "DIO4/SPI_MOSI", + # DIO4/SPI_MOSI DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD5: { - "manufacturer": "XBEE", - "model": "DIO5/Assoc", + # DIO5/Assoc DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD6: { - "manufacturer": "XBEE", - "model": "DIO6/RTS", + # DIO6/RTS DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD7: { - "manufacturer": "XBEE", - "model": "DIO7/CTS", + # DIO7/CTS DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD8: { - "manufacturer": "XBEE", - "model": "DIO8", + # DIO8 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD9: { - "manufacturer": "XBEE", - "model": "DIO9", + # DIO9 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDA: { - "manufacturer": "XBEE", - "model": "DIO10/PWM0", + # DIO10/PWM0 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeePWM], OUTPUT_CLUSTERS: [], }, 0xDB: { - "manufacturer": "XBEE", - "model": "DIO11/PWM1", + # DIO11/PWM1 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeePWM], OUTPUT_CLUSTERS: [], }, 0xDC: { - "manufacturer": "XBEE", - "model": "DIO12/SPI_MISO", + # DIO12/SPI_MISO DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDD: { - "manufacturer": "XBEE", - "model": "DIO13/DOUT", + # DIO13/DOUT DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDE: { - "manufacturer": "XBEE", - "model": "DIO14/DIN", + # DIO14/DIN DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], diff --git a/zhaquirks/xbee/xbee_io.py b/zhaquirks/xbee/xbee_io.py index 8769a9bbd3..e1733b27b2 100644 --- a/zhaquirks/xbee/xbee_io.py +++ b/zhaquirks/xbee/xbee_io.py @@ -11,123 +11,109 @@ class XBeeSensor(XBeeCommon): def __init__(self, application, ieee, nwk, replaces): """Initialize device-specific properties.""" + self.replacement["model"] = "XBee2" self.replacement[ENDPOINTS].update( { 0xD0: { - "manufacturer": "XBEE", - "model": "AD0/DIO0/Commissioning", + # AD0/DIO0/Commissioning DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD1: { - "manufacturer": "XBEE", - "model": "AD1/DIO1/SPI_nATTN", + # AD1/DIO1/SPI_nATTN DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD2: { - "manufacturer": "XBEE", - "model": "AD2/DIO2/SPI_CLK", + # AD2/DIO2/SPI_CLK DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD3: { - "manufacturer": "XBEE", - "model": "AD3/DIO3", + # AD3/DIO3 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD4: { - "manufacturer": "XBEE", - "model": "DIO4/SPI_MOSI", + # DIO4/SPI_MOSI DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD5: { - "manufacturer": "XBEE", - "model": "DIO5/Assoc", + # DIO5/Assoc DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD6: { - "manufacturer": "XBEE", - "model": "DIO6/RTS", + # DIO6/RTS DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD7: { - "manufacturer": "XBEE", - "model": "DIO7/CTS", + # DIO7/CTS DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff, XBeeAnalogInput], OUTPUT_CLUSTERS: [], }, 0xD8: { - "manufacturer": "XBEE", - "model": "DIO8", + # DIO8 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xD9: { - "manufacturer": "XBEE", - "model": "DIO9", + # DIO9 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDA: { - "manufacturer": "XBEE", - "model": "DIO10/PWM0", + # DIO10/PWM0 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDB: { - "manufacturer": "XBEE", - "model": "DIO11/PWM1", + # DIO11/PWM1 DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDC: { - "manufacturer": "XBEE", - "model": "DIO12/SPI_MISO", + # DIO12/SPI_MISO DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDD: { - "manufacturer": "XBEE", - "model": "DIO13/DOUT", + # DIO13/DOUT DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], OUTPUT_CLUSTERS: [], }, 0xDE: { - "manufacturer": "XBEE", - "model": "DIO14/DIN", + # DIO14/DIN DEVICE_TYPE: zha.DeviceType.LEVEL_CONTROL_SWITCH, PROFILE_ID: XBEE_PROFILE_ID, INPUT_CLUSTERS: [XBeeOnOff], From 22b9af340279305337937135a17ec7035ae5a88f Mon Sep 17 00:00:00 2001 From: Denis Shulyaka Date: Tue, 6 Oct 2020 22:05:38 +0300 Subject: [PATCH 2/2] Fix manufacturer to Digi --- zhaquirks/xbee/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zhaquirks/xbee/__init__.py b/zhaquirks/xbee/__init__.py index bab94d9abf..da3331b1af 100644 --- a/zhaquirks/xbee/__init__.py +++ b/zhaquirks/xbee/__init__.py @@ -336,5 +336,5 @@ def handle_cluster_request(self, tsn, command_id, args): OUTPUT_CLUSTERS: [SerialDataCluster, EventRelayCluster], } }, - "manufacturer": "XBee", + "manufacturer": "Digi", }