ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Some Zigbee bugfixes

Browse source
This commit is contained in:
Ziver Koc 2021-07-12 22:39:57 +02:00
parent bcc4133a31
commit 3cd96cfc82
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java
View file

@ -130,7 +130,7 @@ public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore {
* A private data storage object connected to the DB schema. * A private data storage object connected to the DB schema.
*/ */
@DBBean.DBTable(ZIGBEE_NODE_TABLE) @DBBean.DBTable(ZIGBEE_NODE_TABLE)
private static class ZigbeeNodeDSO extends DBBean { public static class ZigbeeNodeDSO extends DBBean {
protected String address; protected String address;
protected String config; protected String config;

4
plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java
View file

@ -56,7 +56,9 @@ public abstract class ZigbeeHalDeviceConfig implements HalDeviceConfig {
if (!(o instanceof ZigbeeHalDeviceConfig)) return false; if (!(o instanceof ZigbeeHalDeviceConfig)) return false;
ZigbeeHalDeviceConfig that = (ZigbeeHalDeviceConfig) o; ZigbeeHalDeviceConfig that = (ZigbeeHalDeviceConfig) o;
return Objects.equals(zigbeeNodeAddressStr, that.zigbeeNodeAddressStr); return this.getClass() == that.getClass() &&
Objects.equals(zigbeeNodeAddressStr, that.zigbeeNodeAddressStr) &&
this.getZigbeeClusterId() == that.getZigbeeClusterId();
} }