Fix content launcher cluster to have real feature bitmap instead of indexes (#35881)
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index dad6a33..3fa32d2 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -5452,9 +5452,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 8c529d0..79d17e5 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -7959,9 +7959,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
@@ -8112,9 +8112,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 802f8fa..467aed8 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -7872,9 +7872,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
@@ -8025,9 +8025,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index a4855f0..6ea0892 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -3115,9 +3115,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 9fc0a41..6d8fb37 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -2534,9 +2534,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
index 3c59ae1..7058f96 100644
--- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
@@ -177,12 +177,12 @@
</bitmap>
<bitmap name="Feature" type="bitmap32">
- <cluster code="0x050a"/>
- <field name="ContentSearch" mask="0x1"/>
- <field name="URLPlayback" mask="0x2"/>
- <field name="AdvancedSeek" mask="0x3"/>
- <field name="TextTracks" mask="0x4"/>
- <field name="AudioTracks" mask="0x5"/>
- </bitmap>
+ <cluster code="0x050a"/>
+ <field name="ContentSearch" mask="0x01"/>
+ <field name="URLPlayback" mask="0x02"/>
+ <field name="AdvancedSeek" mask="0x04"/>
+ <field name="TextTracks" mask="0x08"/>
+ <field name="AudioTracks" mask="0x10"/>
+ </bitmap>
</configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index c4b63de..2f7263b 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -9027,9 +9027,9 @@
bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
- kAdvancedSeek = 0x3;
- kTextTracks = 0x4;
- kAudioTracks = 0x5;
+ kAdvancedSeek = 0x4;
+ kTextTracks = 0x8;
+ kAudioTracks = 0x10;
}
bitmap SupportedProtocolsBitmap : bitmap32 {
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 25bf7be..9752185 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -44545,9 +44545,9 @@
class Feature(IntFlag):
kContentSearch = 0x1
kURLPlayback = 0x2
- kAdvancedSeek = 0x3
- kTextTracks = 0x4
- kAudioTracks = 0x5
+ kAdvancedSeek = 0x4
+ kTextTracks = 0x8
+ kAudioTracks = 0x10
class SupportedProtocolsBitmap(IntFlag):
kDash = 0x1
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 10dd241..7bbdbbe 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -20111,9 +20111,9 @@
typedef NS_OPTIONS(uint32_t, MTRContentLauncherFeature) {
MTRContentLauncherFeatureContentSearch MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
MTRContentLauncherFeatureURLPlayback MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
- MTRContentLauncherFeatureAdvancedSeek MTR_PROVISIONALLY_AVAILABLE = 0x3,
- MTRContentLauncherFeatureTextTracks MTR_PROVISIONALLY_AVAILABLE = 0x4,
- MTRContentLauncherFeatureAudioTracks MTR_PROVISIONALLY_AVAILABLE = 0x5,
+ MTRContentLauncherFeatureAdvancedSeek MTR_PROVISIONALLY_AVAILABLE = 0x4,
+ MTRContentLauncherFeatureTextTracks MTR_PROVISIONALLY_AVAILABLE = 0x8,
+ MTRContentLauncherFeatureAudioTracks MTR_PROVISIONALLY_AVAILABLE = 0x10,
} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
typedef NS_OPTIONS(uint32_t, MTRContentLauncherSupportedProtocolsBitmap) {
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index f7ebe66..13cbd2f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -5296,9 +5296,9 @@
{
kContentSearch = 0x1,
kURLPlayback = 0x2,
- kAdvancedSeek = 0x3,
- kTextTracks = 0x4,
- kAudioTracks = 0x5,
+ kAdvancedSeek = 0x4,
+ kTextTracks = 0x8,
+ kAudioTracks = 0x10,
};
// Bitmap for SupportedProtocolsBitmap
