Skip to content

Commit

Permalink
regen zap
Browse files Browse the repository at this point in the history 
updated zap and regen

updated zap and regen

zap_regen_all & build chip-tool
  • Loading branch information
@eahove
eahove committed Nov 17, 2023
1 parent feabe0b commit f259abf
Show file tree
Hide file tree
Showing 37 changed files with 15,959 additions and 1,963 deletions.
432 changes: 403 additions & 29 deletions src/controller/data_model/controller-clusters.matter
View file

Large diffs are not rendered by default.

37 changes: 9 additions & 28 deletions src/controller/data_model/controller-clusters.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -2045,31 +2045,12 @@
]
},
{
"name": "Oven Mode",
"code": 73,
"name": "Laundry Dryer Controls",
"code": 74,
"mfgCode": null,
"define": "OVEN_MODE_CLUSTER",
"define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
"side": "client",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "ChangeToMode",
"code": 0,
"mfgCode": null,
"source": "client",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "ChangeToModeResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 1,
"isEnabled": 1
}
],
"attributes": [
{
"name": "FeatureMap",
Expand Down
197 changes: 41 additions & 156 deletions src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ public static class ScenesCluster extends BaseChipCluster {
private static final long NAME_SUPPORT_ATTRIBUTE_ID = 4L;
private static final long LAST_CONFIGURED_BY_ATTRIBUTE_ID = 5L;
private static final long SCENE_TABLE_SIZE_ATTRIBUTE_ID = 6L;
private static final long FABRIC_SCENE_INFO_ATTRIBUTE_ID = 7L;
private static final long REMAINING_CAPACITY_ATTRIBUTE_ID = 7L;
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
Expand Down Expand Up @@ -1600,10 +1600,6 @@ public interface LastConfiguredByAttributeCallback extends BaseAttributeCallback
void onSuccess(@Nullable Long value);
}

public interface FabricSceneInfoAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<ChipStructs.ScenesClusterSceneInfoStruct> value);
}

public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<Long> value);
}
Expand Down Expand Up @@ -1795,34 +1791,29 @@ public void onSuccess(byte[] tlv) {
}, SCENE_TABLE_SIZE_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readFabricSceneInfoAttribute(
FabricSceneInfoAttributeCallback callback) {
readFabricSceneInfoAttributeWithFabricFilter(callback, true);
}

public void readFabricSceneInfoAttributeWithFabricFilter(
FabricSceneInfoAttributeCallback callback, boolean isFabricFiltered) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRIC_SCENE_INFO_ATTRIBUTE_ID);
public void readRemainingCapacityAttribute(
IntegerAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_CAPACITY_ATTRIBUTE_ID);

readAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
List<ChipStructs.ScenesClusterSceneInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
}, FABRIC_SCENE_INFO_ATTRIBUTE_ID, isFabricFiltered);
}, REMAINING_CAPACITY_ATTRIBUTE_ID, true);
}

public void subscribeFabricSceneInfoAttribute(
FabricSceneInfoAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRIC_SCENE_INFO_ATTRIBUTE_ID);
public void subscribeRemainingCapacityAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_CAPACITY_ATTRIBUTE_ID);

subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
List<ChipStructs.ScenesClusterSceneInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, FABRIC_SCENE_INFO_ATTRIBUTE_ID, minInterval, maxInterval);
}, REMAINING_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readGeneratedCommandListAttribute(
Expand Down Expand Up @@ -19831,21 +19822,19 @@ public void onSuccess(byte[] tlv) {
}
}

