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

Sync csa branch with main #320

Merged
merged 16 commits into from
Mar 11, 2025
Merged

Sync csa branch with main #320

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4706914
Coalesce operational instance adds in MTROperationalBrowser. (#37906)
bzbarsky-apple Mar 7, 2025
9e9fa4e
Remove the redundant chip:: prefix (#37898)
bukepo Mar 7, 2025
c62d534
Updated the commands for TC_S_2_2 test step 8g and TC_S_2_5 test step…
Ashwinigrl Mar 7, 2025
09584dd
refactor: Rename CloseSession to MarkSessionDefunct and add MarkSessi…
swan-amazon Mar 7, 2025
15370ec
ESP32: handle nimble_port_init's return values based on idf version (…
shubhamdp Mar 7, 2025
d5d2f72
Generate PumpConfigurationControl cluster with Alchemy (#37917)
tersal Mar 7, 2025
2655013
Fix name conflicts in chef: Add namespace for chef window covering. (…
sxb427 Mar 7, 2025
9fe8c73
Enable the use of the ServerClusterInterfaceRegistry in Codegen Provi…
andy31415 Mar 7, 2025
36a1bbd
TLS Client Management cluster (#37115)
gmarcosb Mar 7, 2025
8b2cf2f
Camera spec updates (#37229)
gmarcosb Mar 7, 2025
652f786
Fix error handling in XPC version of invokeCommands. (#37934)
bzbarsky-apple Mar 8, 2025
f4260df
Fix run time error during initilization (#37892)
yufengwangca Mar 10, 2025
98a55fe
Bump jinja2 in /integrations/docker/images/stage-2/chip-build-efr32 (…
dependabot[bot] Mar 10, 2025
714907e
Add verbose flag to build_examples.py (#37894)
XToripuru Mar 10, 2025
59c205c
temporary workaround: keeping pygobject==3.50.0 to avoid dependency i…
Alami-Amine Mar 10, 2025
b56134c
Fix missing dependency (#37940)
sxb427 Mar 10, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/tls-certificate-management-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/tls-client-management-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
Expand Down
2 changes: 2 additions & 0 deletions docs/ids_and_codes/ERROR_CODES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ This file was **AUTOMATICALLY** generated by
| 38 | 0x26 | `CHIP_ERROR_WRONG_TLV_TYPE` |
| 39 | 0x27 | `CHIP_ERROR_TLV_CONTAINER_OPEN` |
| 40 | 0x28 | `CHIP_ERROR_IN_USE` |
| 41 | 0x29 | `CHIP_ERROR_HAD_FAILURES` |
| 42 | 0x2A | `CHIP_ERROR_INVALID_MESSAGE_TYPE` |
| 43 | 0x2B | `CHIP_ERROR_UNEXPECTED_TLV_ELEMENT` |
| 44 | 0x2C | `CHIP_ERROR_ALREADY_INITIALIZED` |
| 45 | 0x2D | `CHIP_ERROR_NOT_IMPLEMENTED` |
| 46 | 0x2E | `CHIP_ERROR_INVALID_ADDRESS` |
| 47 | 0x2F | `CHIP_ERROR_INVALID_ARGUMENT` |
Expand Down
1 change: 1 addition & 0 deletions docs/ids_and_codes/zap_clusters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ Generally regenerate using one of:
| 1872 | 0x750 | EcosystemInformation |
| 1873 | 0x751 | CommissionerControl |
| 2049 | 0x801 | TlsCertificateManagement |
| 2050 | 0x802 | TlsClientManagement |
| 4294048773 | 0xFFF1FC05 | UnitTesting |
| 4294048774 | 0xFFF1FC06 | FaultInjection |
| 4294048800 | 0xFFF1FC20 | SampleMei |
8 changes: 4 additions & 4 deletions examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
8 changes: 4 additions & 4 deletions examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
14 changes: 7 additions & 7 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down Expand Up @@ -5300,7 +5300,7 @@ cluster WindowCovering = 258 {

/** An interface for configuring and controlling pumps. */
cluster PumpConfigurationAndControl = 512 {
revision 3;
revision 4;

enum ControlModeEnum : enum8 {
kConstantSpeed = 0;
Expand Down Expand Up @@ -7024,7 +7024,7 @@ provisional cluster Chime = 1366 {
}

readonly attribute ChimeSoundStruct installedChimeSounds[] = 0;
attribute int8u activeChimeID = 1;
attribute int8u selectedChime = 1;
attribute boolean enabled = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -9315,7 +9315,7 @@ endpoint 1 {

server cluster Chime {
callback attribute installedChimeSounds;
callback attribute activeChimeID;
callback attribute selectedChime;
callback attribute enabled;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
Expand Down
14 changes: 7 additions & 7 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20987,14 +20987,14 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ActiveChimeID",
"name": "SelectedChime",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -21003,7 +21003,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -21019,7 +21019,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -21035,7 +21035,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -21051,7 +21051,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -21067,7 +21067,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
5 changes: 2 additions & 3 deletions examples/all-clusters-app/all-clusters-common/src/chime-instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ CHIP_ERROR ChimeCommandDelegate::GetChimeSoundByIndex(uint8_t chimeIndex, uint8_
return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
}
auto & selectedChime = supportedChimes[chimeIndex];
chip::CopyCharSpanToMutableCharSpan(selectedChime.name, name);
chimeID = selectedChime.chimeID;
return CHIP_NO_ERROR;
chimeID = selectedChime.chimeID;
return chip::CopyCharSpanToMutableCharSpan(selectedChime.name, name);
}

CHIP_ERROR ChimeCommandDelegate::GetChimeIDByIndex(uint8_t chimeIndex, uint8_t & chimeID)
Expand Down
10 changes: 5 additions & 5 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down Expand Up @@ -3712,7 +3712,7 @@ cluster WindowCovering = 258 {

/** An interface for configuring and controlling pumps. */
cluster PumpConfigurationAndControl = 512 {
revision 3;
revision 4;

enum ControlModeEnum : enum8 {
kConstantSpeed = 0;
Expand Down
8 changes: 4 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
12 changes: 6 additions & 6 deletions examples/camera-app/camera-common/camera-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down Expand Up @@ -2129,7 +2129,7 @@ provisional cluster Chime = 1366 {
}

readonly attribute ChimeSoundStruct installedChimeSounds[] = 0;
attribute int8u activeChimeID = 1;
attribute int8u selectedChime = 1;
attribute boolean enabled = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -2583,7 +2583,7 @@ endpoint 1 {

server cluster Chime {
callback attribute installedChimeSounds;
callback attribute activeChimeID;
callback attribute selectedChime;
callback attribute enabled;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
Expand Down
14 changes: 7 additions & 7 deletions examples/camera-app/linux/src/clusters/chime/chime-manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ CHIP_ERROR ChimeManager::GetChimeSoundByIndex(uint8_t chimeIndex, uint8_t & chim
{
return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
}
chimeID = mChimeSounds[chimeIndex].chimeID;

return CopyCharSpanToMutableCharSpan(mChimeSounds[chimeIndex].name, name);
auto & selectedChime = mChimeSounds[chimeIndex];
chimeID = selectedChime.chimeID;
return chip::CopyCharSpanToMutableCharSpan(selectedChime.name, name);
}

CHIP_ERROR ChimeManager::GetChimeIDByIndex(uint8_t chimeIndex, uint8_t & chimeID)
Expand All @@ -46,8 +46,8 @@ CHIP_ERROR ChimeManager::GetChimeIDByIndex(uint8_t chimeIndex, uint8_t & chimeID
{
return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
}

chimeID = mChimeSounds[chimeIndex].chimeID;
auto & selectedChime = mChimeSounds[chimeIndex];
chimeID = selectedChime.chimeID;
return CHIP_NO_ERROR;
}

Expand All @@ -60,9 +60,9 @@ Protocols::InteractionModel::Status ChimeManager::PlayChimeSound()
}

// Get the Active Chime ID
auto activeChimeID = mChimeServer->GetActiveChimeID();
auto selectedChime = mChimeServer->GetSelectedChime();

// Play chime sound
ChipLogDetail(Zcl, "Playing Chime with sound ID: %u", unsigned(activeChimeID));
ChipLogDetail(Zcl, "Playing Chime with sound ID: %u", unsigned(selectedChime));
return Protocols::InteractionModel::Status::Success;
}
3 changes: 3 additions & 0 deletions examples/chef/common/clusters/window-covering/chef-window-covering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ using namespace chip;
using namespace chip::app::Clusters;
using chip::Protocols::InteractionModel::Status;

namespace ChefWindowCovering {

constexpr size_t kWindowCoveringDelegateTableSize = MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT;
static_assert(kWindowCoveringDelegateTableSize <= kEmberInvalidEndpointIndex, "WindowCovering Delegate table size error");

Expand Down Expand Up @@ -68,6 +70,7 @@ void InitChefWindowCoveringCluster()
WindowCovering::SetDefaultDelegate(endpointId, gDelegateTable[epIndex].get());
}
}
} // namespace ChefWindowCovering

CHIP_ERROR WindowCovering::ChefDelegate::HandleMovement(WindowCoveringType type)
{
Expand Down
2 changes: 2 additions & 0 deletions examples/chef/common/clusters/window-covering/chef-window-covering.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,6 @@ class ChefDelegate : public Delegate
} // namespace app
} // namespace chip

namespace ChefWindowCovering {
void InitChefWindowCoveringCluster();
} // namespace ChefWindowCovering
2 changes: 1 addition & 1 deletion examples/chef/common/stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void ApplicationInit()

#ifdef MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER
ChipLogProgress(NotSpecified, "Initializing WindowCovering cluster delegate.");
InitChefWindowCoveringCluster();
ChefWindowCovering::InitChefWindowCoveringCluster();
#endif // MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER
}

Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
8 changes: 4 additions & 4 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
}

enum ThreeLevelAutoEnum : enum8 {
kLow = 0;
kMedium = 1;
kHigh = 2;
kAutomatic = 3;
kAuto = 0;
kLow = 1;
kMedium = 2;
kHigh = 3;
}

bitmap TestGlobalBitmap : bitmap32 {
Expand Down
Loading
Loading