Skip to content

Commit 12b2163

Browse files
Rebase on master
1 parent 8a8a187 commit 12b2163

File tree

10 files changed

+173
-404
lines changed

10 files changed

+173
-404
lines changed

data_model/1.3/clusters/EnergyCalendar.xml

-287
This file was deleted.

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -33408,10 +33408,10 @@ public void onSuccess(byte[] tlv) {
3340833408
public static class EnergyCalendarCluster extends BaseChipCluster {
3340933409
public static final long CLUSTER_ID = 154L;
3341033410

33411-
private static final long CALENDAR_I_D_ATTRIBUTE_ID = 0L;
33411+
private static final long CALENDAR_ID_ATTRIBUTE_ID = 0L;
3341233412
private static final long NAME_ATTRIBUTE_ID = 1L;
33413-
private static final long PROVIDER_I_D_ATTRIBUTE_ID = 2L;
33414-
private static final long EVENT_I_D_ATTRIBUTE_ID = 3L;
33413+
private static final long PROVIDER_ID_ATTRIBUTE_ID = 2L;
33414+
private static final long EVENT_ID_ATTRIBUTE_ID = 3L;
3341533415
private static final long START_DATE_ATTRIBUTE_ID = 4L;
3341633416
private static final long CALENDAR_PERIODS_ATTRIBUTE_ID = 5L;
3341733417
private static final long SPECIAL_DAYS_ATTRIBUTE_ID = 6L;
@@ -33503,28 +33503,28 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback {
3350333503

3350433504
public void readCalendarIDAttribute(
3350533505
CalendarIDAttributeCallback callback) {
33506-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CALENDAR_I_D_ATTRIBUTE_ID);
33506+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CALENDAR_ID_ATTRIBUTE_ID);
3350733507

3350833508
readAttribute(new ReportCallbackImpl(callback, path) {
3350933509
@Override
3351033510
public void onSuccess(byte[] tlv) {
3351133511
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
3351233512
callback.onSuccess(value);
3351333513
}
33514-
}, CALENDAR_I_D_ATTRIBUTE_ID, true);
33514+
}, CALENDAR_ID_ATTRIBUTE_ID, true);
3351533515
}
3351633516

3351733517
public void subscribeCalendarIDAttribute(
3351833518
CalendarIDAttributeCallback callback, int minInterval, int maxInterval) {
33519-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CALENDAR_I_D_ATTRIBUTE_ID);
33519+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CALENDAR_ID_ATTRIBUTE_ID);
3352033520

3352133521
subscribeAttribute(new ReportCallbackImpl(callback, path) {
3352233522
@Override
3352333523
public void onSuccess(byte[] tlv) {
3352433524
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
3352533525
callback.onSuccess(value);
3352633526
}
33527-
}, CALENDAR_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
33527+
}, CALENDAR_ID_ATTRIBUTE_ID, minInterval, maxInterval);
3352833528
}
3352933529

3353033530
public void readNameAttribute(
@@ -33555,54 +33555,54 @@ public void onSuccess(byte[] tlv) {
3355533555

3355633556
public void readProviderIDAttribute(
3355733557
ProviderIDAttributeCallback callback) {
33558-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PROVIDER_I_D_ATTRIBUTE_ID);
33558+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PROVIDER_ID_ATTRIBUTE_ID);
3355933559

3356033560
readAttribute(new ReportCallbackImpl(callback, path) {
3356133561
@Override
3356233562
public void onSuccess(byte[] tlv) {
3356333563
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
3356433564
callback.onSuccess(value);
3356533565
}
33566-
}, PROVIDER_I_D_ATTRIBUTE_ID, true);
33566+
}, PROVIDER_ID_ATTRIBUTE_ID, true);
3356733567
}
3356833568

3356933569
public void subscribeProviderIDAttribute(
3357033570
ProviderIDAttributeCallback callback, int minInterval, int maxInterval) {
33571-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PROVIDER_I_D_ATTRIBUTE_ID);
33571+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PROVIDER_ID_ATTRIBUTE_ID);
3357233572

3357333573
subscribeAttribute(new ReportCallbackImpl(callback, path) {
3357433574
@Override
3357533575
public void onSuccess(byte[] tlv) {
3357633576
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
3357733577
callback.onSuccess(value);
3357833578
}
33579-
}, PROVIDER_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
33579+
}, PROVIDER_ID_ATTRIBUTE_ID, minInterval, maxInterval);
3358033580
}
3358133581

3358233582
public void readEventIDAttribute(
3358333583
EventIDAttributeCallback callback) {
33584-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_I_D_ATTRIBUTE_ID);
33584+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_ID_ATTRIBUTE_ID);
3358533585

3358633586
readAttribute(new ReportCallbackImpl(callback, path) {
3358733587
@Override
3358833588
public void onSuccess(byte[] tlv) {
3358933589
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
3359033590
callback.onSuccess(value);
3359133591
}
33592-
}, EVENT_I_D_ATTRIBUTE_ID, true);
33592+
}, EVENT_ID_ATTRIBUTE_ID, true);
3359333593
}
3359433594

3359533595
public void subscribeEventIDAttribute(
3359633596
EventIDAttributeCallback callback, int minInterval, int maxInterval) {
33597-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_I_D_ATTRIBUTE_ID);
33597+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_ID_ATTRIBUTE_ID);
3359833598

3359933599
subscribeAttribute(new ReportCallbackImpl(callback, path) {
3360033600
@Override
3360133601
public void onSuccess(byte[] tlv) {
3360233602
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
3360333603
callback.onSuccess(value);
3360433604
}
33605-
}, EVENT_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
33605+
}, EVENT_ID_ATTRIBUTE_ID, minInterval, maxInterval);
3360633606
}
3360733607

3360833608
public void readStartDateAttribute(

0 commit comments

Comments
 (0)