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

Merging clusters with matter.js #59

Merged
merged 7 commits into from
Mar 23, 2023
Merged

Merging clusters with matter.js #59

merged 7 commits into from
Mar 23, 2023

Conversation

Apollon77
Copy link
Collaborator

@Apollon77 Apollon77 commented Mar 16, 2023 •
edited
Loading

This PR does the following:

  • Merge Clusters and Common types that already existed in matter.js with them from node-matter codebase
  • Also move over base38 and sync BitmapSchema
  • I splitted some constants already out of "Crypto" (which makes sense in any case in my eyes)
  • The second commit also contains all already approved adjustments from Recheck and sync all clusters again against Chip XML/Specs mfucci/node-matter#268 - the "mandatory lightning attrbutes and commands for Lighting support" are still commented out (this was only topic left in this PR)

One common type is left over (NodeId). I need Crypto abstraction for that what I will work on next and then have that as follow up.

@Apollon77 Apollon77 requested review from turon and mfucci March 16, 2023 14:40
@Apollon77 Apollon77 mentioned this pull request Mar 17, 2023
Closed
@Apollon77
Merge branch 'main' into clustermerge
1dbedc5 
# Conflicts:
#	packages/matter-node.js/src/codec/BitmapSchema.ts
#	packages/matter-node.js/src/matter/cluster/IdentifyCluster.ts
#	packages/matter-node.js/src/matter/cluster/OnOffCluster.ts
#	packages/matter-node.js/src/matter/cluster/server/GeneralCommissioningServer.ts
#	packages/matter-node.js/test/IntegrationTest.ts
#	packages/matter.js/test/schema/Base38SchemaTest.ts
@Apollon77 Apollon77 merged commit 3842914 into project-chip:main Mar 23, 2023
@Apollon77 Apollon77 deleted the clustermerge branch March 23, 2023 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfucci mfucci mfucci approved these changes

@turon turon Awaiting requested review from turon

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Apollon77 @mfucci