demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify DateTimeType handling for Siemens HVAC

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2024-11-10 21:18:09 +01:00 committed by lsiepel
parent 96b5ad2e55
commit 7d54e604f9
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/ConverterFactory.java
View File

@ -44,7 +44,7 @@ public class ConverterFactory {
registerConverter(SiemensHvacBindingConstants.DPT_TYPE_NUMERIC, new NumericTypeConverter()); registerConverter(SiemensHvacBindingConstants.DPT_TYPE_NUMERIC, new NumericTypeConverter());
registerConverter(SiemensHvacBindingConstants.DPT_TYPE_RADIO, new RadioTypeConverter()); registerConverter(SiemensHvacBindingConstants.DPT_TYPE_RADIO, new RadioTypeConverter());
registerConverter(SiemensHvacBindingConstants.DPT_TYPE_STRING, new StringTypeConverter()); registerConverter(SiemensHvacBindingConstants.DPT_TYPE_STRING, new StringTypeConverter());
registerConverter(SiemensHvacBindingConstants.DPT_TYPE_TIMEOFDAY, new TimeOfDayTypeConverter(timeZoneProvider)); registerConverter(SiemensHvacBindingConstants.DPT_TYPE_TIMEOFDAY, new TimeOfDayTypeConverter());
registerConverter(SiemensHvacBindingConstants.DPT_TYPE_CHECKBOX, new CheckboxTypeConverter()); registerConverter(SiemensHvacBindingConstants.DPT_TYPE_CHECKBOX, new CheckboxTypeConverter());
registerConverter(SiemensHvacBindingConstants.DPT_TYPE_SCHEDULER, new SchedulerTypeConverter()); registerConverter(SiemensHvacBindingConstants.DPT_TYPE_SCHEDULER, new SchedulerTypeConverter());

2
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/DateTimeTypeConverter.java
View File

@ -70,7 +70,7 @@ public class DateTimeTypeConverter extends AbstractTypeConverter {
protected DateTimeType fromBinding(JsonElement value, String unit, String type, ChannelType tp, Locale locale) protected DateTimeType fromBinding(JsonElement value, String unit, String type, ChannelType tp, Locale locale)
throws ConverterException { throws ConverterException {
if ("----".equals(value.getAsString())) { if ("----".equals(value.getAsString())) {
return new DateTimeType(ZonedDateTime.now(this.timeZoneProvider.getTimeZone())); return new DateTimeType();
} else { } else {
String[] formats = { "EEEE, d. LLLL yyyy HH:mm[:ss]", "d. LLLL yyyy HH:mm[:ss]", "d. LLLL yyyy", String[] formats = { "EEEE, d. LLLL yyyy HH:mm[:ss]", "d. LLLL yyyy HH:mm[:ss]", "d. LLLL yyyy",
"d. LLLL" }; "d. LLLL" };

10
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/TimeOfDayTypeConverter.java
View File

@ -12,7 +12,6 @@
*/ */
package org.openhab.binding.siemenshvac.internal.converter.type; package org.openhab.binding.siemenshvac.internal.converter.type;
import java.time.ZonedDateTime;
import java.util.Locale; import java.util.Locale;
import javax.measure.Unit; import javax.measure.Unit;
@ -22,7 +21,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.siemenshvac.internal.converter.ConverterException; import org.openhab.binding.siemenshvac.internal.converter.ConverterException;
import org.openhab.binding.siemenshvac.internal.metadata.SiemensHvacMetadataDataPoint; import org.openhab.binding.siemenshvac.internal.metadata.SiemensHvacMetadataDataPoint;
import org.openhab.core.i18n.TimeZoneProvider;
import org.openhab.core.library.CoreItemFactory; import org.openhab.core.library.CoreItemFactory;
import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.DateTimeType;
import org.openhab.core.library.types.QuantityType; import org.openhab.core.library.types.QuantityType;
@ -40,12 +38,6 @@ import com.google.gson.JsonElement;
*/ */
@NonNullByDefault @NonNullByDefault
public class TimeOfDayTypeConverter extends AbstractTypeConverter { public class TimeOfDayTypeConverter extends AbstractTypeConverter {
private final TimeZoneProvider timeZoneProvider;
public TimeOfDayTypeConverter(final TimeZoneProvider timeZoneProvider) {
this.timeZoneProvider = timeZoneProvider;
}
@Override @Override
protected boolean toBindingValidation(Type type) { protected boolean toBindingValidation(Type type) {
return true; return true;
@ -71,7 +63,7 @@ public class TimeOfDayTypeConverter extends AbstractTypeConverter {
protected State fromBinding(JsonElement value, String unit, String type, ChannelType tp, Locale locale) protected State fromBinding(JsonElement value, String unit, String type, ChannelType tp, Locale locale)
throws ConverterException { throws ConverterException {
if ("----".equals(value.getAsString())) { if ("----".equals(value.getAsString())) {
return new DateTimeType(ZonedDateTime.now(this.timeZoneProvider.getTimeZone())); return new DateTimeType();
} else { } else {
if ("h:m".equals(unit)) { if ("h:m".equals(unit)) {
String st = value.getAsString(); String st = value.getAsString();