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

In emberAfEndpointConfigure() change endpoint ID to a uint16_t #22998

Merged
merged 62 commits into from
Oct 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
35fad7d
Test added march 8 (#15957)
kowsisoundhar12 Mar 9, 2022
d5f4b0b
[OTA] Fix OTARequestorDriverImpl inclusion (#15981)
carol-apple Mar 9, 2022
9bee828
Regen to fix CI failures (#15990)
bzbarsky-apple Mar 9, 2022
b942392
[ota] Store Default OTA Providers in flash (#15970)
Damian-Nordic Mar 9, 2022
c219807
Merge branch 'master' of github.com:project-chip/connectedhomeip
selissia Mar 11, 2022
fa279bc
Merge branch 'project-chip:master' into master
selissia Mar 11, 2022
9e18f9b
Merge branch 'project-chip:master' into master
selissia Mar 14, 2022
b6ca5ca
Merge branch 'project-chip:master' into master
selissia Mar 15, 2022
135dc25
Merge branch 'project-chip:master' into master
selissia Mar 18, 2022
0446c67
Merge branch 'project-chip:master' into master
selissia Mar 22, 2022
e69e63c
Merge branch 'project-chip:master' into master
selissia Mar 23, 2022
a40f6df
Merge branch 'project-chip:master' into master
selissia Mar 24, 2022
e5925ba
Merge branch 'project-chip:master' into master
selissia Mar 30, 2022
0435362
Merge branch 'project-chip:master' into master
selissia Apr 5, 2022
40b3412
Merge branch 'project-chip:master' into master
selissia Apr 12, 2022
d197cb5
Merge branch 'project-chip:master' into master
selissia Apr 13, 2022
e9b685d
Merge branch 'project-chip:master' into master
selissia Apr 15, 2022
ef11df2
Merge branch 'project-chip:master' into master
selissia Apr 18, 2022
b088f83
Merge branch 'project-chip:master' into master
selissia Apr 27, 2022
8530810
Merge branch 'project-chip:master' into master
selissia Apr 29, 2022
87a9581
Merge branch 'project-chip:master' into master
selissia May 4, 2022
d9b496d
Merge branch 'project-chip:master' into master
selissia May 10, 2022
2d283df
Merge branch 'project-chip:master' into master
selissia May 12, 2022
2639213
Merge branch 'project-chip:master' into master
selissia May 13, 2022
995a07e
Merge branch 'project-chip:master' into master
selissia May 18, 2022
139f480
Merge branch 'project-chip:master' into master
selissia May 19, 2022
f0beac0
Merge branch 'project-chip:master' into master
selissia May 20, 2022
70059e4
Merge branch 'project-chip:master' into master
selissia Jun 1, 2022
4faa576
Merge branch 'project-chip:master' into master
selissia Jun 2, 2022
e22e2fc
Merge branch 'project-chip:master' into master
selissia Jun 2, 2022
db5089c
Merge branch 'project-chip:master' into master
selissia Jun 6, 2022
8c46946
Merge branch 'project-chip:master' into master
selissia Jun 10, 2022
1a7e9fc
Merge branch 'project-chip:master' into master
selissia Jun 10, 2022
b823fa6
Merge branch 'project-chip:master' into master
selissia Jun 13, 2022
84968cf
Merge branch 'project-chip:master' into master
selissia Jun 14, 2022
11649cd
Merge branch 'project-chip:master' into master
selissia Jun 17, 2022
290caa2
Merge branch 'project-chip:master' into master
selissia Jun 21, 2022
e04c6c0
Merge branch 'project-chip:master' into master
selissia Jun 22, 2022
eb349eb
Merge branch 'project-chip:master' into master
selissia Jun 24, 2022
7ed2aef
Merge branch 'project-chip:master' into master
selissia Jul 7, 2022
92b9c16
Merge branch 'project-chip:master' into master
selissia Jul 8, 2022
a49c7cc
Merge branch 'project-chip:master' into master
selissia Jul 8, 2022
45c59d1
Merge branch 'project-chip:master' into master
selissia Jul 9, 2022
75e0fdc
Merge branch 'project-chip:master' into master
selissia Jul 12, 2022
93d693f
Merge branch 'project-chip:master' into master
selissia Jul 16, 2022
ae47488
Merge branch 'project-chip:master' into master
selissia Jul 20, 2022
1ea7fb3
Merge branch 'project-chip:master' into master
selissia Jul 25, 2022
6da2738
Merge branch 'master' of github.com:selissia/connectedhomeip
selissia Jul 29, 2022
f0e1f4f
Merge branch 'master' of github.com:selissia/connectedhomeip
selissia Aug 8, 2022
b4022ae
Merge branch 'master' of github.com:selissia/connectedhomeip
selissia Aug 11, 2022
1679c1a
Merge branch 'master' of github.com:selissia/connectedhomeip
selissia Aug 25, 2022
b38fc25
Merge branch 'project-chip:master' into master
selissia Aug 29, 2022
d65ec55
Merge branch 'master' of github.com:selissia/connectedhomeip
selissia Aug 31, 2022
d992fb5
Merge branch 'master' of github.com:selissia/connectedhomeip
selissia Sep 9, 2022
4b0b9ee
Remove merge artifacts
selissia Sep 9, 2022
ad68162
Merge branch 'project-chip:master' into master
selissia Sep 30, 2022
785816f
Merge branch 'project-chip:master' into master
selissia Oct 3, 2022
f0b1aba
Cast boolean to uint8_t as setOnOffValue expects, fixes GCC 8.3 error
selissia Oct 3, 2022
031bc13
Make endpoint id a uint16_t as per spec
selissia Oct 3, 2022
2d17db0
Restyled by clang-format
restyled-commits Oct 3, 2022
f95062f
Update the signature of OnOffServer::setOnOffValue() to avoid casts
selissia Oct 3, 2022
1672f76
Fix printf argument and formatting
selissia Oct 3, 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
4 changes: 2 additions & 2 deletions src/app/clusters/on-off-server/on-off-server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ EmberAfStatus OnOffServer::getOnOffValue(chip::EndpointId endpoint, bool * curre
* @param command Ver.: always
* @param initiatedByLevelChange Ver.: always
*/
EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, uint8_t command, bool initiatedByLevelChange)
EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::CommandId command, bool initiatedByLevelChange)
{
EmberAfStatus status;
bool currentValue, newValue;

emberAfOnOffClusterPrintln("On/Off set value: %x %x", endpoint, command);
emberAfOnOffClusterPrintln("On/Off set value: %x %x", endpoint, static_cast<uint8_t>(command));

// read current on/off value
status = Attributes::OnOff::Get(endpoint, &currentValue);
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/on-off-server/on-off-server.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class OnOffServer
const chip::app::Clusters::OnOff::Commands::OnWithTimedOff::DecodableType & commandData);
void updateOnOffTimeCommand(chip::EndpointId endpoint);
EmberAfStatus getOnOffValue(chip::EndpointId endpoint, bool * currentOnOffValue);
EmberAfStatus setOnOffValue(chip::EndpointId endpoint, uint8_t command, bool initiatedByLevelChange);
EmberAfStatus setOnOffValue(chip::EndpointId endpoint, chip::CommandId command, bool initiatedByLevelChange);
EmberAfStatus getOnOffValueForStartUp(chip::EndpointId endpoint, bool & onOffValueForStartUp);

bool HasFeature(chip::EndpointId endpoint, OnOffFeature feature);
Expand Down
2 changes: 1 addition & 1 deletion src/app/util/attribute-storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static uint16_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterI
// Initial configuration
void emberAfEndpointConfigure(void)
{
uint8_t ep;
uint16_t ep;
mrjerryjohns marked this conversation as resolved.
Show resolved Hide resolved

#if !defined(EMBER_SCRIPTED_TEST)
uint16_t fixedEndpoints[] = FIXED_ENDPOINT_ARRAY;
Expand Down