Skip to content

Commit ce37516

Browse files
tcarmelveilleuxtcarmelveilleux
committed
Fix codegen
1 parent 7a50170 commit ce37516

File tree

4 files changed

+158
-102
lines changed

4 files changed

+158
-102
lines changed

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+79-20
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,15 @@
141141
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
142142
"options": {
143143
"text": {
144-
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
144+
"defaultResponsePolicy": [
145+
"Always",
146+
"Conditional",
147+
"Never"
148+
]
145149
},
146-
"bool": ["commandDiscovery"]
150+
"bool": [
151+
"commandDiscovery"
152+
]
147153
},
148154
"defaults": {
149155
"text": {
@@ -189,8 +195,13 @@
189195
"SpecificationVersion",
190196
"MaxPathsPerInvoke"
191197
],
192-
"Bridged Device Basic Information": ["ProductAppearance"],
193-
"Descriptor": ["ClusterRevision", "FeatureMap"],
198+
"Bridged Device Basic Information": [
199+
"ProductAppearance"
200+
],
201+
"Descriptor": [
202+
"ClusterRevision",
203+
"FeatureMap"
204+
],
194205
"Device Energy Management": [
195206
"ESAType",
196207
"ESACanGenerate",
@@ -233,7 +244,11 @@
233244
"SessionEnergyDischarged",
234245
"FeatureMap"
235246
],
236-
"Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
247+
"Energy EVSE Mode": [
248+
"SupportedModes",
249+
"CurrentMode",
250+
"FeatureMap"
251+
],
237252
"Ethernet Network Diagnostics": [
238253
"PHYRate",
239254
"FullDuplex",
@@ -277,6 +292,9 @@
277292
"ICDCounter",
278293
"ClientsSupportedPerFabric"
279294
],
295+
"Occupancy Sensing": [
296+
"HoldTimeLimits"
297+
],
280298
"Operational Credentials": [
281299
"SupportedFabrics",
282300
"CommissionedFabrics",
@@ -372,14 +390,21 @@
372390
"CurrentMaxRate",
373391
"OverrunCount"
374392
],
375-
"Channel": ["Lineup", "CurrentChannel"],
393+
"Channel": [
394+
"Lineup",
395+
"CurrentChannel"
396+
],
376397
"Media Playback": [
377398
"SampledPosition",
378399
"ActiveAudioTrack",
379400
"ActiveTextTrack"
380401
],
381-
"Application Launcher": ["CurrentApp"],
382-
"Application Basic": ["Application"],
402+
"Application Launcher": [
403+
"CurrentApp"
404+
],
405+
"Application Basic": [
406+
"Application"
407+
],
383408
"Time Synchronization": [
384409
"TrustedTimeSource",
385410
"DefaultNTP",
@@ -391,15 +416,21 @@
391416
"TimeZoneListMaxSize",
392417
"DSTOffsetListMaxSize"
393418
],
394-
"Temperature Control": ["SupportedTemperatureLevels"],
419+
"Temperature Control": [
420+
"SupportedTemperatureLevels"
421+
],
395422
"Dishwasher Mode": [
396423
"SupportedModes",
397424
"CurrentMode",
398425
"StartUpMode",
399426
"OnMode",
400427
"FeatureMap"
401428
],
402-
"Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
429+
"Microwave Oven Mode": [
430+
"SupportedModes",
431+
"CurrentMode",
432+
"FeatureMap"
433+
],
403434
"Microwave Oven Control": [
404435
"CookTime",
405436
"MaxCookTime",
@@ -426,8 +457,16 @@
426457
"OnMode",
427458
"FeatureMap"
428459
],
429-
"RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
430-
"RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
460+
"RVC Clean Mode": [
461+
"SupportedModes",
462+
"CurrentMode",
463+
"FeatureMap"
464+
],
465+
"RVC Run Mode": [
466+
"SupportedModes",
467+
"CurrentMode",
468+
"FeatureMap"
469+
],
431470
"Operational State": [
432471
"OperationalState",
433472
"OperationalError",
@@ -604,8 +643,13 @@
604643
"LevelValue",
605644
"FeatureMap"
606645
],
607-
"Air Quality": ["AirQuality", "FeatureMap"],
608-
"Thermostat": ["QueuedPreset"],
646+
"Air Quality": [
647+
"AirQuality",
648+
"FeatureMap"
649+
],
650+
"Thermostat": [
651+
"QueuedPreset"
652+
],
609653
"Electrical Energy Measurement": [
610654
"Accuracy",
611655
"CumulativeEnergyImported",
@@ -637,13 +681,28 @@
637681
"NeutralCurrent",
638682
"FeatureMap"
639683
],
640-
"Power Topology": ["FeatureMap"],
641-
"Valve Configuration and Control": ["RemainingDuration"],
642-
"Boolean State Configuration": ["CurrentSensitivityLevel"],
643-
"Wi-Fi Network Management": ["SSID"]
684+
"Power Topology": [
685+
"FeatureMap"
686+
],
687+
"Valve Configuration and Control": [
688+
"RemainingDuration"
689+
],
690+
"Boolean State Configuration": [
691+
"CurrentSensitivityLevel"
692+
],
693+
"Wi-Fi Network Management": [
694+
"SSID"
695+
]
644696
},
645697
"defaultReportingPolicy": "mandatory",
646-
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
698+
"ZCLDataTypes": [
699+
"ARRAY",
700+
"BITMAP",
701+
"ENUM",
702+
"NUMBER",
703+
"STRING",
704+
"STRUCT"
705+
],
647706
"fabricHandling": {
648707
"automaticallyCreateFields": true,
649708
"indexFieldId": 254,
@@ -653,4 +712,4 @@
653712
"uiOptions": {
654713
"showProfileId": false
655714
}
656-
}
715+
}

‎src/app/zap-templates/zcl/zcl.json

+79-20
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,15 @@
139139
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
140140
"options": {
141141
"text": {
142-
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
142+
"defaultResponsePolicy": [
143+
"Always",
144+
"Conditional",
145+
"Never"
146+
]
143147
},
144-
"bool": ["commandDiscovery"]
148+
"bool": [
149+
"commandDiscovery"
150+
]
145151
},
146152
"defaults": {
147153
"text": {
@@ -187,8 +193,13 @@
187193
"SpecificationVersion",
188194
"MaxPathsPerInvoke"
189195
],
190-
"Bridged Device Basic Information": ["ProductAppearance"],
191-
"Descriptor": ["ClusterRevision", "FeatureMap"],
196+
"Bridged Device Basic Information": [
197+
"ProductAppearance"
198+
],
199+
"Descriptor": [
200+
"ClusterRevision",
201+
"FeatureMap"
202+
],
192203
"Device Energy Management": [
193204
"ESAType",
194205
"ESACanGenerate",
@@ -231,7 +242,11 @@
231242
"SessionEnergyDischarged",
232243
"FeatureMap"
233244
],
234-
"Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
245+
"Energy EVSE Mode": [
246+
"SupportedModes",
247+
"CurrentMode",
248+
"FeatureMap"
249+
],
235250
"Ethernet Network Diagnostics": [
236251
"PHYRate",
237252
"FullDuplex",
@@ -275,6 +290,9 @@
275290
"ICDCounter",
276291
"ClientsSupportedPerFabric"
277292
],
293+
"Occupancy Sensing": [
294+
"HoldTimeLimits"
295+
],
278296
"Operational Credentials": [
279297
"SupportedFabrics",
280298
"CommissionedFabrics",
@@ -370,14 +388,21 @@
370388
"CurrentMaxRate",
371389
"OverrunCount"
372390
],
373-
"Channel": ["Lineup", "CurrentChannel"],
391+
"Channel": [
392+
"Lineup",
393+
"CurrentChannel"
394+
],
374395
"Media Playback": [
375396
"SampledPosition",
376397
"ActiveAudioTrack",
377398
"ActiveTextTrack"
378399
],
379-
"Application Launcher": ["CurrentApp"],
380-
"Application Basic": ["Application"],
400+
"Application Launcher": [
401+
"CurrentApp"
402+
],
403+
"Application Basic": [
404+
"Application"
405+
],
381406
"Time Synchronization": [
382407
"TrustedTimeSource",
383408
"DefaultNTP",
@@ -389,15 +414,21 @@
389414
"TimeZoneListMaxSize",
390415
"DSTOffsetListMaxSize"
391416
],
392-
"Temperature Control": ["SupportedTemperatureLevels"],
417+
"Temperature Control": [
418+
"SupportedTemperatureLevels"
419+
],
393420
"Dishwasher Mode": [
394421
"SupportedModes",
395422
"CurrentMode",
396423
"StartUpMode",
397424
"OnMode",
398425
"FeatureMap"
399426
],
400-
"Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
427+
"Microwave Oven Mode": [
428+
"SupportedModes",
429+
"CurrentMode",
430+
"FeatureMap"
431+
],
401432
"Microwave Oven Control": [
402433
"CookTime",
403434
"MaxCookTime",
@@ -424,8 +455,16 @@
424455
"OnMode",
425456
"FeatureMap"
426457
],
427-
"RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
428-
"RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
458+
"RVC Clean Mode": [
459+
"SupportedModes",
460+
"CurrentMode",
461+
"FeatureMap"
462+
],
463+
"RVC Run Mode": [
464+
"SupportedModes",
465+
"CurrentMode",
466+
"FeatureMap"
467+
],
429468
"Operational State": [
430469
"OperationalState",
431470
"OperationalError",
@@ -602,8 +641,13 @@
602641
"LevelValue",
603642
"FeatureMap"
604643
],
605-
"Air Quality": ["AirQuality", "FeatureMap"],
606-
"Thermostat": ["QueuedPreset"],
644+
"Air Quality": [
645+
"AirQuality",
646+
"FeatureMap"
647+
],
648+
"Thermostat": [
649+
"QueuedPreset"
650+
],
607651
"Electrical Energy Measurement": [
608652
"Accuracy",
609653
"CumulativeEnergyImported",
@@ -635,13 +679,28 @@
635679
"NeutralCurrent",
636680
"FeatureMap"
637681
],
638-
"Power Topology": ["FeatureMap"],
639-
"Valve Configuration and Control": ["RemainingDuration"],
640-
"Boolean State Configuration": ["CurrentSensitivityLevel"],
641-
"Wi-Fi Network Management": ["SSID"]
682+
"Power Topology": [
683+
"FeatureMap"
684+
],
685+
"Valve Configuration and Control": [
686+
"RemainingDuration"
687+
],
688+
"Boolean State Configuration": [
689+
"CurrentSensitivityLevel"
690+
],
691+
"Wi-Fi Network Management": [
692+
"SSID"
693+
]
642694
},
643695
"defaultReportingPolicy": "mandatory",
644-
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
696+
"ZCLDataTypes": [
697+
"ARRAY",
698+
"BITMAP",
699+
"ENUM",
700+
"NUMBER",
701+
"STRING",
702+
"STRUCT"
703+
],
645704
"fabricHandling": {
646705
"automaticallyCreateFields": true,
647706
"indexFieldId": 254,
@@ -651,4 +710,4 @@
651710
"uiOptions": {
652711
"showProfileId": false
653712
}
654-
}
713+
}

0 commit comments

Comments
 (0)