Skip to content

Commit

Permalink
Regenerate generated code again.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bzbarsky-apple
bzbarsky-apple committed Nov 15, 2023
1 parent ccf9eca commit 73cb48f
Show file tree
Hide file tree
Showing 452 changed files with 14,782 additions and 16,890 deletions.
101 changes: 40 additions & 61 deletions src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3671,9 +3671,9 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
}

/** This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control. */
client cluster DemandReponseLoadControl = 150 {
client cluster DemandResponseLoadControl = 150 {
enum CriticalityLevelEnum : enum8 {
kInvalid = 0;
kUnknown = 0;
kGreen = 1;
kLevel1 = 2;
kLevel2 = 3;
Expand All @@ -3688,7 +3688,7 @@ client cluster DemandReponseLoadControl = 150 {
enum HeatingSourceEnum : enum8 {
kAny = 0;
kElectric = 1;
kNaturalGas = 2;
kNonElectric = 2;
}

enum LoadControlEventChangeSourceEnum : enum8 {
Expand All @@ -3697,7 +3697,7 @@ client cluster DemandReponseLoadControl = 150 {
}

enum LoadControlEventStatusEnum : enum8 {
kInvalid = 0;
kUnknown = 0;
kReceived = 1;
kInProgress = 2;
kCompleted = 3;
Expand All @@ -3723,23 +3723,23 @@ client cluster DemandReponseLoadControl = 150 {
}

bitmap DeviceClassBitmap : bitmap32 {
kHVACCompressorOrFurnace = 0x1;
kStripHeatBaseboardHeat = 0x2;
kHVAC = 0x1;
kStripHeater = 0x2;
kWaterHeater = 0x4;
kPoolPumpSpaJacuzzi = 0x8;
kSmartAppliances = 0x10;
kPoolPump = 0x8;
kSmartAppliance = 0x10;
kIrrigationPump = 0x20;
kManagedCAndILoads = 0x40;
kSimpleMiscLoads = 0x80;
kCommercialLoad = 0x40;
kResidentialLoad = 0x80;
kExteriorLighting = 0x100;
kInteriorLighting = 0x200;
kElectricVehicle = 0x400;
kGenerationSystems = 0x800;
kEV = 0x400;
kGenerationSystem = 0x800;
kSmartInverter = 0x1000;
kEVSE = 0x2000;
kRESU = 0x4000;
kEnergyManagementSytem = 0x8000;
kSmartEnergyModule = 0x10000;
kEMS = 0x8000;
kSEM = 0x10000;
}

bitmap EventControlBitmap : bitmap16 {
Expand Down Expand Up @@ -3770,48 +3770,36 @@ client cluster DemandReponseLoadControl = 150 {
}

struct DutyCycleControlStruct {
int8u dutyCycle = 0;
percent dutyCycle = 0;
}

struct AverageLoadControlStruct {
int8s loadAdjustment = 0;
}

struct TemperatureControlStruct {
nullable int16u coolingTempOffset = 0;
nullable int16u heatTempOffset = 1;
nullable int16u coolingTempSetpoint = 2;
nullable int16u heatingTempSetpoint = 3;
optional nullable int16u coolingTempOffset = 0;
optional nullable int16u heatingtTempOffset = 1;
optional nullable temperature coolingTempSetpoint = 2;
optional nullable temperature heatingTempSetpoint = 3;
}

struct LoadControlEventTransitionStruct {
int16u duration = 0;
EventTransitionControlBitmap control = 1;
nullable TemperatureControlStruct temperatureControl = 2;
nullable AverageLoadControlStruct averageLoadControl = 3;
nullable DutyCycleControlStruct dutyCycleControl = 4;
nullable PowerSavingsControlStruct powerSavingsControl = 5;
nullable HeatingSourceControlStruct heatingSourceControl = 6;
}

fabric_scoped struct ScopedLoadControlEventStruct {
octet_string<16> eventID = 0;
octet_string<16> programControl = 1;
EventControlBitmap control = 2;
DeviceClassBitmap deviceClass = 3;
nullable int8u enrollmentGroup = 4;
CriticalityLevelEnum criticality = 5;
nullable epoch_s startTime = 6;
LoadControlEventTransitionStruct transitions[] = 7;
fabric_idx fabricIndex = 254;
optional TemperatureControlStruct temperatureControl = 2;
optional AverageLoadControlStruct averageLoadControl = 3;
optional DutyCycleControlStruct dutyCycleControl = 4;
optional PowerSavingsControlStruct powerSavingsControl = 5;
optional HeatingSourceControlStruct heatingSourceControl = 6;
}

struct LoadControlEventStruct {
octet_string<16> eventID = 0;
octet_string<16> programControl = 1;
nullable octet_string<16> programID = 1;
EventControlBitmap control = 2;
DeviceClassBitmap deviceClass = 3;
nullable int8u enrollmentGroup = 4;
optional int8u enrollmentGroup = 4;
CriticalityLevelEnum criticality = 5;
nullable epoch_s startTime = 6;
LoadControlEventTransitionStruct transitions[] = 7;
Expand All @@ -3825,37 +3813,28 @@ client cluster DemandReponseLoadControl = 150 {
nullable int8u randomDurationMinutes = 4;
}

fabric_scoped struct ScopedLoadControlProgramStruct {
octet_string<16> programID = 0;
long_char_string<32> name = 1;
nullable int8u enrollmentGroup = 2;
nullable int8u randomStartMinutes = 3;
nullable int8u randomDurationMinutes = 4;
fabric_idx fabricIndex = 254;
}

info event LoadControlEventStatusChange = 0 {
octet_string eventID = 0;
nullable int8u transitionIndex = 1;
LoadControlEventStatusEnum status = 2;
CriticalityLevelEnum criticality = 3;
EventControlBitmap control = 4;
TemperatureControlStruct temperatureControl = 5;
AverageLoadControlStruct averageLoadControl = 6;
DutyCycleControlStruct dutyCycleControl = 7;
PowerSavingsControlStruct powerSavingsControl = 8;
HeatingSourceControlStruct heatingSourceControl = 9;
octet_string signature = 255;
optional nullable TemperatureControlStruct temperatureControl = 5;
optional nullable AverageLoadControlStruct averageLoadControl = 6;
optional nullable DutyCycleControlStruct dutyCycleControl = 7;
optional nullable PowerSavingsControlStruct powerSavingsControl = 8;
optional nullable HeatingSourceControlStruct heatingSourceControl = 9;
}

readonly attribute DeviceClassBitmap deviceClass = 0;
readonly attribute ScopedLoadControlProgramStruct loadControlPrograms[] = 1;
readonly attribute LoadControlProgramStruct loadControlPrograms[] = 1;
readonly attribute int8u numberOfLoadControlPrograms = 2;
readonly attribute ScopedLoadControlEventStruct events[] = 3;
readonly attribute int8u numberOfEventsPerProgram = 4;
readonly attribute int8u numberOfTransistions = 5;
readonly attribute int8u defaultRandomStart = 6;
readonly attribute int8u defaultRandomDuration = 7;
readonly attribute LoadControlEventStruct events[] = 3;
readonly attribute LoadControlEventStruct activeEvents[] = 4;
readonly attribute int8u numberOfEventsPerProgram = 5;
readonly attribute int8u numberOfTransistions = 6;
attribute access(write: manage) int8u defaultRandomStart = 7;
attribute access(write: manage) int8u defaultRandomDuration = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -3884,9 +3863,9 @@ client cluster DemandReponseLoadControl = 150 {
command RegisterLoadControlProgramRequest(RegisterLoadControlProgramRequestRequest): DefaultSuccess = 0;
/** Upon receipt, this SHALL remove a the LoadControlProgramStruct from LoadControlPrograms with the matching ProgramID. */
command UnregisterLoadControlProgramRequest(UnregisterLoadControlProgramRequestRequest): DefaultSuccess = 1;
/** On receipt of the AddLoadControlEventsRequest command, the server SHALL add a load control event: */
/** On receipt of the AddLoadControlEventsRequest command, the server SHALL add a load control event. */
command AddLoadControlEventRequest(AddLoadControlEventRequestRequest): DefaultSuccess = 2;
/** Upon receipt, this SHALL remove a the LoadControlEventStruct from LoadEventPrograms with the matching EventID. */
/** Upon receipt, this SHALL remove the LoadControlEventStruct with the matching EventID from LoadEventPrograms. */
command RemoveLoadControlEventRequest(RemoveLoadControlEventRequestRequest): DefaultSuccess = 3;
/** Upon receipt, this SHALL clear all the load control events. */
command ClearLoadControlEventsRequest(): DefaultSuccess = 4;
Expand Down
94 changes: 66 additions & 28 deletions src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25911,25 +25911,26 @@ public void onSuccess(byte[] tlv) {
}
}

public static class DemandReponseLoadControlCluster extends BaseChipCluster {
public static class DemandResponseLoadControlCluster extends BaseChipCluster {
public static final long CLUSTER_ID = 150L;

private static final long DEVICE_CLASS_ATTRIBUTE_ID = 0L;
private static final long LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 1L;
private static final long NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 2L;
private static final long EVENTS_ATTRIBUTE_ID = 3L;
private static final long NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID = 4L;
private static final long NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID = 5L;
private static final long DEFAULT_RANDOM_START_ATTRIBUTE_ID = 6L;
private static final long DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID = 7L;
private static final long ACTIVE_EVENTS_ATTRIBUTE_ID = 4L;
private static final long NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID = 5L;
private static final long NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID = 6L;
private static final long DEFAULT_RANDOM_START_ATTRIBUTE_ID = 7L;
private static final long DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID = 8L;
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 DemandReponseLoadControlCluster(long devicePtr, int endpointId) {
public DemandResponseLoadControlCluster(long devicePtr, int endpointId) {
super(devicePtr, endpointId, CLUSTER_ID);
}

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

public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandReponseLoadControlClusterLoadControlProgramStruct loadControlProgram) {
public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct loadControlProgram) {
registerLoadControlProgramRequest(callback, loadControlProgram, 0);
}

public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandReponseLoadControlClusterLoadControlProgramStruct loadControlProgram, int timedInvokeTimeoutMs) {
public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct loadControlProgram, int timedInvokeTimeoutMs) {
final long commandId = 0L;

ArrayList<StructElement> elements = new ArrayList<>();
Expand Down Expand Up @@ -25979,11 +25980,11 @@ public void onResponse(StructType invokeStructValue) {
}}, commandId, value, timedInvokeTimeoutMs);
}

public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandReponseLoadControlClusterLoadControlEventStruct event) {
public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct event) {
addLoadControlEventRequest(callback, event, 0);
}

public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandReponseLoadControlClusterLoadControlEventStruct event, int timedInvokeTimeoutMs) {
public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct event, int timedInvokeTimeoutMs) {
final long commandId = 2L;

ArrayList<StructElement> elements = new ArrayList<>();
Expand Down Expand Up @@ -26040,11 +26041,15 @@ public void onResponse(StructType invokeStructValue) {
}

public interface LoadControlProgramsAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<ChipStructs.DemandReponseLoadControlClusterScopedLoadControlProgramStruct> value);
void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> value);
}

public interface EventsAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<ChipStructs.DemandReponseLoadControlClusterScopedLoadControlEventStruct> value);
void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value);
}

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

public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
Expand Down Expand Up @@ -26090,20 +26095,15 @@ public void onSuccess(byte[] tlv) {

public void readLoadControlProgramsAttribute(
LoadControlProgramsAttributeCallback callback) {
readLoadControlProgramsAttributeWithFabricFilter(callback, true);
}

public void readLoadControlProgramsAttributeWithFabricFilter(
LoadControlProgramsAttributeCallback callback, boolean isFabricFiltered) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);

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

public void subscribeLoadControlProgramsAttribute(
Expand All @@ -26113,7 +26113,7 @@ public void subscribeLoadControlProgramsAttribute(
subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
List<ChipStructs.DemandReponseLoadControlClusterScopedLoadControlProgramStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID, minInterval, maxInterval);
}
Expand Down Expand Up @@ -26145,20 +26145,15 @@ public void onSuccess(byte[] tlv) {

public void readEventsAttribute(
EventsAttributeCallback callback) {
readEventsAttributeWithFabricFilter(callback, true);
}

public void readEventsAttributeWithFabricFilter(
EventsAttributeCallback callback, boolean isFabricFiltered) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENTS_ATTRIBUTE_ID);

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

public void subscribeEventsAttribute(
Expand All @@ -26168,11 +26163,36 @@ public void subscribeEventsAttribute(
subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
public void onSuccess(byte[] tlv) {
List<ChipStructs.DemandReponseLoadControlClusterScopedLoadControlEventStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
}
}, EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
}

public void readActiveEventsAttribute(
ActiveEventsAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_EVENTS_ATTRIBUTE_ID);

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

public void subscribeActiveEventsAttribute(
ActiveEventsAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_EVENTS_ATTRIBUTE_ID);

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

public void readNumberOfEventsPerProgramAttribute(
IntegerAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID);
Expand Down Expand Up @@ -26236,6 +26256,15 @@ public void onSuccess(byte[] tlv) {
}, DEFAULT_RANDOM_START_ATTRIBUTE_ID, true);
}

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

public void writeDefaultRandomStartAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
BaseTLVType tlvValue = new UIntType(value);
writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_RANDOM_START_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
}

public void subscribeDefaultRandomStartAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_START_ATTRIBUTE_ID);
Expand All @@ -26261,6 +26290,15 @@ public void onSuccess(byte[] tlv) {
}, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID, true);
}

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

public void writeDefaultRandomDurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
BaseTLVType tlvValue = new UIntType(value);
writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
}

public void subscribeDefaultRandomDurationAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID);
Expand Down
Loading

0 comments on commit 73cb48f

Please sign in to comment.