[matter] Fix bridge fan mode configuration (#19293)

* [matter] Fixes bridge fan mode configuration bug

Signed-off-by: Dan Cunningham <dan@digitaldan.com>
This commit is contained in:
Dan Cunningham
2025-09-16 21:15:01 +02:00
committed by GitHub
parent 2a972c7a45
commit c618ffa88b
98 changed files with 588 additions and 597 deletions
@@ -97,8 +97,8 @@ public {{#if id}}{{else}}abstract {{/if}}class {{asUpperCamelCase name}}Cluster
{{asEnumField name}}({{id}}, "{{asSpacedTitleCase name}}"){{#unless (isLastElement @index ../children.length)}},{{else}};{{/unless}}
{{/each}}
{{/if}}
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private {{asUpperCamelCase name}}(Integer value, String label){
this.value = value;
this.label = label;
@@ -67,8 +67,9 @@ public class DoorLockDevice extends BaseDevice {
Map<String, Object> attributeMap = primaryMetadata.getAttributeOptions();
attributeMap.put(DoorLockCluster.CLUSTER_PREFIX + "." + DoorLockCluster.ATTRIBUTE_LOCK_STATE,
Optional.ofNullable(primaryItem.getStateAs(OnOffType.class))
.orElseGet(() -> OnOffType.OFF) == OnOffType.ON ? DoorLockCluster.LockStateEnum.LOCKED.value
: DoorLockCluster.LockStateEnum.UNLOCKED.value);
.orElseGet(() -> OnOffType.OFF) == OnOffType.ON
? DoorLockCluster.LockStateEnum.LOCKED.getValue()
: DoorLockCluster.LockStateEnum.UNLOCKED.getValue());
return new MatterDeviceOptions(attributeMap, primaryMetadata.label);
}
@@ -81,8 +82,8 @@ public class DoorLockDevice extends BaseDevice {
public void updateState(Item item, State state) {
if (state instanceof OnOffType onOffType) {
setEndpointState(DoorLockCluster.CLUSTER_PREFIX, DoorLockCluster.ATTRIBUTE_LOCK_STATE,
onOffType == OnOffType.ON ? DoorLockCluster.LockStateEnum.LOCKED.value
: DoorLockCluster.LockStateEnum.UNLOCKED.value);
onOffType == OnOffType.ON ? DoorLockCluster.LockStateEnum.LOCKED.getValue()
: DoorLockCluster.LockStateEnum.UNLOCKED.getValue());
}
}
}
@@ -121,8 +121,8 @@ public class FanDevice extends BaseDevice {
FanControlCluster.ATTRIBUTE_FAN_MODE);
try {
String mappedMode = fanModeMapper
.toCustomValue(level > 0 ? FanControlCluster.FanModeEnum.ON.value
: FanControlCluster.FanModeEnum.OFF.value);
.toCustomValue(level > 0 ? FanControlCluster.FanModeEnum.ON.getValue()
: FanControlCluster.FanModeEnum.OFF.getValue());
if (genericItem instanceof NumberItem numberItem) {
numberItem.send(new DecimalType(mappedMode));
} else if (genericItem instanceof StringItem stringItem) {
@@ -261,13 +261,13 @@ public class FanDevice extends BaseDevice {
break;
case FanControlCluster.ATTRIBUTE_FAN_MODE:
if (state instanceof OnOffType onOffType) {
int mode = onOffType == OnOffType.ON ? FanControlCluster.FanModeEnum.ON.value
: FanControlCluster.FanModeEnum.OFF.value;
int mode = onOffType == OnOffType.ON ? FanControlCluster.FanModeEnum.ON.getValue()
: FanControlCluster.FanModeEnum.OFF.getValue();
states.add(new AttributeState(clusterName, attributeName, mode));
lastMode = mode;
} else {
try {
int mode = fanModeMapper.fromCustomValue(state.toString()).value;
int mode = fanModeMapper.fromCustomValue(state.toString()).getValue();
states.add(new AttributeState(clusterName, attributeName, mode));
lastMode = mode;
} catch (FanModeMappingException e) {
@@ -316,11 +316,12 @@ public class FanDevice extends BaseDevice {
if (mode == null) {
if (onOff != null) {
attributeMap.put(FanControlCluster.CLUSTER_PREFIX + "." + FanControlCluster.ATTRIBUTE_FAN_MODE,
onOff == OnOffType.ON ? FanControlCluster.FanModeEnum.ON.value
: FanControlCluster.FanModeEnum.OFF.value);
onOff == OnOffType.ON ? FanControlCluster.FanModeEnum.ON.getValue()
: FanControlCluster.FanModeEnum.OFF.getValue());
} else if (speed != null) {
attributeMap.put(FanControlCluster.CLUSTER_PREFIX + "." + FanControlCluster.ATTRIBUTE_FAN_MODE,
speed == 0 ? FanControlCluster.FanModeEnum.OFF.value : FanControlCluster.FanModeEnum.ON.value);
speed == 0 ? FanControlCluster.FanModeEnum.OFF.getValue()
: FanControlCluster.FanModeEnum.ON.getValue());
}
}
return attributeMap;
@@ -355,12 +356,7 @@ public class FanDevice extends BaseDevice {
private final Map<String, FanControlCluster.FanModeEnum> customToEnumMap = new HashMap<>();
public FanModeMapper() {
Map<String, Object> mappings = new HashMap<>();
FanControlCluster.FanModeEnum[] modes = FanControlCluster.FanModeEnum.values();
for (FanControlCluster.FanModeEnum mode : modes) {
mappings.put(mode.name(), mode.getValue());
}
initializeMappings(mappings);
initializeMappings(Map.of());
}
public FanModeMapper(Map<String, Object> mappings) {
@@ -368,25 +364,19 @@ public class FanDevice extends BaseDevice {
}
private void initializeMappings(Map<String, Object> mappings) {
if (mappings.isEmpty()) {
return;
Map<String, Object> allMappings = new HashMap<>(mappings);
FanControlCluster.FanModeEnum[] modes = FanControlCluster.FanModeEnum.values();
for (FanControlCluster.FanModeEnum mode : modes) {
allMappings.putIfAbsent(mode.name(), mode.getValue());
}
// don't bother mapping if there's no OFF
if (!mappings.containsKey("OFF")) {
return;
}
intToCustomMap.clear();
customToEnumMap.clear();
for (Map.Entry<String, Object> entry : mappings.entrySet()) {
for (Map.Entry<String, Object> entry : allMappings.entrySet()) {
String customKey = entry.getKey().trim();
Object valueObj = entry.getValue();
String customValue = valueObj.toString().trim();
String customValue = entry.getValue().toString().trim();
try {
FanControlCluster.FanModeEnum mode = FanControlCluster.FanModeEnum.valueOf(customKey);
intToCustomMap.put(mode.value, customValue);
intToCustomMap.put(mode.getValue(), customValue);
customToEnumMap.put(customValue, mode);
} catch (IllegalArgumentException e) {
// ignore unknown values
@@ -120,7 +120,7 @@ public class ThermostatDevice extends BaseDevice {
break;
case ThermostatCluster.ATTRIBUTE_SYSTEM_MODE:
try {
int mode = systemModeMapper.fromCustomValue(state.toString()).value;
int mode = systemModeMapper.fromCustomValue(state.toString()).getValue();
setEndpointState(clusterName, attributeName, mode);
} catch (SystemModeMappingException e) {
logger.debug("Could not convert {} to matter value", state.toString());
@@ -166,7 +166,7 @@ public class ThermostatDevice extends BaseDevice {
case ThermostatCluster.ATTRIBUTE_SYSTEM_MODE:
try {
systemModeMapper.initializeMappings(metadata.config);
int mode = systemModeMapper.fromCustomValue(state.toString()).value;
int mode = systemModeMapper.fromCustomValue(state.toString()).getValue();
attributeMap.put(attribute, mode);
} catch (SystemModeMappingException e) {
logger.debug("Could not convert {} to matter value", state.toString());
@@ -234,7 +234,7 @@ public class ThermostatDevice extends BaseDevice {
try {
ThermostatCluster.SystemModeEnum mode = ThermostatCluster.SystemModeEnum.valueOf(customKey);
intToCustomMap.put(mode.value, customValue);
intToCustomMap.put(mode.getValue(), customValue);
customToEnumMap.put(customValue, mode);
} catch (IllegalArgumentException e) {
// ignore unknown values
@@ -534,8 +534,8 @@ public class AccessControlCluster extends BaseCluster {
ADDED(1, "Added"),
REMOVED(2, "Removed");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ChangeTypeEnum(Integer value, String label) {
this.value = value;
@@ -564,8 +564,8 @@ public class AccessControlCluster extends BaseCluster {
MANAGE(4, "Manage"),
ADMINISTER(5, "Administer");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AccessControlEntryPrivilegeEnum(Integer value, String label) {
this.value = value;
@@ -589,8 +589,8 @@ public class AccessControlCluster extends BaseCluster {
COMMAND_FORBIDDEN(2, "Command Forbidden"),
EVENT_FORBIDDEN(3, "Event Forbidden");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AccessRestrictionTypeEnum(Integer value, String label) {
this.value = value;
@@ -613,8 +613,8 @@ public class AccessControlCluster extends BaseCluster {
CASE(2, "Case"),
GROUP(3, "Group");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AccessControlEntryAuthModeEnum(Integer value, String label) {
this.value = value;
@@ -231,8 +231,8 @@ public class ActionsCluster extends BaseCluster {
NOTIFICATION(5, "Notification"),
ALARM(6, "Alarm");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ActionTypeEnum(Integer value, String label) {
this.value = value;
@@ -259,8 +259,8 @@ public class ActionsCluster extends BaseCluster {
PAUSED(2, "Paused"),
DISABLED(3, "Disabled");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ActionStateEnum(Integer value, String label) {
this.value = value;
@@ -282,8 +282,8 @@ public class ActionsCluster extends BaseCluster {
UNKNOWN(0, "Unknown"),
INTERRUPTED(1, "Interrupted");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ActionErrorEnum(Integer value, String label) {
this.value = value;
@@ -310,8 +310,8 @@ public class ActionsCluster extends BaseCluster {
ROOM(1, "Room"),
ZONE(2, "Zone");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EndpointListTypeEnum(Integer value, String label) {
this.value = value;
@@ -95,8 +95,8 @@ public class ActivatedCarbonFilterMonitoringCluster extends BaseCluster {
UP(0, "Up"),
DOWN(1, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DegradationDirectionEnum(Integer value, String label) {
this.value = value;
@@ -119,8 +119,8 @@ public class ActivatedCarbonFilterMonitoringCluster extends BaseCluster {
WARNING(1, "Warning"),
CRITICAL(2, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ChangeIndicationEnum(Integer value, String label) {
this.value = value;
@@ -149,8 +149,8 @@ public class ActivatedCarbonFilterMonitoringCluster extends BaseCluster {
GTIN14(3, "Gtin 14"),
OEM(4, "Oem");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ProductIdentifierTypeEnum(Integer value, String label) {
this.value = value;
@@ -75,8 +75,8 @@ public class AdministratorCommissioningCluster extends BaseCluster {
ENHANCED_WINDOW_OPEN(1, "Enhanced Window Open"),
BASIC_WINDOW_OPEN(2, "Basic Window Open");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CommissioningWindowStatusEnum(Integer value, String label) {
this.value = value;
@@ -99,8 +99,8 @@ public class AdministratorCommissioningCluster extends BaseCluster {
PAKE_PARAMETER_ERROR(3, "Pake Parameter Error"),
WINDOW_NOT_OPEN(4, "Window Not Open");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusCodeEnum(Integer value, String label) {
this.value = value;
@@ -54,8 +54,8 @@ public class AirQualityCluster extends BaseCluster {
VERY_POOR(5, "Very Poor"),
EXTREMELY_POOR(6, "Extremely Poor");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AirQualityEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class ApplicationBasicCluster extends BaseCluster {
ACTIVE_HIDDEN(2, "Active Hidden"),
ACTIVE_VISIBLE_NOT_FOCUS(3, "Active Visible Not Focus");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ApplicationStatusEnum(Integer value, String label) {
this.value = value;
@@ -100,8 +100,8 @@ public class ApplicationLauncherCluster extends BaseCluster {
DOWNLOADING(4, "Downloading"),
INSTALLING(5, "Installing");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -87,8 +87,8 @@ public class AudioOutputCluster extends BaseCluster {
INTERNAL(4, "Internal"),
OTHER(5, "Other");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OutputTypeEnum(Integer value, String label) {
this.value = value;
@@ -355,8 +355,8 @@ public class BasicInformationCluster extends BaseCluster {
RUGGED(4, "Rugged"),
FABRIC(5, "Fabric");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ProductFinishEnum(Integer value, String label) {
this.value = value;
@@ -400,8 +400,8 @@ public class BasicInformationCluster extends BaseCluster {
SILVER(19, "Silver"),
GOLD(20, "Gold");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ColorEnum(Integer value, String label) {
this.value = value;
@@ -355,8 +355,8 @@ public class BridgedDeviceBasicInformationCluster extends BaseCluster {
RUGGED(4, "Rugged"),
FABRIC(5, "Fabric");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ProductFinishEnum(Integer value, String label) {
this.value = value;
@@ -400,8 +400,8 @@ public class BridgedDeviceBasicInformationCluster extends BaseCluster {
SILVER(19, "Silver"),
GOLD(20, "Gold");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ColorEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class CarbonDioxideConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class CarbonDioxideConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class CarbonDioxideConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class CarbonMonoxideConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class CarbonMonoxideConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class CarbonMonoxideConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -390,8 +390,8 @@ public class ChannelCluster extends BaseCluster {
public enum LineupInfoTypeEnum implements MatterEnum {
MSO(0, "Mso");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LineupInfoTypeEnum(Integer value, String label) {
this.value = value;
@@ -414,8 +414,8 @@ public class ChannelCluster extends BaseCluster {
MULTIPLE_MATCHES(1, "Multiple Matches"),
NO_MATCHES(2, "No Matches");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -439,8 +439,8 @@ public class ChannelCluster extends BaseCluster {
TERRESTRIAL(2, "Terrestrial"),
OTT(3, "Ott");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ChannelTypeEnum(Integer value, String label) {
this.value = value;
@@ -366,8 +366,8 @@ public class ColorControlCluster extends BaseCluster {
INACTIVE(0, "Inactive"),
ACTIVE(1, "Active");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ColorLoopActive(Integer value, String label) {
this.value = value;
@@ -392,8 +392,8 @@ public class ColorControlCluster extends BaseCluster {
OPTICAL_LUMINANCE_MONITORING_AND_FEEDBACK(3, "Optical Luminance Monitoring And Feedback"),
OPTICAL_COLOR_MONITORING_AND_FEEDBACK(4, "Optical Color Monitoring And Feedback");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DriftCompensationEnum(Integer value, String label) {
this.value = value;
@@ -416,8 +416,8 @@ public class ColorControlCluster extends BaseCluster {
CURRENT_X_AND_CURRENT_Y(1, "Current X And Current Y"),
COLOR_TEMPERATURE_MIREDS(2, "Color Temperature Mireds");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ColorModeEnum(Integer value, String label) {
this.value = value;
@@ -441,8 +441,8 @@ public class ColorControlCluster extends BaseCluster {
COLOR_TEMPERATURE_MIREDS(2, "Color Temperature Mireds"),
ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION(3, "Enhanced Current Hue And Current Saturation");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EnhancedColorModeEnum(Integer value, String label) {
this.value = value;
@@ -466,8 +466,8 @@ public class ColorControlCluster extends BaseCluster {
UP(2, "Up"),
DOWN(3, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DirectionEnum(Integer value, String label) {
this.value = value;
@@ -490,8 +490,8 @@ public class ColorControlCluster extends BaseCluster {
UP(1, "Up"),
DOWN(3, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MoveModeEnum(Integer value, String label) {
this.value = value;
@@ -513,8 +513,8 @@ public class ColorControlCluster extends BaseCluster {
UP(1, "Up"),
DOWN(3, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StepModeEnum(Integer value, String label) {
this.value = value;
@@ -537,8 +537,8 @@ public class ColorControlCluster extends BaseCluster {
ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE(1, "Activate From Color Loop Start Enhanced Hue"),
ACTIVATE_FROM_ENHANCED_CURRENT_HUE(2, "Activate From Enhanced Current Hue");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ColorLoopActionEnum(Integer value, String label) {
this.value = value;
@@ -560,8 +560,8 @@ public class ColorControlCluster extends BaseCluster {
DECREMENT(0, "Decrement"),
INCREMENT(1, "Increment");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ColorLoopDirectionEnum(Integer value, String label) {
this.value = value;
@@ -41,8 +41,8 @@ public class ContentAppObserverCluster extends BaseCluster {
SUCCESS(0, "Success"),
UNEXPECTED_DATA(1, "Unexpected Data");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -291,8 +291,8 @@ public class ContentControlCluster extends BaseCluster {
TIME_WINDOW_ALREADY_EXIST(10, "Time Window Already Exist"),
TIME_WINDOW_NOT_EXIST(11, "Time Window Not Exist");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusCodeEnum(Integer value, String label) {
this.value = value;
@@ -286,8 +286,8 @@ public class ContentLauncherCluster extends BaseCluster {
TEXT_TRACK_NOT_AVAILABLE(3, "Text Track Not Available"),
AUDIO_TRACK_NOT_AVAILABLE(4, "Audio Track Not Available");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -324,8 +324,8 @@ public class ContentLauncherCluster extends BaseCluster {
EPISODE(15, "Episode"),
ANY(16, "Any");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ParameterEnum(Integer value, String label) {
this.value = value;
@@ -347,8 +347,8 @@ public class ContentLauncherCluster extends BaseCluster {
PIXELS(0, "Pixels"),
PERCENTAGE(1, "Percentage");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MetricTypeEnum(Integer value, String label) {
this.value = value;
@@ -619,8 +619,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
COMFORT(2, "Comfort"),
TEMPERATURE(3, "Temperature");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CostTypeEnum(Integer value, String label) {
this.value = value;
@@ -655,8 +655,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
POOL_PUMP(13, "Pool Pump"),
OTHER(255, "Other");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ESATypeEnum(Integer value, String label) {
this.value = value;
@@ -681,8 +681,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
POWER_ADJUST_ACTIVE(3, "Power Adjust Active"),
PAUSED(4, "Paused");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ESAStateEnum(Integer value, String label) {
this.value = value;
@@ -706,8 +706,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
GRID_OPT_OUT(2, "Grid Opt Out"),
OPT_OUT(3, "Opt Out");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OptOutStateEnum(Integer value, String label) {
this.value = value;
@@ -732,8 +732,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
USER_OPT_OUT(3, "User Opt Out"),
CANCELLED(4, "Cancelled");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CauseEnum(Integer value, String label) {
this.value = value;
@@ -755,8 +755,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
LOCAL_OPTIMIZATION(0, "Local Optimization"),
GRID_OPTIMIZATION(1, "Grid Optimization");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AdjustmentCauseEnum(Integer value, String label) {
this.value = value;
@@ -779,8 +779,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
LOCAL_OPTIMIZATION(1, "Local Optimization"),
GRID_OPTIMIZATION(2, "Grid Optimization");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ForecastUpdateReasonEnum(Integer value, String label) {
this.value = value;
@@ -803,8 +803,8 @@ public class DeviceEnergyManagementCluster extends BaseCluster {
LOCAL_OPTIMIZATION_ADJUSTMENT(1, "Local Optimization Adjustment"),
GRID_OPTIMIZATION_ADJUSTMENT(2, "Grid Optimization Adjustment");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private PowerAdjustReasonEnum(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class DeviceEnergyManagementModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -193,8 +193,8 @@ public class DeviceEnergyManagementModeCluster extends BaseCluster {
LOCAL_OPTIMIZATION(16386, "Local Optimization"),
GRID_OPTIMIZATION(16387, "Grid Optimization");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -23,7 +23,6 @@ import java.util.Map;
*
* @author Dan Cunningham - Initial contribution
*/
public class DeviceTypes {
public static final Map<Integer, String> DEVICE_MAPPING = new HashMap<>();
@@ -42,8 +42,8 @@ public class DiagnosticLogsCluster extends BaseCluster {
NETWORK_DIAG(1, "Network Diag"),
CRASH_LOGS(2, "Crash Logs");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private IntentEnum(Integer value, String label) {
this.value = value;
@@ -68,8 +68,8 @@ public class DiagnosticLogsCluster extends BaseCluster {
BUSY(3, "Busy"),
DENIED(4, "Denied");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -91,8 +91,8 @@ public class DiagnosticLogsCluster extends BaseCluster {
RESPONSE_PAYLOAD(0, "Response Payload"),
BDX(1, "Bdx");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TransferProtocolEnum(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class DishwasherModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -192,8 +192,8 @@ public class DishwasherModeCluster extends BaseCluster {
HEAVY(16385, "Heavy"),
LIGHT(16386, "Light");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -583,8 +583,8 @@ public class DoorLockCluster extends BaseCluster {
DOOR_AJAR(7, "Door Ajar"),
FORCED_USER(8, "Forced User");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AlarmCodeEnum(Integer value, String label) {
this.value = value;
@@ -610,8 +610,8 @@ public class DoorLockCluster extends BaseCluster {
DUAL(1, "Dual"),
TRI(2, "Tri");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CredentialRuleEnum(Integer value, String label) {
this.value = value;
@@ -643,8 +643,8 @@ public class DoorLockCluster extends BaseCluster {
ALIRO_EVICTABLE_ENDPOINT_KEY(7, "Aliro Evictable Endpoint Key"),
ALIRO_NON_EVICTABLE_ENDPOINT_KEY(8, "Aliro Non Evictable Endpoint Key");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CredentialTypeEnum(Integer value, String label) {
this.value = value;
@@ -670,8 +670,8 @@ public class DoorLockCluster extends BaseCluster {
CLEAR(1, "Clear"),
MODIFY(2, "Modify");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DataOperationTypeEnum(Integer value, String label) {
this.value = value;
@@ -700,8 +700,8 @@ public class DoorLockCluster extends BaseCluster {
DOOR_UNSPECIFIED_ERROR(4, "Door Unspecified Error"),
DOOR_AJAR(5, "Door Ajar");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DoorStateEnum(Integer value, String label) {
this.value = value;
@@ -738,8 +738,8 @@ public class DoorLockCluster extends BaseCluster {
ALIRO_EVICTABLE_ENDPOINT_KEY(12, "Aliro Evictable Endpoint Key"),
ALIRO_NON_EVICTABLE_ENDPOINT_KEY(13, "Aliro Non Evictable Endpoint Key");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LockDataTypeEnum(Integer value, String label) {
this.value = value;
@@ -767,8 +767,8 @@ public class DoorLockCluster extends BaseCluster {
FORCED_USER_EVENT(3, "Forced User Event"),
UNLATCH(4, "Unlatch");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LockOperationTypeEnum(Integer value, String label) {
this.value = value;
@@ -796,8 +796,8 @@ public class DoorLockCluster extends BaseCluster {
RESTRICTED(3, "Restricted"),
INSUFFICIENT_BATTERY(4, "Insufficient Battery");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationErrorEnum(Integer value, String label) {
this.value = value;
@@ -832,8 +832,8 @@ public class DoorLockCluster extends BaseCluster {
NO_REMOTE_LOCK_UNLOCK(3, "No Remote Lock Unlock"),
PASSAGE(4, "Passage");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperatingModeEnum(Integer value, String label) {
this.value = value;
@@ -867,8 +867,8 @@ public class DoorLockCluster extends BaseCluster {
BIOMETRIC(9, "Biometric"),
ALIRO(10, "Aliro");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationSourceEnum(Integer value, String label) {
this.value = value;
@@ -894,8 +894,8 @@ public class DoorLockCluster extends BaseCluster {
OCCUPIED_ENABLED(1, "Occupied Enabled"),
OCCUPIED_DISABLED(3, "Occupied Disabled");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private UserStatusEnum(Integer value, String label) {
this.value = value;
@@ -928,8 +928,8 @@ public class DoorLockCluster extends BaseCluster {
SCHEDULE_RESTRICTED_USER(8, "Schedule Restricted User"),
REMOTE_ONLY_USER(9, "Remote Only User");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private UserTypeEnum(Integer value, String label) {
this.value = value;
@@ -953,8 +953,8 @@ public class DoorLockCluster extends BaseCluster {
UNLOCKED(2, "Unlocked"),
UNLATCHED(3, "Unlatched");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LockStateEnum(Integer value, String label) {
this.value = value;
@@ -986,8 +986,8 @@ public class DoorLockCluster extends BaseCluster {
DOOR_FURNITURE(10, "Door Furniture"),
EUROCYLINDER(11, "Eurocylinder");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LockTypeEnum(Integer value, String label) {
this.value = value;
@@ -1010,8 +1010,8 @@ public class DoorLockCluster extends BaseCluster {
NO_LED_SIGNAL_ACCESS_ALLOWED(1, "No Led Signal Access Allowed"),
LED_SIGNAL_ALL(2, "Led Signal All");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LEDSettingEnum(Integer value, String label) {
this.value = value;
@@ -1035,8 +1035,8 @@ public class DoorLockCluster extends BaseCluster {
HIGH(2, "High"),
MEDIUM(3, "Medium");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SoundVolumeEnum(Integer value, String label) {
this.value = value;
@@ -1059,8 +1059,8 @@ public class DoorLockCluster extends BaseCluster {
PROGRAMMING(1, "Programming"),
ALARM(2, "Alarm");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EventTypeEnum(Integer value, String label) {
this.value = value;
@@ -1082,8 +1082,8 @@ public class DoorLockCluster extends BaseCluster {
DUPLICATE(2, "Duplicate"),
OCCUPIED(3, "Occupied");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusCodeEnum(Integer value, String label) {
this.value = value;
@@ -398,8 +398,8 @@ public class ElectricalPowerMeasurementCluster extends BaseCluster {
DC(1, "Dc"),
AC(2, "Ac");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private PowerModeEnum(Integer value, String label) {
this.value = value;
@@ -516,8 +516,8 @@ public class EnergyEvseCluster extends BaseCluster {
SESSION_ENDING(5, "Session Ending"),
FAULT(6, "Fault");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StateEnum(Integer value, String label) {
this.value = value;
@@ -543,8 +543,8 @@ public class EnergyEvseCluster extends BaseCluster {
DISABLED_DIAGNOSTICS(4, "Disabled Diagnostics"),
ENABLED(5, "Enabled");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SupplyStateEnum(Integer value, String label) {
this.value = value;
@@ -581,8 +581,8 @@ public class EnergyEvseCluster extends BaseCluster {
OVER_TEMPERATURE(15, "Over Temperature"),
OTHER(255, "Other");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private FaultStateEnum(Integer value, String label) {
this.value = value;
@@ -605,8 +605,8 @@ public class EnergyEvseCluster extends BaseCluster {
EVSE_STOPPED(1, "Evse Stopped"),
OTHER(2, "Other");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EnergyTransferStoppedReasonEnum(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class EnergyEvseModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -193,8 +193,8 @@ public class EnergyEvseModeCluster extends BaseCluster {
SOLAR_CHARGING(16386, "Solar Charging"),
V2X(16387, "V 2 X");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -122,8 +122,8 @@ public class EnergyPreferenceCluster extends BaseCluster {
EFFICIENCY(2, "Efficiency"),
WATER_CONSUMPTION(3, "Water Consumption");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EnergyPriorityEnum(Integer value, String label) {
this.value = value;
@@ -105,8 +105,8 @@ public class EthernetNetworkDiagnosticsCluster extends BaseCluster {
RATE200G(8, "Rate 200 G"),
RATE400G(9, "Rate 400 G");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private PHYRateEnum(Integer value, String label) {
this.value = value;
@@ -143,8 +143,8 @@ public class FanControlCluster extends BaseCluster {
INCREASE(0, "Increase"),
DECREASE(1, "Decrease");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StepDirectionEnum(Integer value, String label) {
this.value = value;
@@ -166,8 +166,8 @@ public class FanControlCluster extends BaseCluster {
FORWARD(0, "Forward"),
REVERSE(1, "Reverse");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AirflowDirectionEnum(Integer value, String label) {
this.value = value;
@@ -194,8 +194,8 @@ public class FanControlCluster extends BaseCluster {
AUTO(5, "Auto"),
SMART(6, "Smart");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private FanModeEnum(Integer value, String label) {
this.value = value;
@@ -221,8 +221,8 @@ public class FanControlCluster extends BaseCluster {
OFF_HIGH_AUTO(4, "Off High Auto"),
OFF_HIGH(5, "Off High");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private FanModeSequenceEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class FormaldehydeConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class FormaldehydeConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class FormaldehydeConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -176,8 +176,8 @@ public class GeneralCommissioningCluster extends BaseCluster {
TC_ACKNOWLEDGEMENTS_NOT_RECEIVED(6, "Tc Acknowledgements Not Received"),
TC_MIN_VERSION_NOT_MET(7, "Tc Min Version Not Met");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CommissioningErrorEnum(Integer value, String label) {
this.value = value;
@@ -204,8 +204,8 @@ public class GeneralCommissioningCluster extends BaseCluster {
OUTDOOR(1, "Outdoor"),
INDOOR_OUTDOOR(2, "Indoor Outdoor");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private RegulatoryLocationTypeEnum(Integer value, String label) {
this.value = value;
@@ -266,8 +266,8 @@ public class GeneralDiagnosticsCluster extends BaseCluster {
NON_VOLATILE_MEMORY_ERROR(9, "Non Volatile Memory Error"),
TAMPER_DETECTED(10, "Tamper Detected");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private HardwareFaultEnum(Integer value, String label) {
this.value = value;
@@ -294,8 +294,8 @@ public class GeneralDiagnosticsCluster extends BaseCluster {
BLE_FAULT(5, "Ble Fault"),
ETHERNET_FAULT(6, "Ethernet Fault");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private RadioFaultEnum(Integer value, String label) {
this.value = value;
@@ -319,8 +319,8 @@ public class GeneralDiagnosticsCluster extends BaseCluster {
NETWORK_JAMMED(2, "Network Jammed"),
CONNECTION_FAILED(3, "Connection Failed");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private NetworkFaultEnum(Integer value, String label) {
this.value = value;
@@ -345,8 +345,8 @@ public class GeneralDiagnosticsCluster extends BaseCluster {
CELLULAR(3, "Cellular"),
THREAD(4, "Thread");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private InterfaceTypeEnum(Integer value, String label) {
this.value = value;
@@ -373,8 +373,8 @@ public class GeneralDiagnosticsCluster extends BaseCluster {
SOFTWARE_UPDATE_COMPLETED(5, "Software Update Completed"),
SOFTWARE_RESET(6, "Software Reset");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BootReasonEnum(Integer value, String label) {
this.value = value;
@@ -190,8 +190,8 @@ public class GroupKeyManagementCluster extends BaseCluster {
TRUST_FIRST(0, "Trust First"),
CACHE_AND_SYNC(1, "Cache And Sync");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private GroupKeySecurityPolicyEnum(Integer value, String label) {
this.value = value;
@@ -213,8 +213,8 @@ public class GroupKeyManagementCluster extends BaseCluster {
PER_GROUP_ID(0, "Per Group Id"),
ALL_NODES(1, "All Nodes");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private GroupKeyMulticastPolicyEnum(Integer value, String label) {
this.value = value;
@@ -95,8 +95,8 @@ public class HepaFilterMonitoringCluster extends BaseCluster {
UP(0, "Up"),
DOWN(1, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DegradationDirectionEnum(Integer value, String label) {
this.value = value;
@@ -119,8 +119,8 @@ public class HepaFilterMonitoringCluster extends BaseCluster {
WARNING(1, "Warning"),
CRITICAL(2, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ChangeIndicationEnum(Integer value, String label) {
this.value = value;
@@ -149,8 +149,8 @@ public class HepaFilterMonitoringCluster extends BaseCluster {
GTIN14(3, "Gtin 14"),
OEM(4, "Oem");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ProductIdentifierTypeEnum(Integer value, String label) {
this.value = value;
@@ -172,8 +172,8 @@ public class IcdManagementCluster extends BaseCluster {
PERMANENT(0, "Permanent"),
EPHEMERAL(1, "Ephemeral");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ClientTypeEnum(Integer value, String label) {
this.value = value;
@@ -195,8 +195,8 @@ public class IcdManagementCluster extends BaseCluster {
SIT(0, "Sit"),
LIT(1, "Lit");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperatingModeEnum(Integer value, String label) {
this.value = value;
@@ -63,8 +63,8 @@ public class IdentifyCluster extends BaseCluster {
DISPLAY(4, "Display"),
ACTUATOR(5, "Actuator");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private IdentifyTypeEnum(Integer value, String label) {
this.value = value;
@@ -90,8 +90,8 @@ public class IdentifyCluster extends BaseCluster {
FINISH_EFFECT(254, "Finish Effect"),
STOP_EFFECT(255, "Stop Effect");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EffectIdentifierEnum(Integer value, String label) {
this.value = value;
@@ -112,8 +112,8 @@ public class IdentifyCluster extends BaseCluster {
public enum EffectVariantEnum implements MatterEnum {
DEFAULT(0, "Default");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EffectVariantEnum(Integer value, String label) {
this.value = value;
@@ -73,8 +73,8 @@ public class IlluminanceMeasurementCluster extends BaseCluster {
PHOTODIODE(0, "Photodiode"),
CMOS(1, "Cmos");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LightSensorTypeEnum(Integer value, String label) {
this.value = value;
@@ -356,8 +356,8 @@ public class JointFabricDatastoreCluster extends BaseCluster {
COMMITTED(1, "Committed"),
DELETE_PENDING(2, "Delete Pending");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DatastoreStateEnum(Integer value, String label) {
this.value = value;
@@ -51,8 +51,8 @@ public class JointFabricPkiCluster extends BaseCluster {
ICA_CSR_SIGNING_FAILED(6, "Ica Csr Signing Failed"),
ICA_CSR_REQUEST_NO_USER_CONSENT(7, "Ica Csr Request No User Consent");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private IcacsrRequestStatusEnum(Integer value, String label) {
this.value = value;
@@ -79,8 +79,8 @@ public class JointFabricPkiCluster extends BaseCluster {
TRANSFER_ANCHOR_STATUS_DATASTORE_BUSY(1, "Transfer Anchor Status Datastore Busy"),
TRANSFER_ANCHOR_STATUS_NO_USER_CONSENT(2, "Transfer Anchor Status No User Consent");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TransferAnchorResponseStatusEnum(Integer value, String label) {
this.value = value;
@@ -44,8 +44,8 @@ public class KeypadInputCluster extends BaseCluster {
UNSUPPORTED_KEY(1, "Unsupported Key"),
INVALID_KEY_IN_CURRENT_STATE(2, "Invalid Key In Current State");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -150,8 +150,8 @@ public class KeypadInputCluster extends BaseCluster {
F5(117, "F 5"),
DATA(118, "Data");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CecKeyCodeEnum(Integer value, String label) {
this.value = value;
@@ -65,8 +65,8 @@ public class LaundryDryerControlsCluster extends BaseCluster {
EXTRA(2, "Extra"),
MAX(3, "Max");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DrynessLevelEnum(Integer value, String label) {
this.value = value;
@@ -82,8 +82,8 @@ public class LaundryWasherControlsCluster extends BaseCluster {
EXTRA(2, "Extra"),
MAX(3, "Max");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private NumberOfRinsesEnum(Integer value, String label) {
this.value = value;
@@ -127,8 +127,8 @@ public class LaundryWasherModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -162,8 +162,8 @@ public class LaundryWasherModeCluster extends BaseCluster {
HEAVY(16386, "Heavy"),
WHITES(16387, "Whites");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class LevelControlCluster extends BaseCluster {
UP(0, "Up"),
DOWN(1, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MoveModeEnum(Integer value, String label) {
this.value = value;
@@ -181,8 +181,8 @@ public class LevelControlCluster extends BaseCluster {
UP(0, "Up"),
DOWN(1, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StepModeEnum(Integer value, String label) {
this.value = value;
@@ -96,8 +96,8 @@ public class MediaInputCluster extends BaseCluster {
USB(10, "Usb"),
OTHER(11, "Other");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private InputTypeEnum(Integer value, String label) {
this.value = value;
@@ -285,8 +285,8 @@ public class MediaPlaybackCluster extends BaseCluster {
NOT_PLAYING(2, "Not Playing"),
BUFFERING(3, "Buffering");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private PlaybackStateEnum(Integer value, String label) {
this.value = value;
@@ -312,8 +312,8 @@ public class MediaPlaybackCluster extends BaseCluster {
SPEED_OUT_OF_RANGE(4, "Speed Out Of Range"),
SEEK_OUT_OF_RANGE(5, "Seek Out Of Range");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -351,8 +351,8 @@ public class MediaPlaybackCluster extends BaseCluster {
EMERGENCY(16, "Emergency"),
KARAOKE(17, "Karaoke");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CharacteristicEnum(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class MicrowaveOvenModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -191,8 +191,8 @@ public class MicrowaveOvenModeCluster extends BaseCluster {
NORMAL(16384, "Normal"),
DEFROST(16385, "Defrost");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -252,8 +252,8 @@ public class NetworkCommissioningCluster extends BaseCluster {
V60G(4, "60 G"),
V1G(5, "1 G");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private WiFiBandEnum(Integer value, String label) {
this.value = value;
@@ -286,8 +286,8 @@ public class NetworkCommissioningCluster extends BaseCluster {
IP_BIND_FAILED(11, "Ip Bind Failed"),
UNKNOWN_ERROR(12, "Unknown Error");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private NetworkCommissioningStatusEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class NitrogenDioxideConcentrationMeasurementCluster extends BaseCluster
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class NitrogenDioxideConcentrationMeasurementCluster extends BaseCluster
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class NitrogenDioxideConcentrationMeasurementCluster extends BaseCluster
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -180,8 +180,8 @@ public class OccupancySensingCluster extends BaseCluster {
PIR_AND_ULTRASONIC(2, "Pir And Ultrasonic"),
PHYSICAL_CONTACT(3, "Physical Contact");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OccupancySensorTypeEnum(Integer value, String label) {
this.value = value;
@@ -90,8 +90,8 @@ public class OnOffCluster extends BaseCluster {
ON(1, "On"),
TOGGLE(2, "Toggle");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StartUpOnOffEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class OnOffCluster extends BaseCluster {
DELAYED_ALL_OFF(0, "Delayed All Off"),
DYING_LIGHT(1, "Dying Light");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EffectIdentifierEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class OnOffCluster extends BaseCluster {
NO_FADE(1, "No Fade"),
DELAYED_OFF_SLOW_FADE(2, "Delayed Off Slow Fade");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DelayedAllOffEffectVariantEnum(Integer value, String label) {
this.value = value;
@@ -159,8 +159,8 @@ public class OnOffCluster extends BaseCluster {
public enum DyingLightEffectVariantEnum implements MatterEnum {
DYING_LIGHT_FADE_OFF(0, "Dying Light Fade Off");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DyingLightEffectVariantEnum(Integer value, String label) {
this.value = value;
@@ -174,8 +174,8 @@ public class OperationalCredentialsCluster extends BaseCluster {
DAC_CERTIFICATE(1, "Dac Certificate"),
PAI_CERTIFICATE(2, "Pai Certificate");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CertificateChainTypeEnum(Integer value, String label) {
this.value = value;
@@ -209,8 +209,8 @@ public class OperationalCredentialsCluster extends BaseCluster {
LABEL_CONFLICT(10, "Label Conflict"),
INVALID_FABRIC_INDEX(11, "Invalid Fabric Index");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private NodeOperationalCertStatusEnum(Integer value, String label) {
this.value = value;
@@ -218,8 +218,8 @@ public class OperationalStateCluster extends BaseCluster {
PAUSED(2, "Paused"),
ERROR(3, "Error");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationalStateEnum(Integer value, String label) {
this.value = value;
@@ -259,8 +259,8 @@ public class OperationalStateCluster extends BaseCluster {
UNABLE_TO_COMPLETE_OPERATION(2, "Unable To Complete Operation"),
COMMAND_INVALID_IN_STATE(3, "Command Invalid In State");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ErrorStateEnum(Integer value, String label) {
this.value = value;
@@ -47,8 +47,8 @@ public class OtaSoftwareUpdateProviderCluster extends BaseCluster {
NOT_AVAILABLE(2, "Not Available"),
DOWNLOAD_PROTOCOL_NOT_SUPPORTED(3, "Download Protocol Not Supported");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -75,8 +75,8 @@ public class OtaSoftwareUpdateProviderCluster extends BaseCluster {
AWAIT_NEXT_ACTION(1, "Await Next Action"),
DISCONTINUE(2, "Discontinue");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ApplyUpdateActionEnum(Integer value, String label) {
this.value = value;
@@ -104,8 +104,8 @@ public class OtaSoftwareUpdateProviderCluster extends BaseCluster {
HTTPS(2, "Https"),
VENDOR_SPECIFIC(3, "Vendor Specific");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DownloadProtocolEnum(Integer value, String label) {
this.value = value;
@@ -197,8 +197,8 @@ public class OtaSoftwareUpdateRequestorCluster extends BaseCluster {
UPDATE_AVAILABLE(1, "Update Available"),
URGENT_UPDATE_AVAILABLE(2, "Urgent Update Available");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AnnouncementReasonEnum(Integer value, String label) {
this.value = value;
@@ -227,8 +227,8 @@ public class OtaSoftwareUpdateRequestorCluster extends BaseCluster {
ROLLING_BACK(7, "Rolling Back"),
DELAYED_ON_USER_CONSENT(8, "Delayed On User Consent");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private UpdateStateEnum(Integer value, String label) {
this.value = value;
@@ -253,8 +253,8 @@ public class OtaSoftwareUpdateRequestorCluster extends BaseCluster {
TIME_OUT(3, "Time Out"),
DELAY_BY_PROVIDER(4, "Delay By Provider");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ChangeReasonEnum(Integer value, String label) {
this.value = value;
@@ -218,8 +218,8 @@ public class OvenCavityOperationalStateCluster extends BaseCluster {
PAUSED(2, "Paused"),
ERROR(3, "Error");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationalStateEnum(Integer value, String label) {
this.value = value;
@@ -259,8 +259,8 @@ public class OvenCavityOperationalStateCluster extends BaseCluster {
UNABLE_TO_COMPLETE_OPERATION(2, "Unable To Complete Operation"),
COMMAND_INVALID_IN_STATE(3, "Command Invalid In State");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ErrorStateEnum(Integer value, String label) {
this.value = value;
@@ -127,8 +127,8 @@ public class OvenModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -168,8 +168,8 @@ public class OvenModeCluster extends BaseCluster {
PROOFING(16392, "Proofing"),
STEAM(16393, "Steam");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class OzoneConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class OzoneConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class OzoneConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class Pm10ConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class Pm10ConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class Pm10ConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class Pm1ConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class Pm1ConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class Pm1ConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class Pm25ConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class Pm25ConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class Pm25ConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -337,8 +337,8 @@ public class PowerSourceCluster extends BaseCluster {
OVER_VOLTAGE(1, "Over Voltage"),
UNDER_VOLTAGE(2, "Under Voltage");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private WiredFaultEnum(Integer value, String label) {
this.value = value;
@@ -361,8 +361,8 @@ public class PowerSourceCluster extends BaseCluster {
OVER_TEMP(1, "Over Temp"),
UNDER_TEMP(2, "Under Temp");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatFaultEnum(Integer value, String label) {
this.value = value;
@@ -393,8 +393,8 @@ public class PowerSourceCluster extends BaseCluster {
CHARGER_UNDER_VOLTAGE(9, "Charger Under Voltage"),
SAFETY_TIMEOUT(10, "Safety Timeout");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatChargeFaultEnum(Integer value, String label) {
this.value = value;
@@ -418,8 +418,8 @@ public class PowerSourceCluster extends BaseCluster {
STANDBY(2, "Standby"),
UNAVAILABLE(3, "Unavailable");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private PowerSourceStatusEnum(Integer value, String label) {
this.value = value;
@@ -441,8 +441,8 @@ public class PowerSourceCluster extends BaseCluster {
AC(0, "Ac"),
DC(1, "Dc");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private WiredCurrentTypeEnum(Integer value, String label) {
this.value = value;
@@ -465,8 +465,8 @@ public class PowerSourceCluster extends BaseCluster {
WARNING(1, "Warning"),
CRITICAL(2, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatChargeLevelEnum(Integer value, String label) {
this.value = value;
@@ -490,8 +490,8 @@ public class PowerSourceCluster extends BaseCluster {
USER_REPLACEABLE(2, "User Replaceable"),
FACTORY_REPLACEABLE(3, "Factory Replaceable");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatReplaceabilityEnum(Integer value, String label) {
this.value = value;
@@ -592,8 +592,8 @@ public class PowerSourceCluster extends BaseCluster {
V26650(79, "26650"),
V32600(80, "32600");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatCommonDesignationEnum(Integer value, String label) {
this.value = value;
@@ -646,8 +646,8 @@ public class PowerSourceCluster extends BaseCluster {
ZINC_BROMIDE(31, "Zinc Bromide"),
ZINC_CERIUM(32, "Zinc Cerium");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatApprovedChemistryEnum(Integer value, String label) {
this.value = value;
@@ -671,8 +671,8 @@ public class PowerSourceCluster extends BaseCluster {
IS_AT_FULL_CHARGE(2, "Is At Full Charge"),
IS_NOT_CHARGING(3, "Is Not Charging");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BatChargeStateEnum(Integer value, String label) {
this.value = value;
@@ -332,8 +332,8 @@ public class PumpConfigurationAndControlCluster extends BaseCluster {
MAXIMUM(2, "Maximum"),
LOCAL(3, "Local");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationModeEnum(Integer value, String label) {
this.value = value;
@@ -359,8 +359,8 @@ public class PumpConfigurationAndControlCluster extends BaseCluster {
CONSTANT_TEMPERATURE(5, "Constant Temperature"),
AUTOMATIC(7, "Automatic");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ControlModeEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class RadonConcentrationMeasurementCluster extends BaseCluster {
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class RadonConcentrationMeasurementCluster extends BaseCluster {
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class RadonConcentrationMeasurementCluster extends BaseCluster {
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class RefrigeratorAndTemperatureControlledCabinetModeCluster extends Base
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -191,8 +191,8 @@ public class RefrigeratorAndTemperatureControlledCabinetModeCluster extends Base
RAPID_COOL(16384, "Rapid Cool"),
RAPID_FREEZE(16385, "Rapid Freeze");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -155,8 +155,8 @@ public class RvcCleanModeCluster extends BaseCluster {
public enum ModeChangeStatus implements MatterEnum {
CLEANING_IN_PROGRESS(64, "Cleaning In Progress");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -189,8 +189,8 @@ public class RvcCleanModeCluster extends BaseCluster {
VACUUM(16385, "Vacuum"),
MOP(16386, "Mop");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -219,8 +219,8 @@ public class RvcOperationalStateCluster extends BaseCluster {
CHARGING(65, "Charging"),
DOCKED(66, "Docked");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationalStateEnum(Integer value, String label) {
this.value = value;
@@ -256,8 +256,8 @@ public class RvcOperationalStateCluster extends BaseCluster {
WATER_TANK_LID_OPEN(70, "Water Tank Lid Open"),
MOP_CLEANING_PAD_MISSING(71, "Mop Cleaning Pad Missing");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ErrorStateEnum(Integer value, String label) {
this.value = value;
@@ -162,8 +162,8 @@ public class RvcRunModeCluster extends BaseCluster {
MOP_CLEANING_PAD_MISSING(71, "Mop Cleaning Pad Missing"),
BATTERY_LOW(72, "Battery Low");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -196,8 +196,8 @@ public class RvcRunModeCluster extends BaseCluster {
CLEANING(16385, "Cleaning"),
MAPPING(16386, "Mapping");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -368,8 +368,8 @@ public class ServiceAreaCluster extends BaseCluster {
SKIPPED(2, "Skipped"),
COMPLETED(3, "Completed");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private OperationalStatusEnum(Integer value, String label) {
this.value = value;
@@ -393,8 +393,8 @@ public class ServiceAreaCluster extends BaseCluster {
INVALID_IN_MODE(2, "Invalid In Mode"),
INVALID_SET(3, "Invalid Set");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SelectAreasStatus(Integer value, String label) {
this.value = value;
@@ -418,8 +418,8 @@ public class ServiceAreaCluster extends BaseCluster {
INVALID_IN_MODE(2, "Invalid In Mode"),
INVALID_SKIPPED_AREA(3, "Invalid Skipped Area");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SkipAreaStatus(Integer value, String label) {
this.value = value;
@@ -251,8 +251,8 @@ public class SmokeCoAlarmCluster extends BaseCluster {
WARNING(1, "Warning"),
CRITICAL(2, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AlarmStateEnum(Integer value, String label) {
this.value = value;
@@ -275,8 +275,8 @@ public class SmokeCoAlarmCluster extends BaseCluster {
STANDARD(1, "Standard"),
LOW(2, "Low");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SensitivityEnum(Integer value, String label) {
this.value = value;
@@ -305,8 +305,8 @@ public class SmokeCoAlarmCluster extends BaseCluster {
INTERCONNECT_SMOKE(7, "Interconnect Smoke"),
INTERCONNECT_CO(8, "Interconnect Co");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ExpressedStateEnum(Integer value, String label) {
this.value = value;
@@ -328,8 +328,8 @@ public class SmokeCoAlarmCluster extends BaseCluster {
NOT_MUTED(0, "Not Muted"),
MUTED(1, "Muted");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MuteStateEnum(Integer value, String label) {
this.value = value;
@@ -351,8 +351,8 @@ public class SmokeCoAlarmCluster extends BaseCluster {
NORMAL(0, "Normal"),
EXPIRED(1, "Expired");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EndOfServiceEnum(Integer value, String label) {
this.value = value;
@@ -376,8 +376,8 @@ public class SmokeCoAlarmCluster extends BaseCluster {
WARNING(2, "Warning"),
CRITICAL(3, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ContaminationStateEnum(Integer value, String label) {
this.value = value;
@@ -94,8 +94,8 @@ public class TargetNavigatorCluster extends BaseCluster {
TARGET_NOT_FOUND(1, "Target Not Found"),
NOT_ALLOWED(2, "Not Allowed");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusEnum(Integer value, String label) {
this.value = value;
@@ -894,8 +894,8 @@ public class ThermostatCluster extends BaseCluster {
public enum ACCapacityFormatEnum implements MatterEnum {
BT_UH(0, "Bt Uh");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ACCapacityFormatEnum(Integer value, String label) {
this.value = value;
@@ -919,8 +919,8 @@ public class ThermostatCluster extends BaseCluster {
T2(2, "T 2"),
T3(3, "T 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ACCompressorTypeEnum(Integer value, String label) {
this.value = value;
@@ -945,8 +945,8 @@ public class ThermostatCluster extends BaseCluster {
HALF(4, "Half"),
THREE_QUARTERS(5, "Three Quarters");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ACLouverPositionEnum(Integer value, String label) {
this.value = value;
@@ -970,8 +970,8 @@ public class ThermostatCluster extends BaseCluster {
R410A(2, "R 410 A"),
R407C(3, "R 407 C");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ACRefrigerantTypeEnum(Integer value, String label) {
this.value = value;
@@ -996,8 +996,8 @@ public class ThermostatCluster extends BaseCluster {
COOLING_INVERTER(3, "Cooling Inverter"),
HEAT_PUMP_INVERTER(4, "Heat Pump Inverter");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ACTypeEnum(Integer value, String label) {
this.value = value;
@@ -1020,8 +1020,8 @@ public class ThermostatCluster extends BaseCluster {
COOL(1, "Cool"),
BOTH(2, "Both");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SetpointRaiseLowerModeEnum(Integer value, String label) {
this.value = value;
@@ -1055,8 +1055,8 @@ public class ThermostatCluster extends BaseCluster {
COOLING_AND_HEATING(4, "Cooling And Heating"),
COOLING_AND_HEATING_WITH_REHEAT(5, "Cooling And Heating With Reheat");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ControlSequenceOfOperationEnum(Integer value, String label) {
this.value = value;
@@ -1083,8 +1083,8 @@ public class ThermostatCluster extends BaseCluster {
GOING_TO_SLEEP(6, "Going To Sleep"),
USER_DEFINED(254, "User Defined");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private PresetScenarioEnum(Integer value, String label) {
this.value = value;
@@ -1107,8 +1107,8 @@ public class ThermostatCluster extends BaseCluster {
SCHEDULE(1, "Schedule"),
EXTERNAL(2, "External");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SetpointChangeSourceEnum(Integer value, String label) {
this.value = value;
@@ -1135,8 +1135,8 @@ public class ThermostatCluster extends BaseCluster {
FRIDAY(5, "Friday"),
SATURDAY(6, "Saturday");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StartOfWeekEnum(Integer value, String label) {
this.value = value;
@@ -1168,8 +1168,8 @@ public class ThermostatCluster extends BaseCluster {
DRY(8, "Dry"),
SLEEP(9, "Sleep");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SystemModeEnum(Integer value, String label) {
this.value = value;
@@ -1192,8 +1192,8 @@ public class ThermostatCluster extends BaseCluster {
COOL(3, "Cool"),
HEAT(4, "Heat");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ThermostatRunningModeEnum(Integer value, String label) {
this.value = value;
@@ -1215,8 +1215,8 @@ public class ThermostatCluster extends BaseCluster {
SETPOINT_HOLD_OFF(0, "Setpoint Hold Off"),
SETPOINT_HOLD_ON(1, "Setpoint Hold On");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TemperatureSetpointHoldEnum(Integer value, String label) {
this.value = value;
@@ -58,8 +58,8 @@ public class ThermostatUserInterfaceConfigurationCluster extends BaseCluster {
CELSIUS(0, "Celsius"),
FAHRENHEIT(1, "Fahrenheit");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TemperatureDisplayModeEnum(Integer value, String label) {
this.value = value;
@@ -88,8 +88,8 @@ public class ThermostatUserInterfaceConfigurationCluster extends BaseCluster {
LOCKOUT4(4, "Lockout 4"),
LOCKOUT5(5, "Lockout 5");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private KeypadLockoutEnum(Integer value, String label) {
this.value = value;
@@ -111,8 +111,8 @@ public class ThermostatUserInterfaceConfigurationCluster extends BaseCluster {
SCHEDULE_PROGRAMMING_PERMITTED(0, "Schedule Programming Permitted"),
SCHEDULE_PROGRAMMING_DENIED(1, "Schedule Programming Denied");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ScheduleProgrammingVisibilityEnum(Integer value, String label) {
this.value = value;
@@ -741,8 +741,8 @@ public class ThreadNetworkDiagnosticsCluster extends BaseCluster {
HARDWARE_FAILURE(2, "Hardware Failure"),
NETWORK_JAMMED(3, "Network Jammed");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private NetworkFaultEnum(Integer value, String label) {
this.value = value;
@@ -764,8 +764,8 @@ public class ThreadNetworkDiagnosticsCluster extends BaseCluster {
CONNECTED(0, "Connected"),
NOT_CONNECTED(1, "Not Connected");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ConnectionStatusEnum(Integer value, String label) {
this.value = value;
@@ -792,8 +792,8 @@ public class ThreadNetworkDiagnosticsCluster extends BaseCluster {
ROUTER(5, "Router"),
LEADER(6, "Leader");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private RoutingRoleEnum(Integer value, String label) {
this.value = value;
@@ -65,8 +65,8 @@ public class TimeFormatLocalizationCluster extends BaseCluster {
V24HR(1, "24 Hr"),
USE_ACTIVE_LOCALE(255, "Use Active Locale");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private HourFormatEnum(Integer value, String label) {
this.value = value;
@@ -99,8 +99,8 @@ public class TimeFormatLocalizationCluster extends BaseCluster {
TAIWANESE(11, "Taiwanese"),
USE_ACTIVE_LOCALE(255, "Use Active Locale");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private CalendarTypeEnum(Integer value, String label) {
this.value = value;
@@ -330,8 +330,8 @@ public class TimeSynchronizationCluster extends BaseCluster {
MILLISECONDS_GRANULARITY(3, "Milliseconds Granularity"),
MICROSECONDS_GRANULARITY(4, "Microseconds Granularity");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private GranularityEnum(Integer value, String label) {
this.value = value;
@@ -368,8 +368,8 @@ public class TimeSynchronizationCluster extends BaseCluster {
PTP(15, "Ptp"),
GNSS(16, "Gnss");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TimeSourceEnum(Integer value, String label) {
this.value = value;
@@ -397,8 +397,8 @@ public class TimeSynchronizationCluster extends BaseCluster {
PARTIAL(1, "Partial"),
NONE(2, "None");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TimeZoneDatabaseEnum(Integer value, String label) {
this.value = value;
@@ -419,8 +419,8 @@ public class TimeSynchronizationCluster extends BaseCluster {
public enum StatusCodeEnum implements MatterEnum {
TIME_NOT_ACCEPTED(2, "Time Not Accepted");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusCodeEnum(Integer value, String label) {
this.value = value;
@@ -113,8 +113,8 @@ public class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extend
PM3(6, "Pm 3"),
BQM3(7, "Bqm 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementUnitEnum(Integer value, String label) {
this.value = value;
@@ -137,8 +137,8 @@ public class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extend
WATER(1, "Water"),
SOIL(2, "Soil");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MeasurementMediumEnum(Integer value, String label) {
this.value = value;
@@ -163,8 +163,8 @@ public class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extend
HIGH(3, "High"),
CRITICAL(4, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private LevelValueEnum(Integer value, String label) {
this.value = value;
@@ -48,8 +48,8 @@ public class UnitLocalizationCluster extends BaseCluster {
CELSIUS(1, "Celsius"),
KELVIN(2, "Kelvin");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TempUnitEnum(Integer value, String label) {
this.value = value;
@@ -183,8 +183,8 @@ public class ValveConfigurationAndControlCluster extends BaseCluster {
OPEN(1, "Open"),
TRANSITIONING(2, "Transitioning");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ValveStateEnum(Integer value, String label) {
this.value = value;
@@ -205,8 +205,8 @@ public class ValveConfigurationAndControlCluster extends BaseCluster {
public enum StatusCodeEnum implements MatterEnum {
FAILURE_DUE_TO_FAULT(2, "Failure Due To Fault");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private StatusCodeEnum(Integer value, String label) {
this.value = value;
@@ -188,8 +188,8 @@ public class WaterHeaterManagementCluster extends BaseCluster {
INACTIVE(0, "Inactive"),
ACTIVE(1, "Active");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private BoostStateEnum(Integer value, String label) {
this.value = value;
@@ -158,8 +158,8 @@ public class WaterHeaterModeCluster extends BaseCluster {
GENERIC_FAILURE(2, "Generic Failure"),
INVALID_IN_MODE(3, "Invalid In Mode");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeChangeStatus(Integer value, String label) {
this.value = value;
@@ -192,8 +192,8 @@ public class WaterHeaterModeCluster extends BaseCluster {
MANUAL(16385, "Manual"),
TIMED(16386, "Timed");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ModeTag(Integer value, String label) {
this.value = value;
@@ -95,8 +95,8 @@ public class WaterTankLevelMonitoringCluster extends BaseCluster {
UP(0, "Up"),
DOWN(1, "Down");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private DegradationDirectionEnum(Integer value, String label) {
this.value = value;
@@ -119,8 +119,8 @@ public class WaterTankLevelMonitoringCluster extends BaseCluster {
WARNING(1, "Warning"),
CRITICAL(2, "Critical");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ChangeIndicationEnum(Integer value, String label) {
this.value = value;
@@ -149,8 +149,8 @@ public class WaterTankLevelMonitoringCluster extends BaseCluster {
GTIN14(3, "Gtin 14"),
OEM(4, "Oem");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ProductIdentifierTypeEnum(Integer value, String label) {
this.value = value;
@@ -175,8 +175,8 @@ public class WiFiNetworkDiagnosticsCluster extends BaseCluster {
WPA2(4, "Wpa 2"),
WPA3(5, "Wpa 3");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private SecurityTypeEnum(Integer value, String label) {
this.value = value;
@@ -203,8 +203,8 @@ public class WiFiNetworkDiagnosticsCluster extends BaseCluster {
AX(5, "Ax"),
AH(6, "Ah");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private WiFiVersionEnum(Integer value, String label) {
this.value = value;
@@ -228,8 +228,8 @@ public class WiFiNetworkDiagnosticsCluster extends BaseCluster {
AUTHENTICATION_FAILED(2, "Authentication Failed"),
SSID_NOT_FOUND(3, "Ssid Not Found");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private AssociationFailureCauseEnum(Integer value, String label) {
this.value = value;
@@ -251,8 +251,8 @@ public class WiFiNetworkDiagnosticsCluster extends BaseCluster {
CONNECTED(0, "Connected"),
NOT_CONNECTED(1, "Not Connected");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private ConnectionStatusEnum(Integer value, String label) {
this.value = value;
@@ -182,8 +182,8 @@ public class WindowCoveringCluster extends BaseCluster {
PROJECTOR_SCREEN(9, "Projector Screen"),
UNKNOWN(255, "Unknown");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private TypeEnum(Integer value, String label) {
this.value = value;
@@ -228,8 +228,8 @@ public class WindowCoveringCluster extends BaseCluster {
SLIDING_SHUTTER(23, "Sliding Shutter"),
UNKNOWN(255, "Unknown");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private EndProductTypeEnum(Integer value, String label) {
this.value = value;
@@ -255,8 +255,8 @@ public class WindowCoveringCluster extends BaseCluster {
OPENING(1, "Opening"),
CLOSING(2, "Closing");
public final Integer value;
public final String label;
private final Integer value;
private final String label;
private MovementStatus(Integer value, String label) {
this.value = value;
@@ -57,7 +57,7 @@ public class AirQualityConverter extends GenericConverter<AirQualityCluster> {
List<StateOption> options = new ArrayList<>();
for (AirQualityCluster.AirQualityEnum e : AirQualityCluster.AirQualityEnum.values()) {
options.add(new StateOption(e.value.toString(), e.label));
options.add(new StateOption(e.getValue().toString(), e.getLabel()));
}
StateDescription stateDescription = StateDescriptionFragmentBuilder.create().withPattern("%d")
@@ -71,7 +71,7 @@ public class AirQualityConverter extends GenericConverter<AirQualityCluster> {
switch (message.path.attributeName) {
case AirQualityCluster.ATTRIBUTE_AIR_QUALITY:
if (message.value instanceof AirQualityCluster.AirQualityEnum aqEnum) {
updateState(CHANNEL_ID_AIRQUALITY_AIRQUALITY, new DecimalType(aqEnum.value));
updateState(CHANNEL_ID_AIRQUALITY_AIRQUALITY, new DecimalType(aqEnum.getValue()));
}
break;
default:
@@ -83,7 +83,7 @@ public class AirQualityConverter extends GenericConverter<AirQualityCluster> {
@Override
public void initState() {
updateState(CHANNEL_ID_AIRQUALITY_AIRQUALITY,
initializingCluster.airQuality != null ? new DecimalType(initializingCluster.airQuality.value)
initializingCluster.airQuality != null ? new DecimalType(initializingCluster.airQuality.getValue())
: UnDefType.NULL);
}
}
@@ -227,7 +227,7 @@ public class ColorControlConverter extends GenericConverter<ColorControlCluster>
EnhancedColorModeEnum newColorMode = lastColorMode;
if (message.value instanceof ColorControlCluster.ColorModeEnum colorMode) {
try {
newColorMode = MatterEnum.fromValue(EnhancedColorModeEnum.class, colorMode.value);
newColorMode = MatterEnum.fromValue(EnhancedColorModeEnum.class, colorMode.getValue());
} catch (IllegalArgumentException e) {
logger.debug("Unknown color mode: {}", numberValue);
}
@@ -288,7 +288,7 @@ public class ColorControlConverter extends GenericConverter<ColorControlCluster>
}
lastHSB = new HSBType(lastHSB.getHue(), lastHSB.getSaturation(), ValueUtils.levelToPercent(brightness));
lastColorMode = Optional.ofNullable(initializingCluster.enhancedColorMode).orElseGet(
() -> MatterEnum.fromValue(EnhancedColorModeEnum.class, initializingCluster.colorMode.value));
() -> MatterEnum.fromValue(EnhancedColorModeEnum.class, initializingCluster.colorMode.getValue()));
lastOnOff = onOff;
lastX = initializingCluster.currentX != null ? initializingCluster.currentX : 0;
lastY = initializingCluster.currentY != null ? initializingCluster.currentY : 0;
@@ -71,44 +71,44 @@ public class FanControlConverter extends GenericConverter<FanControlCluster> {
List<StateOption> modeOptions = new ArrayList<>();
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.OFF.value.toString(),
FanControlCluster.FanModeEnum.OFF.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.OFF.getValue().toString(),
FanControlCluster.FanModeEnum.OFF.getLabel()));
switch (initializingCluster.fanModeSequence) {
case OFF_HIGH:
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.value.toString(),
FanControlCluster.FanModeEnum.HIGH.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.getValue().toString(),
FanControlCluster.FanModeEnum.HIGH.getLabel()));
break;
case OFF_HIGH_AUTO:
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.value.toString(),
FanControlCluster.FanModeEnum.HIGH.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.AUTO.value.toString(),
FanControlCluster.FanModeEnum.AUTO.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.getValue().toString(),
FanControlCluster.FanModeEnum.HIGH.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.AUTO.getValue().toString(),
FanControlCluster.FanModeEnum.AUTO.getLabel()));
break;
case OFF_LOW_HIGH_AUTO:
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.LOW.value.toString(),
FanControlCluster.FanModeEnum.LOW.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.value.toString(),
FanControlCluster.FanModeEnum.HIGH.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.AUTO.value.toString(),
FanControlCluster.FanModeEnum.AUTO.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.LOW.getValue().toString(),
FanControlCluster.FanModeEnum.LOW.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.getValue().toString(),
FanControlCluster.FanModeEnum.HIGH.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.AUTO.getValue().toString(),
FanControlCluster.FanModeEnum.AUTO.getLabel()));
break;
case OFF_LOW_MED_HIGH_AUTO:
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.LOW.value.toString(),
FanControlCluster.FanModeEnum.LOW.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.MEDIUM.value.toString(),
FanControlCluster.FanModeEnum.MEDIUM.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.value.toString(),
FanControlCluster.FanModeEnum.HIGH.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.AUTO.value.toString(),
FanControlCluster.FanModeEnum.AUTO.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.LOW.getValue().toString(),
FanControlCluster.FanModeEnum.LOW.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.MEDIUM.getValue().toString(),
FanControlCluster.FanModeEnum.MEDIUM.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.getValue().toString(),
FanControlCluster.FanModeEnum.HIGH.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.AUTO.getValue().toString(),
FanControlCluster.FanModeEnum.AUTO.getLabel()));
break;
case OFF_LOW_HIGH:
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.LOW.value.toString(),
FanControlCluster.FanModeEnum.LOW.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.value.toString(),
FanControlCluster.FanModeEnum.HIGH.label));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.LOW.getValue().toString(),
FanControlCluster.FanModeEnum.LOW.getLabel()));
modeOptions.add(new StateOption(FanControlCluster.FanModeEnum.HIGH.getValue().toString(),
FanControlCluster.FanModeEnum.HIGH.getLabel()));
break;
default:
break;
@@ -155,7 +155,7 @@ public class FanControlConverter extends GenericConverter<FanControlCluster> {
switch (message.path.attributeName) {
case FanControlCluster.ATTRIBUTE_FAN_MODE:
if (message.value instanceof FanControlCluster.FanModeEnum fanMode) {
updateState(CHANNEL_ID_FANCONTROL_MODE, new DecimalType(fanMode.value));
updateState(CHANNEL_ID_FANCONTROL_MODE, new DecimalType(fanMode.getValue()));
}
break;
case FanControlCluster.ATTRIBUTE_PERCENT_SETTING:
@@ -172,7 +172,7 @@ public class FanControlConverter extends GenericConverter<FanControlCluster> {
@Override
public void initState() {
updateState(CHANNEL_ID_FANCONTROL_MODE,
initializingCluster.fanMode != null ? new DecimalType(initializingCluster.fanMode.value)
initializingCluster.fanMode != null ? new DecimalType(initializingCluster.fanMode.getValue())
: UnDefType.NULL);
updateState(CHANNEL_ID_FANCONTROL_PERCENT,
initializingCluster.percentSetting != null ? new PercentType(initializingCluster.percentSetting)
@@ -71,7 +71,7 @@ public class PowerSourceConverter extends GenericConverter<PowerSourceCluster> {
.withType(CHANNEL_POWER_CHARGELEVEL).build();
List<StateOption> options = new ArrayList<>();
for (BatChargeLevelEnum mode : BatChargeLevelEnum.values()) {
options.add(new StateOption(mode.value.toString(), mode.label));
options.add(new StateOption(mode.getValue().toString(), mode.getLabel()));
}
StateDescription stateDescription = StateDescriptionFragmentBuilder.create().withPattern("%d")
.withOptions(options).build().toStateDescription();
@@ -91,7 +91,7 @@ public class PowerSourceConverter extends GenericConverter<PowerSourceCluster> {
break;
case PowerSourceCluster.ATTRIBUTE_BAT_CHARGE_LEVEL:
if (message.value instanceof BatChargeLevelEnum batChargeLevel) {
updateState(CHANNEL_ID_POWER_CHARGELEVEL, new DecimalType(batChargeLevel.value));
updateState(CHANNEL_ID_POWER_CHARGELEVEL, new DecimalType(batChargeLevel.getValue()));
}
break;
default:
@@ -107,7 +107,8 @@ public class PowerSourceConverter extends GenericConverter<PowerSourceCluster> {
? convertToPercentage(initializingCluster.batPercentRemaining)
: UnDefType.NULL);
updateState(CHANNEL_ID_POWER_CHARGELEVEL,
initializingCluster.batChargeLevel != null ? new DecimalType(initializingCluster.batChargeLevel.value)
initializingCluster.batChargeLevel != null
? new DecimalType(initializingCluster.batChargeLevel.getValue())
: UnDefType.NULL);
}
@@ -63,7 +63,7 @@ public class RvcOperationalStateConverter extends GenericConverter<RvcOperationa
List<StateOption> options = new ArrayList<>();
for (RvcOperationalStateCluster.OperationalStateEnum e : RvcOperationalStateCluster.OperationalStateEnum
.values()) {
options.add(new StateOption(e.value.toString(), e.label));
options.add(new StateOption(e.getValue().toString(), e.getLabel()));
}
StateDescription sd = StateDescriptionFragmentBuilder.create().withOptions(options).build()
.toStateDescription();
@@ -93,7 +93,7 @@ public class RvcOperationalStateConverter extends GenericConverter<RvcOperationa
switch (message.path.attributeName) {
case OperationalStateCluster.ATTRIBUTE_OPERATIONAL_STATE:
if (message.value instanceof RvcOperationalStateCluster.OperationalStateEnum state) {
updateState(CHANNEL_ID_RVCOPERATIONALSTATE_STATE, new DecimalType(state.value));
updateState(CHANNEL_ID_RVCOPERATIONALSTATE_STATE, new DecimalType(state.getValue()));
} else if (message.value instanceof Number number) {
updateState(CHANNEL_ID_RVCOPERATIONALSTATE_STATE, new DecimalType(number.intValue()));
}
@@ -106,7 +106,7 @@ public class RvcOperationalStateConverter extends GenericConverter<RvcOperationa
public void initState() {
updateState(CHANNEL_ID_RVCOPERATIONALSTATE_STATE,
initializingCluster.operationalState != null
? new DecimalType(initializingCluster.operationalState.value)
? new DecimalType(initializingCluster.operationalState.getValue())
: UnDefType.NULL);
}
}
@@ -62,30 +62,30 @@ public class ThermostatConverter extends GenericConverter<ThermostatCluster> {
List<StateOption> modeOptions = new ArrayList<>();
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.OFF.value.toString(),
ThermostatCluster.SystemModeEnum.OFF.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.OFF.getValue().toString(),
ThermostatCluster.SystemModeEnum.OFF.getLabel()));
if (initializingCluster.featureMap.autoMode) {
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.AUTO.value.toString(),
ThermostatCluster.SystemModeEnum.AUTO.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.AUTO.getValue().toString(),
ThermostatCluster.SystemModeEnum.AUTO.getLabel()));
}
if (initializingCluster.featureMap.cooling) {
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.COOL.value.toString(),
ThermostatCluster.SystemModeEnum.COOL.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.PRECOOLING.value.toString(),
ThermostatCluster.SystemModeEnum.PRECOOLING.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.COOL.getValue().toString(),
ThermostatCluster.SystemModeEnum.COOL.getLabel()));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.PRECOOLING.getValue().toString(),
ThermostatCluster.SystemModeEnum.PRECOOLING.getLabel()));
}
if (initializingCluster.featureMap.heating) {
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.HEAT.value.toString(),
ThermostatCluster.SystemModeEnum.HEAT.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.EMERGENCY_HEAT.value.toString(),
ThermostatCluster.SystemModeEnum.EMERGENCY_HEAT.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.HEAT.getValue().toString(),
ThermostatCluster.SystemModeEnum.HEAT.getLabel()));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.EMERGENCY_HEAT.getValue().toString(),
ThermostatCluster.SystemModeEnum.EMERGENCY_HEAT.getLabel()));
}
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.FAN_ONLY.value.toString(),
ThermostatCluster.SystemModeEnum.FAN_ONLY.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.DRY.value.toString(),
ThermostatCluster.SystemModeEnum.DRY.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.SLEEP.value.toString(),
ThermostatCluster.SystemModeEnum.SLEEP.label));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.FAN_ONLY.getValue().toString(),
ThermostatCluster.SystemModeEnum.FAN_ONLY.getLabel()));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.DRY.getValue().toString(),
ThermostatCluster.SystemModeEnum.DRY.getLabel()));
modeOptions.add(new StateOption(ThermostatCluster.SystemModeEnum.SLEEP.getValue().toString(),
ThermostatCluster.SystemModeEnum.SLEEP.getLabel()));
StateDescription stateDescriptionMode = StateDescriptionFragmentBuilder.create().withPattern("%d")
.withOptions(modeOptions).build().toStateDescription();
@@ -169,12 +169,12 @@ public class ThermostatConverter extends GenericConverter<ThermostatCluster> {
.create(new ChannelUID(channelGroupUID, CHANNEL_ID_THERMOSTAT_RUNNINGMODE), CoreItemFactory.NUMBER)
.withType(CHANNEL_THERMOSTAT_RUNNINGMODE).build();
List<StateOption> options = new ArrayList<>();
options.add(new StateOption(ThermostatCluster.ThermostatRunningModeEnum.OFF.value.toString(),
ThermostatCluster.ThermostatRunningModeEnum.OFF.label));
options.add(new StateOption(ThermostatCluster.ThermostatRunningModeEnum.HEAT.value.toString(),
ThermostatCluster.ThermostatRunningModeEnum.HEAT.label));
options.add(new StateOption(ThermostatCluster.ThermostatRunningModeEnum.COOL.value.toString(),
ThermostatCluster.ThermostatRunningModeEnum.COOL.label));
options.add(new StateOption(ThermostatCluster.ThermostatRunningModeEnum.OFF.getValue().toString(),
ThermostatCluster.ThermostatRunningModeEnum.OFF.getLabel()));
options.add(new StateOption(ThermostatCluster.ThermostatRunningModeEnum.HEAT.getValue().toString(),
ThermostatCluster.ThermostatRunningModeEnum.HEAT.getLabel()));
options.add(new StateOption(ThermostatCluster.ThermostatRunningModeEnum.COOL.getValue().toString(),
ThermostatCluster.ThermostatRunningModeEnum.COOL.getLabel()));
StateDescription stateDescription = StateDescriptionFragmentBuilder.create().withOptions(options).build()
.toStateDescription();
channels.put(tempChannel, stateDescription);
@@ -213,7 +213,7 @@ public class ThermostatConverter extends GenericConverter<ThermostatCluster> {
switch (message.path.attributeName) {
case ThermostatCluster.ATTRIBUTE_SYSTEM_MODE:
if (message.value instanceof ThermostatCluster.SystemModeEnum systemModeEnum) {
updateState(CHANNEL_ID_THERMOSTAT_SYSTEMMODE, new DecimalType(systemModeEnum.value));
updateState(CHANNEL_ID_THERMOSTAT_SYSTEMMODE, new DecimalType(systemModeEnum.getValue()));
}
break;
case ThermostatCluster.ATTRIBUTE_OCCUPIED_HEATING_SETPOINT:
@@ -254,7 +254,7 @@ public class ThermostatConverter extends GenericConverter<ThermostatCluster> {
? ValueUtils.valueToTemperature(initializingCluster.outdoorTemperature)
: UnDefType.NULL);
updateState(CHANNEL_ID_THERMOSTAT_SYSTEMMODE,
initializingCluster.systemMode != null ? new DecimalType(initializingCluster.systemMode.value)
initializingCluster.systemMode != null ? new DecimalType(initializingCluster.systemMode.getValue())
: UnDefType.NULL);
updateState(CHANNEL_ID_THERMOSTAT_OCCUPIEDHEATING,
initializingCluster.occupiedHeatingSetpoint != null
@@ -274,7 +274,7 @@ public class ThermostatConverter extends GenericConverter<ThermostatCluster> {
: UnDefType.NULL);
updateState(CHANNEL_ID_THERMOSTAT_RUNNINGMODE,
initializingCluster.thermostatRunningMode != null
? new DecimalType(initializingCluster.thermostatRunningMode.value)
? new DecimalType(initializingCluster.thermostatRunningMode.getValue())
: UnDefType.NULL);
}
}
@@ -86,22 +86,22 @@ class DoorLockDeviceTest {
@Test
void testHandleMatterEventLockState() {
switchDevice.handleMatterEvent("doorLock", "lockState",
Double.valueOf(DoorLockCluster.LockStateEnum.LOCKED.value));
Double.valueOf(DoorLockCluster.LockStateEnum.LOCKED.getValue()));
verify(switchItem).send(OnOffType.ON);
switchDevice.handleMatterEvent("doorLock", "lockState",
Double.valueOf(DoorLockCluster.LockStateEnum.UNLOCKED.value));
Double.valueOf(DoorLockCluster.LockStateEnum.UNLOCKED.getValue()));
verify(switchItem).send(OnOffType.OFF);
}
@Test
void testHandleMatterEventLockStateGroup() {
groupDevice.handleMatterEvent("doorLock", "lockState",
Double.valueOf(DoorLockCluster.LockStateEnum.LOCKED.value));
Double.valueOf(DoorLockCluster.LockStateEnum.LOCKED.getValue()));
verify(groupItem).send(OnOffType.ON);
groupDevice.handleMatterEvent("doorLock", "lockState",
Double.valueOf(DoorLockCluster.LockStateEnum.UNLOCKED.value));
Double.valueOf(DoorLockCluster.LockStateEnum.UNLOCKED.getValue()));
verify(groupItem).send(OnOffType.OFF);
}
@@ -109,11 +109,11 @@ class DoorLockDeviceTest {
void testUpdateState() {
switchDevice.updateState(switchItem, OnOffType.ON);
verify(client).setEndpointState(any(), eq("doorLock"), eq("lockState"),
eq(DoorLockCluster.LockStateEnum.LOCKED.value));
eq(DoorLockCluster.LockStateEnum.LOCKED.getValue()));
switchDevice.updateState(switchItem, OnOffType.OFF);
verify(client).setEndpointState(any(), eq("doorLock"), eq("lockState"),
eq(DoorLockCluster.LockStateEnum.UNLOCKED.value));
eq(DoorLockCluster.LockStateEnum.UNLOCKED.getValue()));
}
@Test
@@ -123,7 +123,7 @@ class DoorLockDeviceTest {
Map<String, Object> doorLockMap = options.clusters.get("doorLock");
assertNotNull(doorLockMap);
assertEquals(DoorLockCluster.LockStateEnum.LOCKED.value, doorLockMap.get("lockState"));
assertEquals(DoorLockCluster.LockStateEnum.LOCKED.getValue(), doorLockMap.get("lockState"));
}
@Test
@@ -133,6 +133,6 @@ class DoorLockDeviceTest {
Map<String, Object> doorLockMap = options.clusters.get("doorLock");
assertNotNull(doorLockMap);
assertEquals(DoorLockCluster.LockStateEnum.UNLOCKED.value, doorLockMap.get("lockState"));
assertEquals(DoorLockCluster.LockStateEnum.UNLOCKED.getValue(), doorLockMap.get("lockState"));
}
}
@@ -133,7 +133,7 @@ class FanControlConverterTest extends BaseMatterConverterTest {
mockCluster.percentSetting = 50;
converter.initState();
verify(mockHandler, times(1)).updateState(eq(1), eq("fancontrol-fanmode"),
eq(new DecimalType(mockCluster.fanMode.value)));
eq(new DecimalType(mockCluster.fanMode.getValue())));
verify(mockHandler, times(1)).updateState(eq(1), eq("fancontrol-percent"), eq(new PercentType(50)));
}
}
@@ -87,6 +87,6 @@ class RvcOperationalStateConverterTest extends BaseMatterConverterTest {
void testInitState() {
converter.initState();
verify(mockHandler, times(1)).updateState(eq(1), eq("rvcoperationalstate-state"),
eq(new DecimalType(RvcOperationalStateCluster.OperationalStateEnum.ERROR.value)));
eq(new DecimalType(RvcOperationalStateCluster.OperationalStateEnum.ERROR.getValue())));
}
}
@@ -124,7 +124,7 @@ class ThermostatConverterTest extends BaseMatterConverterTest {
message.value = ThermostatCluster.SystemModeEnum.HEAT;
converter.onEvent(message);
verify(mockHandler, times(1)).updateState(eq(1), eq("thermostat-systemmode"),
eq(new DecimalType(ThermostatCluster.SystemModeEnum.HEAT.value)));
eq(new DecimalType(ThermostatCluster.SystemModeEnum.HEAT.getValue())));
}
@Test
@@ -139,7 +139,7 @@ class ThermostatConverterTest extends BaseMatterConverterTest {
verify(mockHandler, times(1)).updateState(eq(1), eq("thermostat-localtemperature"),
eq(new QuantityType<>(20.0, SIUnits.CELSIUS)));
verify(mockHandler, times(1)).updateState(eq(1), eq("thermostat-systemmode"),
eq(new DecimalType(mockCluster.systemMode.value)));
eq(new DecimalType(mockCluster.systemMode.getValue())));
verify(mockHandler, times(1)).updateState(eq(1), eq("thermostat-occupiedheating"),
eq(new QuantityType<>(22.0, SIUnits.CELSIUS)));
verify(mockHandler, times(1)).updateState(eq(1), eq("thermostat-occupiedcooling"),