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.

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

ZAP embedded layer: cleanup, proper layering for codec and PAL integration #698

Merged
merged 15 commits into from
May 20, 2020
Merged

Conversation

tecimovic
Copy link
Contributor

Summary

Previous state of the app layer made little sense, as it was mostly a direct dump of two different Silicon Labs application layers. It required a cleanup of directory structure, and creation of API layers that will allow integration with CHIP specific codec, downward integration with platform and network transport layer and upward integration with the end-developer callbacks that process the received commands.
This PR is a step forward in proper organization and allows other developers to start contributing codecs, for example.

make and make test at the src/app level should work.

Changes

  • Much renaming: The previous renaming of directories was just a direct drop, we can do better. The plugins now have a meaningful prefix that categorizes them.
  • API extraction: The headers are making some sense now.
  • Plugins: all the code is in plugins now. Earlier there were few incomprehensible directories lying around, which were created ad-hoc because the code was just created out of the blue.
  • Better unit tests that actually do something. (Though not enough yet.)

Todos

  • Solve the problem of using generated layer in a compiled form.
  • Integrate with the overall build system. Currently there is tons of Makefiles lying around, which should in the long run all be generated as they are boilerplate.
  • Remove the utest.* files from plugins. There should be a centralized unit testing plugin, no point polluting all the plugins with this.
  • Add generation tooling for plugins and generated code = integrate zap UI and zap generator with all this.
  • Properly integrate StructSpec and Struct layers to achieve library-based encoding/decoding of ZCL commands. Currently that is not yet done.
  • Abstract out attribute database from the data model. They are kind intertwined now, but there is no reason why the attribute DB could not be abstracted and bound to a simple implementaiton.
  • Many other things. (No kidding!)

Copy link
Contributor

@bhaskar-apple bhaskar-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tecimovic - thanks for this. Would you also please file GitHub issues tracking the remaining work for demo 1.

@woody-apple
Copy link
Contributor

@tecimovic Can we rebase this?

@tecimovic
Copy link
Contributor Author

@tecimovic Can we rebase this?

Yeah, I'll rebase it.

Copy link
Contributor

@rwalker-apple rwalker-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@codecov
Copy link

codecov bot commented May 19, 2020

Codecov Report

Merging #698 into master will increase coverage by 0.75%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #698      +/-   ##
==========================================
+ Coverage   58.72%   59.47%   +0.75%     
==========================================
  Files         130      130              
  Lines       12653    12657       +4     
==========================================
+ Hits         7430     7528      +98     
+ Misses       5223     5129      -94     
Impacted Files Coverage Δ
src/inet/InetFaultInjection.cpp 0.00% <0.00%> (-100.00%) ⬇️
src/inet/UDPEndPoint.cpp 0.00% <0.00%> (-63.81%) ⬇️
src/lib/core/CHIPEncoding.h 47.05% <0.00%> (-26.86%) ⬇️
src/system/SystemFaultInjection.cpp 31.81% <0.00%> (-18.19%) ⬇️
src/system/SystemObject.cpp 87.50% <0.00%> (-6.25%) ⬇️
src/inet/TCPEndPoint.h 0.00% <0.00%> (ø)
src/lib/core/CHIPTLVTags.h 66.66% <0.00%> (ø)
src/inet/InetLayer.cpp 36.64% <0.00%> (+36.64%) ⬆️
src/system/SystemError.cpp 69.38% <0.00%> (+61.22%) ⬆️
src/system/SystemTimer.cpp 76.74% <0.00%> (+72.09%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc264b1...a98522f. Read the comment docs.

Copy link
Contributor

@bhaskar-apple bhaskar-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@woody-apple
Copy link
Contributor

@gerickson @saurabhst @jelderton ?

@gerickson gerickson requested a review from andy31415 May 19, 2020 21:23
@woody-apple
Copy link
Contributor

@tecimovic can you merge in restyle?

@saurabhst - can we get some eyeballs on this?

@tecimovic
Copy link
Contributor Author

@tecimovic can you merge in restyle?

Done.

@saurabhst
Copy link
Contributor

@tecimovic can you merge in restyle?

@saurabhst - can we get some eyeballs on this?

requesting @BroderickCarlin and @tpmanley as well to review the PR

@woody-apple
Copy link
Contributor

Moving this along so we can start merging in demo progress. Please file issues if things are outstanding!

@woody-apple woody-apple merged commit 1dc5183 into project-chip:master May 20, 2020
@tecimovic tecimovic deleted the zap-2 branch May 23, 2020 12:51
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this pull request May 18, 2023
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
rerasool pushed a commit to SiliconLabs/matter that referenced this pull request Jun 23, 2023
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this pull request Sep 1, 2023
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
shgutte pushed a commit to shgutte/connectedhomeip that referenced this pull request Oct 5, 2023
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this pull request Oct 25, 2023
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
shgutte pushed a commit to shgutte/connectedhomeip that referenced this pull request Jan 11, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this pull request Jan 18, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
mkardous-silabs pushed a commit to mkardous-silabs/connectedhomeip that referenced this pull request Jan 29, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
mkardous-silabs pushed a commit to mkardous-silabs/connectedhomeip that referenced this pull request Jan 29, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this pull request Feb 15, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this pull request May 8, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
rcasallas-silabs pushed a commit to rcasallas-silabs/connectedhomeip that referenced this pull request Jun 20, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
rcasallas-silabs pushed a commit to rcasallas-silabs/connectedhomeip that referenced this pull request Jun 20, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
chirag-silabs pushed a commit to rosahay-silabs/connectedhomeip that referenced this pull request Jul 15, 2024
…py devices

Merge in WMN_TOOLS/matter from feature/wifi_NewFeature_doc_update to silabs

Squashed commit of the following:

commit 1e10c3f53935745dc8ed0a13001ee279ab4c3e64
Author: Mathieu Kardous <[email protected]>
Date:   Fri May 5 10:26:25 2023 -0400

    Add Wi-Fi low power section

commit c0d91a5edb75c1f831708a5b21bc78f6d36025f9
Author: senthil kumar E K <[email protected]>
Date:   Fri May 5 16:33:24 2023 +0530

    updated review comments releated to WiFi Station

commit f69f22246db17a637f66ea732413b8db7ccb0da6
Merge: 889affc08d c6de514b8f
Author: Ezra Hale <[email protected]>
Date:   Thu May 4 16:08:32 2023 -0400

    Merge branch 'silabs' of ssh://stash.silabs.com/wmn_tools/matter into feature/wifi_NewFeature_doc_update

     Conflicts:
    	docs/silabs/README.md

... and 46 more commits
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants