Skip to content

Commit 542ced1

Browse files
cecilleraul-marquez-csa
cecille
authored and
raul-marquez-csa
committed
DM XMLs: 1.3 0.7 recirculation ballot (project-chip#31980)
* DM XML: Scrape from 1.3 0.7 recrirculation ballot * Manual fixes for aliased clusters (pending 1.2.4 fix in scraper) * Manual fix for base device type This broke again when I re-levelled the section headers. Will fix in spec.
1 parent fea9f7b commit 542ced1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+617
-703
lines changed

‎data_model/clusters/ConcentrationMeasurement.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,4 +261,4 @@ Davis, CA 95616, USA
261261
</mandatoryConform>
262262
</attribute>
263263
</attributes>
264-
</cluster>
264+
</cluster>

‎data_model/clusters/DemandResponseLoadControl.xml

-9
Original file line numberDiff line numberDiff line change
@@ -248,31 +248,26 @@ Davis, CA 95616, USA
248248
</struct>
249249
<struct name="LoadControlProgramStruct">
250250
<field id="0" name="ProgramID" type="octstr" default="0">
251-
<access read="true" write="true"/>
252251
<mandatoryConform/>
253252
<constraint type="maxLength" value="16"/>
254253
</field>
255254
<field id="1" name="Name" type="string">
256-
<access read="true" write="true"/>
257255
<mandatoryConform/>
258256
<constraint type="maxLength" value="32"/>
259257
</field>
260258
<field id="2" name="EnrollmentGroup" type="uint8" default="null">
261-
<access read="true" write="true"/>
262259
<quality nullable="true"/>
263260
<mandatoryConform>
264261
<feature name="ENRLG"/>
265262
</mandatoryConform>
266263
<constraint type="between" from="0x01" to="0xFF"/>
267264
</field>
268265
<field id="3" name="RandomStartMinutes" type="uint8" default="null">
269-
<access read="true" write="true"/>
270266
<quality nullable="true"/>
271267
<mandatoryConform/>
272268
<constraint type="between" from="0x00" to="0x3C"/>
273269
</field>
274270
<field id="4" name="RandomDurationMinutes" type="uint8" default="null">
275-
<access read="true" write="true"/>
276271
<quality nullable="true"/>
277272
<mandatoryConform/>
278273
<constraint type="between" from="0x00" to="0x3C"/>
@@ -286,31 +281,27 @@ Davis, CA 95616, USA
286281
</struct>
287282
<struct name="TemperatureControlStruct">
288283
<field id="0" name="CoolingTempOffset" type="ref_TempDiff" default="null">
289-
<access read="true" write="true"/>
290284
<quality nullable="true"/>
291285
<mandatoryConform>
292286
<feature name="TEMPO"/>
293287
</mandatoryConform>
294288
<constraint type="between" from="0x00" to="0x0FE"/>
295289
</field>
296290
<field id="1" name="HeatingTempOffset" type="ref_TempDiff" default="null">
297-
<access read="true" write="true"/>
298291
<quality nullable="true"/>
299292
<mandatoryConform>
300293
<feature name="TEMPO"/>
301294
</mandatoryConform>
302295
<constraint type="between" from="0x00" to="0x0FE"/>
303296
</field>
304297
<field id="2" name="CoolingTempSetpoint" type="temperature" default="null">
305-
<access read="true" write="true"/>
306298
<quality nullable="true"/>
307299
<mandatoryConform>
308300
<feature name="TEMPS"/>
309301
</mandatoryConform>
310302
<constraint type="between" from="0x954D" to="0x7FFF"/>
311303
</field>
312304
<field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
313-
<access read="true" write="true"/>
314305
<quality nullable="true"/>
315306
<mandatoryConform>
316307
<feature name="TEMPS"/>

‎data_model/clusters/DeviceEnergyManagement.xml

+6-49
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ Davis, CA 95616, USA
130130
</features>
131131
<dataTypes>
132132
<enum name="AdjustmentCauseEnum">
133-
<item value="0" name="Local" summary="The adjustment is to optimize the local energy usage">
133+
<item value="0" name="LocalOptimization" summary="The adjustment is to optimize the local energy usage">
134134
<optionalConform/>
135135
</item>
136-
<item value="1" name="Grid" summary="The adjustment is to optimize the grid energy usage">
136+
<item value="1" name="GridOptimization" summary="The adjustment is to optimize the grid energy usage">
137137
<optionalConform/>
138138
</item>
139139
</enum>
@@ -237,13 +237,13 @@ Davis, CA 95616, USA
237237
</item>
238238
</enum>
239239
<enum name="ForecastUpdateReasonEnum">
240-
<item value="0" name="Internal" summary="The update was due to internal ESA device optimization">
240+
<item value="0" name="InternalOptimization" summary="The update was due to internal ESA device optimization">
241241
<optionalConform/>
242242
</item>
243-
<item value="1" name="Local" summary="The update was due to local EMS optimization">
243+
<item value="1" name="LocalOptimization" summary="The update was due to local EMS optimization">
244244
<optionalConform/>
245245
</item>
246-
<item value="2" name="Grid" summary="The update was due to grid optimization">
246+
<item value="2" name="GridOptimization" summary="The update was due to grid optimization">
247247
<optionalConform/>
248248
</item>
249249
</enum>
@@ -257,218 +257,178 @@ Davis, CA 95616, USA
257257
<item value="2" name="GridOptOut" summary="The user has opted out of grid EMS optimizations only">
258258
<mandatoryConform/>
259259
</item>
260-
<item value="3" name="OptOut" summary="The user has opted out of all optimizations">
260+
<item value="3" name="OptOut" summary="The user has opted out of all external optimizations">
261261
<mandatoryConform/>
262262
</item>
263263
</enum>
264264
<struct name="ConstraintsStruct">
265265
<field id="0" name="StartTime" type="epoch-s">
266-
<access read="true" write="true"/>
267266
<mandatoryConform/>
268267
<constraint type="desc"/>
269268
</field>
270269
<field id="1" name="Duration" type="elapsed-s">
271-
<access read="true" write="true"/>
272270
<mandatoryConform/>
273271
<constraint type="between" from="0" to="86400"/>
274272
</field>
275273
<field id="2" name="NominalPower" type="power-mW">
276-
<access read="true" write="true"/>
277274
<mandatoryConform>
278275
<feature name="PFR"/>
279276
</mandatoryConform>
280277
<constraint type="desc"/>
281278
</field>
282279
<field id="3" name="MaximumEnergy" type="energy-mWh">
283-
<access read="true" write="true"/>
284280
<mandatoryConform>
285281
<feature name="PFR"/>
286282
</mandatoryConform>
287283
</field>
288284
<field id="4" name="LoadControl" type="int8">
289-
<access read="true" write="true"/>
290285
<mandatoryConform>
291286
<feature name="SFR"/>
292287
</mandatoryConform>
293288
</field>
294289
</struct>
295290
<struct name="CostStruct">
296291
<field id="0" name="CostType" type="CostTypeEnum" default="0">
297-
<access read="true"/>
298292
<mandatoryConform/>
299293
</field>
300294
<field id="1" name="Value" type="int32" default="0">
301-
<access read="true"/>
302295
<mandatoryConform/>
303296
</field>
304297
<field id="2" name="DecimalPoints" type="uint8" default="0">
305-
<access read="true"/>
306298
<mandatoryConform/>
307299
</field>
308300
<field id="3" name="Currency" type="uint16" default="0">
309-
<access read="true"/>
310301
<optionalConform/>
311302
<constraint type="max" value="999"/>
312303
</field>
313304
</struct>
314305
<struct name="ForecastStruct">
315306
<field id="0" name="ForecastId" type="uint16" default="0">
316-
<access read="true"/>
317307
<mandatoryConform/>
318308
</field>
319309
<field id="1" name="ActiveSlotNumber" type="uint16" default="0">
320-
<access read="true"/>
321310
<quality nullable="true"/>
322311
<mandatoryConform/>
323312
</field>
324313
<field id="2" name="StartTime" type="epoch-s">
325-
<access read="true"/>
326314
<mandatoryConform/>
327315
</field>
328316
<field id="3" name="EndTime" type="epoch-s">
329-
<access read="true"/>
330317
<mandatoryConform/>
331318
</field>
332319
<field id="4" name="EarliestStartTime" type="epoch-s">
333-
<access read="true"/>
334320
<quality nullable="true"/>
335321
<mandatoryConform>
336322
<feature name="STA"/>
337323
</mandatoryConform>
338324
</field>
339325
<field id="5" name="LatestEndTime" type="epoch-s">
340-
<access read="true"/>
341326
<mandatoryConform>
342327
<feature name="STA"/>
343328
</mandatoryConform>
344329
</field>
345330
<field id="6" name="IsPauseable" type="bool">
346-
<access read="true"/>
347331
<mandatoryConform/>
348332
</field>
349333
<field id="7" name="Slots" type="list">
350334
<entry type="SlotStruct"/>
351-
<access read="true"/>
352335
<mandatoryConform/>
353336
<constraint type="maxCount" value="10"/>
354337
</field>
355338
<field id="8" name="ForecastUpdateReason" type="ForecastUpdateReasonEnum">
356-
<access read="true"/>
357339
<mandatoryConform/>
358340
</field>
359341
</struct>
360342
<struct name="PowerAdjustStruct">
361343
<field id="0" name="MinPower" type="power-mW" default="0">
362-
<access read="true"/>
363344
<mandatoryConform/>
364345
</field>
365346
<field id="1" name="MaxPower" type="power-mW" default="0">
366-
<access read="true"/>
367347
<mandatoryConform/>
368348
</field>
369349
<field id="2" name="MinDuration" type="elapsed-s" default="0">
370-
<access read="true"/>
371350
<mandatoryConform/>
372351
</field>
373352
<field id="3" name="MaxDuration" type="elapsed-s">
374-
<access read="true"/>
375353
<mandatoryConform/>
376354
</field>
377355
</struct>
378356
<struct name="SlotAdjustmentStruct">
379357
<field id="0" name="SlotIndex" type="uint8">
380-
<access read="true" write="true"/>
381358
<mandatoryConform/>
382359
<constraint type="desc"/>
383360
</field>
384361
<field id="1" name="NominalPower" type="power-mW">
385-
<access read="true" write="true"/>
386362
<mandatoryConform/>
387363
<constraint type="desc"/>
388364
</field>
389365
<field id="2" name="Duration" type="elapsed-s">
390-
<access read="true" write="true"/>
391366
<mandatoryConform/>
392367
<constraint type="desc"/>
393368
</field>
394369
</struct>
395370
<struct name="SlotStruct">
396371
<field id="0" name="MinDuration" type="elapsed-s">
397-
<access read="true"/>
398372
<mandatoryConform/>
399373
</field>
400374
<field id="1" name="MaxDuration" type="elapsed-s">
401-
<access read="true"/>
402375
<mandatoryConform/>
403376
</field>
404377
<field id="2" name="DefaultDuration" type="elapsed-s">
405-
<access read="true"/>
406378
<mandatoryConform/>
407379
</field>
408380
<field id="3" name="ElapsedSlotTime" type="elapsed-s">
409-
<access read="true"/>
410381
<mandatoryConform/>
411382
</field>
412383
<field id="4" name="RemainingSlotTime" type="elapsed-s">
413-
<access read="true"/>
414384
<mandatoryConform/>
415385
</field>
416386
<field id="5" name="SlotIsPauseable" type="bool">
417-
<access read="true"/>
418387
<mandatoryConform>
419388
<feature name="PAU"/>
420389
</mandatoryConform>
421390
</field>
422391
<field id="6" name="MinPauseDuration" type="elapsed-s">
423-
<access read="true"/>
424392
<mandatoryConform>
425393
<feature name="PAU"/>
426394
</mandatoryConform>
427395
</field>
428396
<field id="7" name="MaxPauseDuration" type="elapsed-s">
429-
<access read="true"/>
430397
<mandatoryConform>
431398
<feature name="PAU"/>
432399
</mandatoryConform>
433400
</field>
434401
<field id="8" name="ManufacturerESAState" type="uint16">
435-
<access read="true"/>
436402
<mandatoryConform>
437403
<feature name="SFR"/>
438404
</mandatoryConform>
439405
</field>
440406
<field id="9" name="NominalPower" type="power-mW">
441-
<access read="true"/>
442407
<mandatoryConform>
443408
<feature name="PFR"/>
444409
</mandatoryConform>
445410
</field>
446411
<field id="10" name="MinPower" type="power-mW">
447-
<access read="true"/>
448412
<mandatoryConform>
449413
<feature name="PFR"/>
450414
</mandatoryConform>
451415
</field>
452416
<field id="11" name="MaxPower" type="power-mW">
453-
<access read="true"/>
454417
<mandatoryConform>
455418
<feature name="PFR"/>
456419
</mandatoryConform>
457420
</field>
458421
<field id="12" name="NominalEnergy" type="energy-mWh">
459-
<access read="true"/>
460422
<mandatoryConform>
461423
<feature name="PFR"/>
462424
</mandatoryConform>
463425
</field>
464426
<field id="13" name="Costs" type="list">
465427
<entry type="CostStruct"/>
466-
<access read="true"/>
467428
<optionalConform/>
468429
<constraint type="maxCount" value="5"/>
469430
</field>
470431
<field id="14" name="MinPowerAdjustment" type="power-mW">
471-
<access read="true"/>
472432
<mandatoryConform>
473433
<andTerm>
474434
<feature name="FA"/>
@@ -477,7 +437,6 @@ Davis, CA 95616, USA
477437
</mandatoryConform>
478438
</field>
479439
<field id="15" name="MaxPowerAdjustment" type="power-mW">
480-
<access read="true"/>
481440
<mandatoryConform>
482441
<andTerm>
483442
<feature name="FA"/>
@@ -486,7 +445,6 @@ Davis, CA 95616, USA
486445
</mandatoryConform>
487446
</field>
488447
<field id="16" name="MinDurationAdjustment" type="elapsed-s">
489-
<access read="true"/>
490448
<mandatoryConform>
491449
<andTerm>
492450
<feature name="FA"/>
@@ -498,7 +456,6 @@ Davis, CA 95616, USA
498456
</mandatoryConform>
499457
</field>
500458
<field id="17" name="MaxDurationAdjustment" type="elapsed-s">
501-
<access read="true"/>
502459
<mandatoryConform>
503460
<andTerm>
504461
<feature name="FA"/>

0 commit comments

Comments
 (0)