Skip to content

Commit 1ec0b29

Browse files
committed
Resolve conflict and run latest Alchemy
1 parent 325c955 commit 1ec0b29

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2081,7 +2081,7 @@
20812081
\
20822082
/* Endpoint: 1, Cluster: Chime (server) */ \
20832083
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InstalledChimeSounds */ \
2084-
{ ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00000001, 1, ZAP_TYPE(INT8U), \
2084+
{ ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00000001, 1, ZAP_TYPE(INT8U), \
20852085
ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* SelectedChime */ \
20862086
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BOOLEAN), \
20872087
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Enabled */ \

src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Git:
4040
<description>This cluster provides a way to access options associated with the operation of
4141
a laundry dryer device type.</description>
4242
<globalAttribute side="either" code="0xFFFD" value="1"/>
43-
<attribute side="server" code="0x0000" name="SupportedDrynessLevels" define="SUPPORTED_DRYNESS_LEVELS" type="array" entryType="DrynessLevelEnum" length="4" minLength="1">SupportedDrynessLevels</attribute>
44-
<attribute side="server" code="0x0001" name="SelectedDrynessLevel" define="SELECTED_DRYNESS_LEVEL" type="DrynessLevelEnum" writable="true" isNullable="true" min="0x00" max="0x03">SelectedDrynessLevel</attribute>
43+
<attribute side="server" code="0x0000" name="SupportedDrynessLevels" define="SUPPORTED_DRYNESS_LEVELS" type="array" entryType="DrynessLevelEnum" length="4" minLength="1"/>
44+
<attribute side="server" code="0x0001" name="SelectedDrynessLevel" define="SELECTED_DRYNESS_LEVEL" type="DrynessLevelEnum" writable="true" isNullable="true" min="0x00" max="0x03"/>
4545
</cluster>
4646
</configurator>

0 commit comments

Comments
 (0)