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

Camera spec updates #37229

Merged
merged 5 commits into from
Mar 7, 2025
Merged

Camera spec updates #37229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c0dabc
Fix compiler errors
gmarcosb Feb 3, 2025
6277afd
Minor updates from spec PR https://github.com/CHIP-Specifications/con…
gmarcosb Jan 27, 2025
fdff3e9
Run ZAP tool
gmarcosb Mar 4, 2025
20689be
Generated using ./scripts/tools/zap_regen_all.py
gmarcosb Mar 6, 2025
8b74890
Workaround for https://github.com/project-chip/zap/issues/1255
gmarcosb Mar 6, 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
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
12 changes: 6 additions & 6 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 @@ -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
8 changes: 4 additions & 4 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
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;
}
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
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.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_contactsensor_27f76aeaf5.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_contactsensor_lFAGG1bfRO.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 ...r_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.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_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
Loading
Loading