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

Link attribute reads to Content Apps, refactor content app platform to leverage latest cluster lib conventions #12969

Merged
merged 63 commits into from
Jan 27, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
4ef5cdd
link attribute reads to Content Apps
chrisdecenzo Dec 13, 2021
8cb6fb7
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
chrisdecenzo Dec 15, 2021
43ea264
address some comments
chrisdecenzo Dec 15, 2021
ec99cc2
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
chrisdecenzo Dec 16, 2021
7478963
route attribute reads and writes to per-cluster handlers
chrisdecenzo Dec 16, 2021
5e5a152
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
decenzo Dec 17, 2021
8505e03
refactor content app
decenzo Dec 21, 2021
8a11b4e
straggler
decenzo Dec 21, 2021
03868a3
use MEI log format commands
decenzo Dec 22, 2021
c0e2690
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
decenzo Dec 22, 2021
cdc026a
fix tv-app test suites
chrisdecenzo Dec 23, 2021
5b1ea4e
fix tv-app test suites
chrisdecenzo Dec 23, 2021
ba53262
sync to TOT
chrisdecenzo Dec 23, 2021
6ded4c7
fix CI test suites
chrisdecenzo Dec 23, 2021
f31ce97
fix CI test suites
chrisdecenzo Dec 24, 2021
0152677
add bindings call
chrisdecenzo Jan 4, 2022
efd362d
sync to TOT
chrisdecenzo Jan 4, 2022
0507e85
migrate content app to use new account login delegate
chrisdecenzo Jan 4, 2022
2356cc9
refactor ContentApp to use delegates
chrisdecenzo Jan 5, 2022
d4ef9c9
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
chrisdecenzo Jan 5, 2022
aa395e8
fix CI errors
chrisdecenzo Jan 5, 2022
07da92d
fix CI errors
chrisdecenzo Jan 5, 2022
71b9a43
fix CI errors
chrisdecenzo Jan 5, 2022
b8e6657
more ContentApp to app-platform directory
chrisdecenzo Jan 6, 2022
4fe3715
address issue 13144
chrisdecenzo Jan 6, 2022
bd5db22
address issue 12543
chrisdecenzo Jan 7, 2022
db9d88d
sync to TOT
chrisdecenzo Jan 12, 2022
5a97eb1
address comments
chrisdecenzo Jan 12, 2022
b04b81c
address comments
chrisdecenzo Jan 14, 2022
edd266e
fix handling of application launcher, application basic status and co…
chrisdecenzo Jan 16, 2022
55f37a7
sync TOT
chrisdecenzo Jan 16, 2022
04e3793
fix build
chrisdecenzo Jan 16, 2022
159ec20
fix android build
chrisdecenzo Jan 16, 2022
dffd77b
fix android build
chrisdecenzo Jan 16, 2022
840df4a
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
chrisdecenzo Jan 17, 2022
2d39958
add Commissioner Discovery Controller to manage UDC workflow
chrisdecenzo Jan 20, 2022
0d0c71d
address comments
chrisdecenzo Jan 23, 2022
fa48726
address comments
chrisdecenzo Jan 24, 2022
fb76264
fix builds
chrisdecenzo Jan 24, 2022
d0b5b7f
fix builds
chrisdecenzo Jan 24, 2022
514cbcf
fix builds
chrisdecenzo Jan 24, 2022
9c20d42
address comments
chrisdecenzo Jan 24, 2022
024f5dd
fix potential leak on commands
chrisdecenzo Jan 24, 2022
0b147d2
fix potential leak on attribute reads
chrisdecenzo Jan 25, 2022
ea68629
fix potential leak on attribute reads
chrisdecenzo Jan 25, 2022
e176842
merge with TOT
chrisdecenzo Jan 25, 2022
f165fc7
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
chrisdecenzo Jan 25, 2022
98326ef
argument and naming consistency
chrisdecenzo Jan 25, 2022
58929fd
fix android build
chrisdecenzo Jan 25, 2022
dad1adc
fix android build
chrisdecenzo Jan 25, 2022
76f19fd
fix android build
chrisdecenzo Jan 25, 2022
9edc45a
fix android build
chrisdecenzo Jan 25, 2022
8c5df04
address easy comments
chrisdecenzo Jan 25, 2022
d3cb64a
fix android build
chrisdecenzo Jan 26, 2022
f71f4ba
sync to TOT
chrisdecenzo Jan 26, 2022
c6bc7b9
fix android
chrisdecenzo Jan 26, 2022
4988e77
fix merge issue
chrisdecenzo Jan 26, 2022
b7dc8fb
optimize image size
chrisdecenzo Jan 26, 2022
6514946
fix build
chrisdecenzo Jan 26, 2022
940011d
attempt to fix CI build
chrisdecenzo Jan 26, 2022
7abcd0f
attempt to fix CI build
chrisdecenzo Jan 26, 2022
9de31b4
attempt to fix CI build
chrisdecenzo Jan 26, 2022
d37b84b
reduce dependencies
chrisdecenzo Jan 27, 2022
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
3 changes: 3 additions & 0 deletions src/controller/CommissionerDiscoveryController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
#include <controller/CommissionerDiscoveryController.h>
#include <platform/CHIPDeviceLayer.h>

#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY

using namespace ::chip;
using namespace chip::Protocols::UserDirectedCommissioning;

Expand Down Expand Up @@ -157,3 +159,4 @@ void CommissionerDiscoveryController::Cancel()
mPendingConsent = false;
return;
}
#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
4 changes: 4 additions & 0 deletions src/controller/CommissionerDiscoveryController.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#include <platform/CHIPDeviceLayer.h>
#include <protocols/user_directed_commissioning/UserDirectedCommissioning.h>

#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
chrisdecenzo marked this conversation as resolved.
Show resolved Hide resolved

using chip::Protocols::UserDirectedCommissioning::UDCClientState;
using chip::Protocols::UserDirectedCommissioning::UserConfirmationProvider;
using chip::Protocols::UserDirectedCommissioning::UserDirectedCommissioningServer;
Expand Down Expand Up @@ -180,3 +182,5 @@ class CommissionerDiscoveryController : public chip::Protocols::UserDirectedComm
PincodeService * mPincodeService = nullptr;
CommissionerCallback * mCommissionerCallback = nullptr;
};

#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY