Skip to content

Commit 03d6fbb

Browse files
pidarpedpidarped
authored
Fix xml field generation errors for CamerAVStreamManagement cluster. (project-chip#36069)
There were some errors in the xml generation for some of the later spec changes in PR#35841. Note: The auto-generated code merged in is correct and reflect the latest spec changes to the cluster.
1 parent ac9537d commit 03d6fbb

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -192,122 +192,122 @@ Git: 0.9-fall2024-387-gfd3062545
192192
<attribute code="0x0008" side="server" define="SPEAKER_CAPABILITIES" type="AudioCapabilitiesStruct" reportable="true" optional="true">SpeakerCapabilities</attribute>
193193
<attribute code="0x0009" side="server" define="TWO_WAY_TALK_SUPPORT" type="TwoWayTalkSupportTypeEnum" reportable="true" min="0x00" max="0x02" optional="true">TwoWayTalkSupport</attribute>
194194
<attribute code="0x000A" side="server" define="SUPPORTED_SNAPSHOT_PARAMS" type="array" entryType="SnapshotParamsStruct" reportable="true" optional="true">SupportedSnapshotParams</attribute>
195-
<attribute code="0x000B" side="server" define="HDRCAPABLE" type="int32u" reportable="true">MaxNetworkBandwidth</attribute>
196-
<attribute code="0x000C" side="server" define="MAX_NETWORK_BANDWIDTH" type="int16u" reportable="true" optional="true">CurrentFrameRate</attribute>
197-
<attribute code="0x000D" side="server" define="CURRENT_FRAME_RATE" type="boolean" optional="true" default="0" writable="true">
195+
<attribute code="0x000B" side="server" define="MAX_NETWORK_BANDWIDTH" type="int32u" reportable="true">MaxNetworkBandwidth</attribute>
196+
<attribute code="0x000C" side="server" define="CURRENT_FRAME_RATE" type="int16u" reportable="true" optional="true">CurrentFrameRate</attribute>
197+
<attribute code="0x000D" side="server" define="HDRMODE_ENABLED" type="boolean" default="0" writable="true" optional="true">
198198
<description>HDRModeEnabled</description>
199199
<access op="read" privilege="manage"/>
200200
<access op="write" privilege="manage"/>
201201
</attribute>
202-
<attribute code="0x000E" side="server" define="HDRMODE" type="array" optional="true" entryType="VideoCodecEnum" reportable="true">CurrentVideoCodecs</attribute>
203-
<attribute code="0x000F" side="server" define="CURRENT_VIDEO_CODECS" type="SnapshotParamsStruct" reportable="true" optional="true">CurrentSnapshotConfig</attribute>
204-
<attribute code="0x0010" side="server" define="CURRENT_SNAPSHOT_CONFIG" type="array" reportable="true" entryType="fabric_idx">FabricsUsingCamera</attribute>
205-
<attribute code="0x0011" side="server" define="FABRICS_USING_CAMERA" type="array" entryType="VideoStreamStruct" reportable="true" optional="true">AllocatedVideoStreams</attribute>
206-
<attribute code="0x0012" side="server" define="ALLOCATED_VIDEO_STREAMS" type="array" entryType="AudioStreamStruct" reportable="true" optional="true">AllocatedAudioStreams</attribute>
207-
<attribute code="0x0013" side="server" define="ALLOCATED_AUDIO_STREAMS" type="array" entryType="SnapshotStreamStruct" reportable="true" optional="true">AllocatedSnapshotStreams</attribute>
208-
<attribute code="0x0014" side="server" define="ALLOCATED_SNAPSHOT_STREAMS" type="array" entryType="StreamTypeEnum" reportable="true" optional="true" writable="true">
202+
<attribute code="0x000E" side="server" define="CURRENT_VIDEO_CODECS" type="array" entryType="VideoCodecEnum" reportable="true" optional="true">CurrentVideoCodecs</attribute>
203+
<attribute code="0x000F" side="server" define="CURRENT_SNAPSHOT_CONFIG" type="SnapshotParamsStruct" reportable="true" optional="true">CurrentSnapshotConfig</attribute>
204+
<attribute code="0x0010" side="server" define="FABRICS_USING_CAMERA" type="array" entryType="fabric_idx" reportable="true">FabricsUsingCamera</attribute>
205+
<attribute code="0x0011" side="server" define="ALLOCATED_VIDEO_STREAMS" type="array" entryType="VideoStreamStruct" reportable="true" optional="true">AllocatedVideoStreams</attribute>
206+
<attribute code="0x0012" side="server" define="ALLOCATED_AUDIO_STREAMS" type="array" entryType="AudioStreamStruct" reportable="true" optional="true">AllocatedAudioStreams</attribute>
207+
<attribute code="0x0013" side="server" define="ALLOCATED_SNAPSHOT_STREAMS" type="array" entryType="SnapshotStreamStruct" reportable="true" optional="true">AllocatedSnapshotStreams</attribute>
208+
<attribute code="0x0014" side="server" define="RANKED_VIDEO_STREAM_PRIORITIES_LIST" type="array" entryType="StreamTypeEnum" reportable="true" writable="true" optional="true">
209209
<description>RankedVideoStreamPrioritiesList</description>
210210
<access op="read" privilege="administer"/>
211211
<access op="write" privilege="administer"/>
212212
</attribute>
213-
<attribute code="0x0015" side="server" define="RANKED_VIDEO_STREAM_PRIORITIES_LIST" type="boolean" writable="true" optional="true" default="0">SoftRecordingPrivacyModeEnabled</attribute>
214-
<attribute code="0x0016" side="server" define="SOFT_RECORDING_PRIVACY_MODE_SETTING" type="boolean" writable="true" optional="true" default="0">SoftLivestreamPrivacyModeEnabled</attribute>
215-
<attribute code="0x0017" side="server" define="SOFT_LIVESTREAM_PRIVACY_MODE_SETTING" type="boolean" optional="true" reportable="true" default="0">HardPrivacyModeOn</attribute>
216-
<attribute code="0x0018" side="server" define="HARD_PRIVACY_MODE" type="TriStateAutoEnum" optional="true" min="0x00" max="0x02" writable="true">
213+
<attribute code="0x0015" side="server" define="SOFT_RECORDING_PRIVACY_MODE_ENABLED" type="boolean" default="0" writable="true" optional="true">SoftRecordingPrivacyModeEnabled</attribute>
214+
<attribute code="0x0016" side="server" define="SOFT_LIVESTREAM_PRIVACY_MODE_ENABLED" type="boolean" default="0" writable="true" optional="true">SoftLivestreamPrivacyModeEnabled</attribute>
215+
<attribute code="0x0017" side="server" define="HARD_PRIVACY_MODE_ON" type="boolean" reportable="true" default="0" optional="true">HardPrivacyModeOn</attribute>
216+
<attribute code="0x0018" side="server" define="NIGHT_VISION" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
217217
<description>NightVision</description>
218218
<access op="read" privilege="manage"/>
219219
<access op="write" privilege="manage"/>
220220
</attribute>
221-
<attribute code="0x0019" side="server" define="NIGHT_VISION" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
221+
<attribute code="0x0019" side="server" define="NIGHT_VISION_ILLUM" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
222222
<description>NightVisionIllum</description>
223223
<access op="read" privilege="manage"/>
224224
<access op="write" privilege="manage"/>
225225
</attribute>
226-
<attribute code="0x001A" side="server" define="NIGHT_VISION_ILLUM" type="boolean" writable="true" optional="true" default="0">
226+
<attribute code="0x001A" side="server" define="AWBENABLED" type="boolean" default="0" writable="true" optional="true">
227227
<description>AWBEnabled</description>
228228
<access op="read" privilege="manage"/>
229229
<access op="write" privilege="manage"/>
230230
</attribute>
231-
<attribute code="0x001B" side="server" define="AWB" type="boolean" writable="true" optional="true" default="0">
231+
<attribute code="0x001B" side="server" define="AUTO_SHUTTER_SPEED_ENABLED" type="boolean" default="0" writable="true" optional="true">
232232
<description>AutoShutterSpeedEnabled</description>
233233
<access op="read" privilege="manage"/>
234234
<access op="write" privilege="manage"/>
235235
</attribute>
236-
<attribute code="0x001C" side="server" define="SHUTTER_SPEED" type="boolean" writable="true" optional="true" default="0">
236+
<attribute code="0x001C" side="server" define="AUTO_ISOENABLED" type="boolean" default="0" writable="true" optional="true">
237237
<description>AutoISOEnabled</description>
238238
<access op="read" privilege="manage"/>
239239
<access op="write" privilege="manage"/>
240240
</attribute>
241-
<attribute code="0x001D" side="server" define="ISO" type="ViewportStruct" optional="true">Viewport</attribute>
242-
<attribute code="0x001E" side="server" define="VIEWPORT" type="boolean" optional="true" default="0" writable="true">
241+
<attribute code="0x001D" side="server" define="VIEWPORT" type="ViewportStruct" optional="true">Viewport</attribute>
242+
<attribute code="0x001E" side="server" define="SPEAKER_MUTED" type="boolean" default="0" writable="true" optional="true">
243243
<description>SpeakerMuted</description>
244244
<access op="read" privilege="manage"/>
245245
<access op="write" privilege="manage"/>
246246
</attribute>
247-
<attribute code="0x001F" side="server" define="SPEAKER_ENABLED" type="int8u" writable="true" optional="true" max="254">
247+
<attribute code="0x001F" side="server" define="SPEAKER_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
248248
<description>SpeakerVolumeLevel</description>
249249
<access op="read" privilege="manage"/>
250250
<access op="write" privilege="manage"/>
251251
</attribute>
252-
<attribute code="0x0020" side="server" define="SPEAKER_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
252+
<attribute code="0x0020" side="server" define="SPEAKER_MAX_LEVEL" type="int8u" max="254" writable="true" optional="true">
253253
<description>SpeakerMaxLevel</description>
254254
<access op="read" privilege="manage"/>
255255
<access op="write" privilege="manage"/>
256256
</attribute>
257-
<attribute code="0x0021" side="server" define="SPEAKER_MAX_LEVEL" type="int8u" max="254" writable="true" optional="true">
257+
<attribute code="0x0021" side="server" define="SPEAKER_MIN_LEVEL" type="int8u" max="254" writable="true" optional="true">
258258
<description>SpeakerMinLevel</description>
259259
<access op="read" privilege="manage"/>
260260
<access op="write" privilege="manage"/>
261261
</attribute>
262-
<attribute code="0x0022" side="server" define="SPEAKER_MIN_LEVEL" type="boolean" writable="true" optional="true" default="0">
262+
<attribute code="0x0022" side="server" define="MICROPHONE_MUTED" type="boolean" default="0" writable="true" optional="true">
263263
<description>MicrophoneMuted</description>
264264
<access op="read" privilege="manage"/>
265265
<access op="write" privilege="manage"/>
266266
</attribute>
267-
<attribute code="0x0023" side="server" define="MIC_STATUS" type="int8u" writable="true" optional="true" max="254">
267+
<attribute code="0x0023" side="server" define="MICROPHONE_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
268268
<description>MicrophoneVolumeLevel</description>
269269
<access op="read" privilege="manage"/>
270270
<access op="write" privilege="manage"/>
271271
</attribute>
272-
<attribute code="0x0024" side="server" define="MIC_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
272+
<attribute code="0x0024" side="server" define="MICROPHONE_MAX_LEVEL" type="int8u" max="254" writable="true" optional="true">
273273
<description>MicrophoneMaxLevel</description>
274274
<access op="read" privilege="manage"/>
275275
<access op="write" privilege="manage"/>
276276
</attribute>
277-
<attribute code="0x0025" side="server" define="MIC_MAX_LEVEL" type="int8u" max="254" writable="true" optional="true">
277+
<attribute code="0x0025" side="server" define="MICROPHONE_MIN_LEVEL" type="int8u" max="254" writable="true" optional="true">
278278
<description>MicrophoneMinLevel</description>
279279
<access op="read" privilege="manage"/>
280280
<access op="write" privilege="manage"/>
281281
</attribute>
282-
<attribute code="0x0026" side="server" define="MIC_MIN_LEVEL" type="boolean" writable="true" optional="true" default="1">
282+
<attribute code="0x0026" side="server" define="MICROPHONE_AGCENABLED" type="boolean" default="1" writable="true" optional="true">
283283
<description>MicrophoneAGCEnabled</description>
284284
<access op="read" privilege="manage"/>
285285
<access op="write" privilege="manage"/>
286286
</attribute>
287-
<attribute code="0x0027" side="server" define="MIC_AGCENABLED" type="int16u" optional="true" max="359">ImageRotation</attribute>
288-
<attribute code="0x0028" side="server" define="IMAGE_ROTATION" type="boolean" optional="true" default="0">ImageFlipHorizontal</attribute>
289-
<attribute code="0x0029" side="server" define="IMAGE_FLIP_HORIZONTAL" type="boolean" optional="true" default="0">ImageFlipVertical</attribute>
290-
<attribute code="0x002A" side="server" define="IMAGE_FLIP_VERTICAL" type="boolean" optional="true" default="0" writable="true">
287+
<attribute code="0x0027" side="server" define="IMAGE_ROTATION" type="int16u" max="359" optional="true">ImageRotation</attribute>
288+
<attribute code="0x0028" side="server" define="IMAGE_FLIP_HORIZONTAL" type="boolean" default="0" optional="true">ImageFlipHorizontal</attribute>
289+
<attribute code="0x0029" side="server" define="IMAGE_FLIP_VERTICAL" type="boolean" default="0" optional="true">ImageFlipVertical</attribute>
290+
<attribute code="0x002A" side="server" define="LOCAL_VIDEO_RECORDING_ENABLED" type="boolean" default="0" writable="true" optional="true">
291291
<description>LocalVideoRecordingEnabled</description>
292292
<access op="read" privilege="manage"/>
293293
<access op="write" privilege="manage"/>
294294
</attribute>
295-
<attribute code="0x002B" side="server" define="LOCAL_VIDEO_RECORDING_ENABLED" type="boolean" writable="true" optional="true" default="0">
295+
<attribute code="0x002B" side="server" define="LOCAL_SNAPSHOT_RECORDING_ENABLED" type="boolean" default="0" writable="true" optional="true">
296296
<description>LocalSnapshotRecordingEnabled</description>
297297
<access op="read" privilege="manage"/>
298298
<access op="write" privilege="manage"/>
299299
</attribute>
300-
<attribute code="0x002C" side="server" define="LOCAL_SNAPSHOT_RECORDING_ENABLED" type="boolean" writable="true" optional="true" default="1">
300+
<attribute code="0x002C" side="server" define="STATUS_LIGHT_ENABLED" type="boolean" default="1" writable="true" optional="true">
301301
<description>StatusLightEnabled</description>
302302
<access op="read" privilege="manage"/>
303303
<access op="write" privilege="manage"/>
304304
</attribute>
305-
<attribute code="0x002D" side="server" define="STATUS_LIGHT" type="ThreeLevelAutoEnum" writable="true" optional="true" min="0x00" max="0x03">
305+
<attribute code="0x002D" side="server" define="STATUS_LIGHT_BRIGHTNESS" type="ThreeLevelAutoEnum" min="0x00" max="0x03" writable="true" optional="true">
306306
<description>StatusLightBrightness</description>
307307
<access op="read" privilege="manage"/>
308308
<access op="write" privilege="manage"/>
309309
</attribute>
310-
<attribute code="0x002E" side="server" define="STATUS_LIGHT_BRIGHTNESS" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
310+
<attribute code="0x002E" side="server" define="DEPTH_SENSOR_STATUS" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
311311
<description>DepthSensorStatus</description>
312312
<access op="read" privilege="manage"/>
313313
<access op="write" privilege="manage"/>

0 commit comments

Comments
 (0)