Skip to content

Fix XBee manufacturer and model #513

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

Merged
Adminiuga merged 2 commits into from
Oct 6, 2020
Merged

Fix XBee manufacturer and model #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c4eabe
Fix XBee manufacturer and model
Shulyaka Oct 6, 2020
22b9af3
Fix manufacturer to Digi
Shulyaka Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions zhaquirks/xbee/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "Digi",
}
46 changes: 16 additions & 30 deletions zhaquirks/xbee/xbee3_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
46 changes: 16 additions & 30 deletions zhaquirks/xbee/xbee_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down