Skip to content
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

DDF fix ZHASwitch issues when upgrading from legacy sensors #5958

Merged
merged 8 commits into from
Apr 21, 2022
Merged

DDF fix ZHASwitch issues when upgrading from legacy sensors #5958

merged 8 commits into from
Apr 21, 2022

Conversation

manup
Copy link
Member

@manup manup commented Apr 14, 2022 •
edited
Loading

Related to PR #5903

  • Keep uniqueid of existing single sub-device ZHASwitch sensors if the one in DDF uniqueid template differs.
  • Proceed DDF search when first match expression fails: The EcoDim ED-10013 has two possible DDFs which need to be checked, but only the first one is.
  • Prevent adding double entries of lights and sensors.
  • Fix generation sensor id consider all ids from database.
  • Remove sensor duplicates with same uniqueid, keep the one with lowest id (assuming it's the oldest).
  • Case insensitive manufacturer name comparison when matching DDFs.
  • Merge separate DDF files for Sunricher based switches to not differentiate between 0006/1000 cluster id in uniqueid, the code automatically selects the right one if legacy joined switches exist with 1000 cluster id.

@manup manup added this to the v2.15.2-beta milestone Apr 14, 2022
@manup
DEV_AddResource prevent double entries
c87049f
@manup
DB support loading all sensor uniqueids of device per sensor type
44742b5
@manup
DDF prevent creating ZHASwitch sensors then uniqueid differs in legac…
73084fd 
…y DB

For single sub-device switches use just the existing uniqueid. The one in DDF
can differ from what the legacy code had once created.
@manup manup changed the title Fix DDF proceed search when first match expression fails DDF fix ZHASwitch issues when upgrading from legacy sensors Apr 15, 2022
@manup manup linked an issue Apr 19, 2022 that may be closed by this pull request
Sensors do not get loaded or assume a different ID than in the DB #5965
Closed
@manup
DDF compare manufacturer names case insensitive
f9bd82f 
Relaxes goodies like NAMRON vs. Namron.
@manup
DDF merge files for Sunricher 0006/1000 clusters in uniqueid
2b3cc7c 
The code now detects this and automatically loads the right legacy one.
New paired switches all use -0006 cluster in uniqueid.
@manup
Relax assert in DB_LoadSubDeviceItemsOfDevice
298c8e3
@manup manup merged commit f807c3e into dresden-elektronik:master Apr 21, 2022
@manup manup mentioned this pull request Apr 21, 2022
Merged
@manup manup deleted the ddf_ext branch January 3, 2023 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.15.2-beta
Development

Successfully merging this pull request may close these issues.

Sensors do not get loaded or assume a different ID than in the DB
1 participant
@manup