demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to remove un-necessary fields (#19962)

Browse Source 
Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
This commit is contained in:
mlobstein
2026-01-04 12:51:39 +01:00
committed by GitHub
parent 0556a38709
commit f825a93191
2 changed files with 54 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/communication/AmplifierModel.java
+33 -56
View File
@@ -34,9 +34,9 @@ import org.openhab.core.types.StateOption;
public enum AmplifierModel {
// Monoprice 10761/Dayton Audio DAX66
MONOPRICE("<", "\r", "?", "", "#>", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -7, 7, 7, -10, 10, 10, 6,
true, List.of("11", "12", "13", "14", "15", "16", "21", "22", "23", "24", "25", "26", "31", "32", "33",
"34", "35", "36")) {
MONOPRICE("<", "\r", "?", "", "#>", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -7, 7, 7, -10, 10, 10, true,
List.of("11", "12", "13", "14", "15", "16", "21", "22", "23", "24", "25", "26", "31", "32", "33", "34",
"35", "36")) {
@Override
public MonopriceAudioZoneDTO getZoneData(String newZoneData) {
return getMonopriceZoneData(newZoneData);
@@ -44,13 +44,11 @@ public enum AmplifierModel {
@Override
public List<StateOption> getSourceLabels(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6));
return getSourceLabels6(config);
}
},
// Monoprice 44519 4 zone variant
MONOPRICE4("<", "\r", "?", "", "#>", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -7, 7, 7, -10, 10, 10, 6,
MONOPRICE4("<", "\r", "?", "", "#>", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -7, 7, 7, -10, 10, 10,
true, List.of("11", "12", "13", "14", "21", "22", "23", "24", "31", "32", "33", "34")) {
@Override
public MonopriceAudioZoneDTO getZoneData(String newZoneData) {
@@ -59,13 +57,11 @@ public enum AmplifierModel {
@Override
public List<StateOption> getSourceLabels(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6));
return getSourceLabels6(config);
}
},
// Monoprice 44518 8 zone variant
MONOPRICE8("<", "\r", "?", "", "#>", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -7, 7, 7, -10, 10, 10, 6,
MONOPRICE8("<", "\r", "?", "", "#>", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -7, 7, 7, -10, 10, 10,
true, List.of("11", "12", "13", "14", "15", "16", "17", "18", "21", "22", "23", "24", "25", "26", "27",
"28", "31", "32", "33", "34", "35", "36", "37", "38")) {
@Override
@@ -75,14 +71,12 @@ public enum AmplifierModel {
@Override
public List<StateOption> getSourceLabels(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6));
return getSourceLabels6(config);
}
},
// Dayton Audio DAX88
DAX88("<", "\r", "?", "", ">", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -12, 12, 12, -10, 10, 10, 8,
true, List.of("01", "02", "03", "04", "05", "06", "07", "08")) {
DAX88("<", "\r", "?", "", ">", "PR", "CH", "VO", "MU", "TR", "BS", "BL", "DT", 38, -12, 12, 12, -10, 10, 10, true,
List.of("01", "02", "03", "04", "05", "06", "07", "08")) {
@Override
public MonopriceAudioZoneDTO getZoneData(String newZoneData) {
return getMonopriceZoneData(newZoneData);
@@ -90,13 +84,10 @@ public enum AmplifierModel {
@Override
public List<StateOption> getSourceLabels(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6),
new StateOption("7", config.inputLabel7), new StateOption("8", config.inputLabel8));
return getSourceLabels8(config);
}
},
MONOPRICE70("!", "+\r", "?", "ZS", "?", "PR", "IS", "VO", "MU", "TR", "BS", "BA", "", 38, -7, 7, 7, -32, 31, 32, 2,
MONOPRICE70("!", "+\r", "?", "ZS", "?", "PR", "IS", "VO", "MU", "TR", "BS", "BA", "", 38, -7, 7, 7, -32, 31, 32,
false, List.of("1", "2", "3", "4", "5", "6")) {
@Override
public MonopriceAudioZoneDTO getZoneData(String newZoneData) {
@@ -141,8 +132,8 @@ public enum AmplifierModel {
return List.of(new StateOption("0", config.inputLabel1), new StateOption("1", config.inputLabel2));
}
},
XANTECH("!", "+\r", "?", "ZD", "#", "PR", "SS", "VO", "MU", "TR", "BS", "BL", "", 38, -7, 7, 7, -32, 31, 32, 8,
false, List.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16")) {
XANTECH("!", "+\r", "?", "ZD", "#", "PR", "SS", "VO", "MU", "TR", "BS", "BL", "", 38, -7, 7, 7, -32, 31, 32, false,
List.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16")) {
@Override
public MonopriceAudioZoneDTO getZoneData(String newZoneData) {
final MonopriceAudioZoneDTO zoneData = new MonopriceAudioZoneDTO();
@@ -165,14 +156,11 @@ public enum AmplifierModel {
@Override
public List<StateOption> getSourceLabels(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6),
new StateOption("7", config.inputLabel7), new StateOption("8", config.inputLabel8));
return getSourceLabels8(config);
}
};
// Used by 10761/DAX66 and DAX88
// Used by 10761/DAX66, 44519, 44518 and DAX88
private static MonopriceAudioZoneDTO getMonopriceZoneData(String newZoneData) {
final MonopriceAudioZoneDTO zoneData = new MonopriceAudioZoneDTO();
final Matcher matcher = MONOPRICE_PATTERN.matcher(newZoneData);
@@ -193,6 +181,21 @@ public enum AmplifierModel {
return zoneData;
}
// Used by 10761/DAX66, 44519 and 44518
private static List<StateOption> getSourceLabels6(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6));
}
// Used by DAX88 and Xantech
private static List<StateOption> getSourceLabels8(MonopriceAudioThingConfiguration config) {
return List.of(new StateOption("1", config.inputLabel1), new StateOption("2", config.inputLabel2),
new StateOption("3", config.inputLabel3), new StateOption("4", config.inputLabel4),
new StateOption("5", config.inputLabel5), new StateOption("6", config.inputLabel6),
new StateOption("7", config.inputLabel7), new StateOption("8", config.inputLabel8));
}
// Monoprice 10761/DAX66 status string: #>1200010000130809100601
// DAX88 status string is the same but does not have leading '#': >xxaabbccddeeffgghhiijj
private static final Pattern MONOPRICE_PATTERN = Pattern
@@ -229,18 +232,10 @@ public enum AmplifierModel {
private final int minBal;
private final int maxBal;
private final int balOffset;
private final int maxZones;
private final int numSources;
private final boolean padNumbers;
private final List<String> zoneIds;
private final Map<String, String> zoneIdMap;
private static final String ON_STR = "1";
private static final String OFF_STR = "0";
private static final String ON_STR_PAD = "01";
private static final String OFF_STR_PAD = "00";
/**
* Constructor for all the enum parameters
*
@@ -248,7 +243,7 @@ public enum AmplifierModel {
AmplifierModel(String cmdPrefix, String cmdSuffix, String queryPrefix, String querySuffix, String respPrefix,
String powerCmd, String sourceCmd, String volumeCmd, String muteCmd, String trebleCmd, String bassCmd,
String balanceCmd, String dndCmd, int maxVol, int minTone, int maxTone, int toneOffset, int minBal,
int maxBal, int balOffset, int numSources, boolean padNumbers, List<String> zoneIds) {
int maxBal, int balOffset, boolean padNumbers, List<String> zoneIds) {
this.cmdPrefix = cmdPrefix;
this.cmdSuffix = cmdSuffix;
this.queryPrefix = queryPrefix;
@@ -269,12 +264,10 @@ public enum AmplifierModel {
this.minBal = minBal;
this.maxBal = maxBal;
this.balOffset = balOffset;
this.maxZones = zoneIds.size();
this.numSources = numSources;
this.padNumbers = padNumbers;
this.zoneIds = zoneIds;
// Build a map between the amp's physical zone IDs and the thing's logical zone names
// Build a map between the amp's physical zone IDs and the Thing's logical zone names
final Map<String, String> zoneIdMap = new HashMap<>();
IntStream.range(0, zoneIds.size()).forEach(i -> zoneIdMap.put(zoneIds.get(i), "zone" + (i + 1)));
this.zoneIdMap = Collections.unmodifiableMap(zoneIdMap);
@@ -373,14 +366,6 @@ public enum AmplifierModel {
return toneOffset;
}
public int getMaxZones() {
return maxZones;
}
public int getNumSources() {
return numSources;
}
public String getCmdSuffix() {
return cmdSuffix;
}
@@ -392,12 +377,4 @@ public enum AmplifierModel {
public String getFormattedValue(Integer value) {
return padNumbers ? String.format("%02d", value) : value.toString();
}
public String getOnStr() {
return padNumbers ? ON_STR_PAD : ON_STR;
}
public String getOffStr() {
return padNumbers ? OFF_STR_PAD : OFF_STR;
}
}
bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java
+21 -18
View File
@@ -92,7 +92,9 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
private Set<String> ignoreZones = new HashSet<>();
private long lastPollingUpdate = System.currentTimeMillis();
private long pollingInterval = ZERO;
private int maxZones = ZERO;
private int numZones = ZERO;
private int numSources = ZERO;
private int allVolume = ONE;
private int initialAllVolume = ZERO;
private boolean disableKeypadPolling = false;
@@ -114,6 +116,7 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
final String serialPort = config.serialPort;
final String host = config.host;
final Integer port = config.port;
maxZones = amp.getZoneIds().size();
numZones = config.numZones;
final String ignoreZonesConfig = config.ignoreZones;
disableKeypadPolling = config.disableKeypadPolling || amp == AmplifierModel.MONOPRICE70;
@@ -154,11 +157,11 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
for (String zone : ignoreZonesConfig.split(",")) {
try {
int zoneInt = Integer.parseInt(zone);
if (zoneInt >= ONE && zoneInt <= amp.getMaxZones()) {
if (zoneInt >= ONE && zoneInt <= maxZones) {
ignoreZones.add(ZONE + zoneInt);
} else {
logger.debug("Invalid ignore zone value: {}, value must be between {} and {}", zone, ONE,
amp.getMaxZones());
maxZones);
}
} catch (NumberFormatException nfe) {
logger.debug("Invalid ignore zone value: {}", zone);
@@ -170,6 +173,7 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
List<Integer> activeZones = IntStream.range(1, numZones + 1).boxed().collect(Collectors.toList());
List<StateOption> sourceLabels = amp.getSourceLabels(config);
numSources = sourceLabels.size();
stateDescriptionProvider.setStateOptions(
new ChannelUID(getThing().getUID(), ALL + CHANNEL_DELIMIT + CHANNEL_TYPE_ALLSOURCE), sourceLabels);
activeZones.forEach(zoneNum -> {
@@ -179,10 +183,10 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
});
// remove the channels for the zones we are not using
if (numZones < amp.getMaxZones()) {
if (numZones < maxZones) {
List<Channel> channels = new ArrayList<>(this.getThing().getChannels());
List<Integer> zonesToRemove = IntStream.range(numZones + 1, amp.getMaxZones() + 1).boxed()
List<Integer> zonesToRemove = IntStream.range(numZones + 1, maxZones + 1).boxed()
.collect(Collectors.toList());
zonesToRemove.forEach(zone -> {
@@ -237,6 +241,7 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
}
try {
final int cmdOnOff = (command == OnOffType.ON ? ONE : ZERO);
if (!"all".equals(zoneName)) {
MonopriceAudioZoneDTO dto = zoneDataMap.get(zoneId);
if (dto == null) {
@@ -247,14 +252,14 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
switch (channelType) {
case CHANNEL_TYPE_POWER:
if (command instanceof OnOffType) {
connector.sendCommand(zoneId, amp.getPowerCmd(), command == OnOffType.ON ? ONE : ZERO);
dto.setPower(command == OnOffType.ON ? amp.getOnStr() : amp.getOffStr());
connector.sendCommand(zoneId, amp.getPowerCmd(), cmdOnOff);
dto.setPower(amp.getFormattedValue(cmdOnOff));
}
break;
case CHANNEL_TYPE_SOURCE:
if (command instanceof DecimalType decimalCommand) {
final int value = decimalCommand.intValue();
if (value >= ONE && value <= amp.getNumSources()) {
if (value >= ONE && value <= numSources) {
logger.debug("Got source command {} zone {}", value, zoneId);
connector.sendCommand(zoneId, amp.getSourceCmd(), value);
dto.setSource(amp.getFormattedValue(value));
@@ -273,8 +278,8 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
break;
case CHANNEL_TYPE_MUTE:
if (command instanceof OnOffType) {
connector.sendCommand(zoneId, amp.getMuteCmd(), command == OnOffType.ON ? ONE : ZERO);
dto.setMute(command == OnOffType.ON ? amp.getOnStr() : amp.getOffStr());
connector.sendCommand(zoneId, amp.getMuteCmd(), cmdOnOff);
dto.setMute(amp.getFormattedValue(cmdOnOff));
}
break;
case CHANNEL_TYPE_TREBLE:
@@ -309,8 +314,8 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
break;
case CHANNEL_TYPE_DND:
if (command instanceof OnOffType) {
connector.sendCommand(zoneId, amp.getDndCmd(), command == OnOffType.ON ? ONE : ZERO);
dto.setDnd(command == OnOffType.ON ? amp.getOnStr() : amp.getOffStr());
connector.sendCommand(zoneId, amp.getDndCmd(), cmdOnOff);
dto.setDnd(amp.getFormattedValue(cmdOnOff));
}
break;
default:
@@ -324,15 +329,14 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
switch (channelType) {
case CHANNEL_TYPE_ALLPOWER:
if (command instanceof OnOffType) {
final int cmd = command == OnOffType.ON ? ONE : ZERO;
zoneStream.forEach((streamZoneId) -> {
if (command == OnOffType.OFF
|| !ignoreZones.contains(amp.getZoneName(streamZoneId))) {
try {
MonopriceAudioZoneDTO streamDto = zoneDataMap.get(streamZoneId);
if (streamDto != null) {
connector.sendCommand(streamZoneId, amp.getPowerCmd(), cmd);
streamDto.setPower(amp.getFormattedValue(cmd));
connector.sendCommand(streamZoneId, amp.getPowerCmd(), cmdOnOff);
streamDto.setPower(amp.getFormattedValue(cmdOnOff));
updateChannelState(streamZoneId, CHANNEL_TYPE_POWER);
if (command == OnOffType.ON) {
@@ -353,7 +357,7 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
case CHANNEL_TYPE_ALLSOURCE:
if (command instanceof DecimalType decimalCommand) {
final int value = decimalCommand.intValue();
if (value >= ONE && value <= amp.getNumSources()) {
if (value >= ONE && value <= numSources) {
zoneStream.forEach((streamZoneId) -> {
if (!ignoreZones.contains(amp.getZoneName(streamZoneId))) {
try {
@@ -398,15 +402,14 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
break;
case CHANNEL_TYPE_ALLMUTE:
if (command instanceof OnOffType) {
final int cmd = command == OnOffType.ON ? ONE : ZERO;
zoneStream.forEach((streamZoneId) -> {
if (!ignoreZones.contains(amp.getZoneName(streamZoneId))) {
try {
MonopriceAudioZoneDTO streamDto = zoneDataMap.get(streamZoneId);
if (streamDto != null) {
connector.sendCommand(streamZoneId, amp.getMuteCmd(), cmd);
connector.sendCommand(streamZoneId, amp.getMuteCmd(), cmdOnOff);
if (streamDto.isPowerOn()) {
streamDto.setMute(amp.getFormattedValue(cmd));
streamDto.setMute(amp.getFormattedValue(cmdOnOff));
updateChannelState(streamZoneId, CHANNEL_TYPE_MUTE);
}
}