public static class OvenModeCluster extends BaseChipCluster {
public static final long CLUSTER_ID = 73L;
public static class LaundryDryerControlsCluster extends BaseChipCluster {
public static final long CLUSTER_ID = 74L;

private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
private static final long START_UP_MODE_ATTRIBUTE_ID = 2L;
private static final long ON_MODE_ATTRIBUTE_ID = 3L;
private static final long SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID = 0L;
private static final long SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID = 1L;
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;

public OvenModeCluster(long devicePtr, int endpointId) {
public LaundryDryerControlsCluster(long devicePtr, int endpointId) {
super(devicePtr, endpointId, CLUSTER_ID);
}

Expand All @@ -19855,56 +19844,11 @@ public long initWithDevice(long devicePtr, int endpointId) {
return 0L;
}

public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
changeToMode(callback, newMode, 0);
}

public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
final long commandId = 0L;

ArrayList<StructElement> elements = new ArrayList<>();
final long newModeFieldID = 0L;
BaseTLVType newModetlvValue = new UIntType(newMode);
elements.add(new StructElement(newModeFieldID, newModetlvValue));

StructType value = new StructType(elements);
invoke(new InvokeCallbackImpl(callback) {
@Override
public void onResponse(StructType invokeStructValue) {
final long statusFieldID = 0L;
Integer status = null;
final long statusTextFieldID = 1L;
Optional<String> statusText = Optional.empty();
for (StructElement element: invokeStructValue.value()) {
if (element.contextTagNum() == statusFieldID) {
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
UIntType castingValue = element.value(UIntType.class);
status = castingValue.value(Integer.class);
}
} else if (element.contextTagNum() == statusTextFieldID) {
if (element.value(BaseTLVType.class).type() == TLVType.String) {
StringType castingValue = element.value(StringType.class);
statusText = Optional.of(castingValue.value(String.class));
}
}
}
callback.onSuccess(status, statusText);
}}, commandId, value, timedInvokeTimeoutMs);
}

public interface ChangeToModeResponseCallback extends BaseClusterCallback {
void onSuccess(Integer status, Optional<String> statusText);
}

public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<ChipStructs.OvenModeClusterModeOptionStruct> value);
public interface SupportedDrynessLevelsAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<Integer> value);
}

public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
void onSuccess(@Nullable Integer value);
}

public interface OnModeAttributeCallback extends BaseAttributeCallback {
public interface SelectedDrynessLevelAttributeCallback extends BaseAttributeCallback {
void onSuccess(@Nullable Integer value);
}

Expand All @@ -19924,122 +19868,63 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<Long> value);
}

public void readSupportedModesAttribute(
SupportedModesAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
public void readSupportedDrynessLevelsAttribute(
SupportedDrynessLevelsAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID);

readAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
List<ChipStructs.OvenModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
}, SUPPORTED_MODES_ATTRIBUTE_ID, true);
}

public void subscribeSupportedModesAttribute(
SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);

subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
List<ChipStructs.OvenModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readCurrentModeAttribute(
IntegerAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);

readAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
}, CURRENT_MODE_ATTRIBUTE_ID, true);
}

public void subscribeCurrentModeAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);

subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readStartUpModeAttribute(
StartUpModeAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);

readAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
@Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
}, START_UP_MODE_ATTRIBUTE_ID, true);
}

public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
writeStartUpModeAttribute(callback, value, 0);
}, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID, true);
}

public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
}

public void subscribeStartUpModeAttribute(
StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
public void subscribeSupportedDrynessLevelsAttribute(
SupportedDrynessLevelsAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID);

subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
@Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, START_UP_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
}, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readOnModeAttribute(
OnModeAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
public void readSelectedDrynessLevelAttribute(
SelectedDrynessLevelAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID);

readAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
@Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
}, ON_MODE_ATTRIBUTE_ID, true);
}, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID, true);
}

public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
writeOnModeAttribute(callback, value, 0);
public void writeSelectedDrynessLevelAttribute(DefaultClusterCallback callback, Integer value) {
writeSelectedDrynessLevelAttribute(callback, value, 0);
}

public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
public void writeSelectedDrynessLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
writeAttribute(new WriteAttributesCallbackImpl(callback), SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
}

public void subscribeOnModeAttribute(
OnModeAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
public void subscribeSelectedDrynessLevelAttribute(
SelectedDrynessLevelAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID);

subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
@Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
}, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readGeneratedCommandListAttribute(
Expand Down
Loading

0 comments on commit f259abf

Please sign in to comment.