public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[avmfritz] Decode alarm state for blinds (#13672)

Browse Source 
* [avmfritz] Decode alarm state for blinds
Signed-off-by: Ulrich Mertin <mail@ulrich-mertin.de>
This commit is contained in:
quidam
2022-11-11 23:13:05 +01:00
committed by GitHub
parent 62899e0fa5
commit 8c7d774074
7 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/AVMFritzBindingConstants.java
View File

@@ -136,6 +136,8 @@ public class AVMFritzBindingConstants {
public static final String CHANNEL_NEXTTEMP = "next_temp";
public static final String CHANNEL_BATTERY_LOW = "battery_low";
public static final String CHANNEL_BATTERY = "battery_level";
public static final String CHANNEL_OBSTRUCTION_ALARM = "obstruction_alarm";
public static final String CHANNEL_TEMPERATURE_ALARM = "temperature_alarm";
public static final String CHANNEL_CONTACT_STATE = "contact_state";
public static final String CHANNEL_PRESS = "press";
public static final String CHANNEL_LAST_CHANGE = "last_change";

12
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/dto/AlertModel.java
View File

@@ -41,6 +41,18 @@ public class AlertModel {
this.state = state;
}
public boolean hasObstructionAlarmOccurred() {
return (state.intValue() & 1) != 0;
}
public boolean hasTemperaturAlarmOccurred() {
return (state.intValue() & 2) != 0;
}
public boolean hasUnknownAlarmOccurred() {
return ((state.intValue() & 255) >> 2) != 0;
}
@Override
public String toString() {
return new StringBuilder().append("[state=").append(state).append("]").toString();

19
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzBaseThingHandler.java
View File

@@ -152,7 +152,11 @@ public abstract class AVMFritzBaseThingHandler extends BaseThingHandler implemen
updateHumiditySensor(deviceModel.getHumidity());
}
if (deviceModel.isHANFUNAlarmSensor()) {
updateHANFUNAlarmSensor(deviceModel.getAlert());
if (deviceModel.isHANFUNBlinds()) {
updateHANFUNBlindsAlarmSensor(deviceModel.getAlert());
} else {
updateHANFUNAlarmSensor(deviceModel.getAlert());
}
}
if (deviceModel.isHANFUNBlinds()) {
updateLevelControl(deviceModel.getLevelControlModel());
@@ -174,6 +178,17 @@ public abstract class AVMFritzBaseThingHandler extends BaseThingHandler implemen
}
}
private void updateHANFUNBlindsAlarmSensor(@Nullable AlertModel alertModel) {
if (alertModel != null) {
updateThingChannelState(CHANNEL_OBSTRUCTION_ALARM,
OnOffType.from(alertModel.hasObstructionAlarmOccurred()));
updateThingChannelState(CHANNEL_TEMPERATURE_ALARM, OnOffType.from(alertModel.hasTemperaturAlarmOccurred()));
if (alertModel.hasUnknownAlarmOccurred()) {
logger.warn("Unknown blinds alarm {}", alertModel.getState());
}
}
}
protected void updateTemperatureSensor(@Nullable TemperatureModel temperatureModel) {
if (temperatureModel != null) {
updateThingChannelState(CHANNEL_TEMPERATURE,
@@ -397,6 +412,8 @@ public abstract class AVMFritzBaseThingHandler extends BaseThingHandler implemen
case CHANNEL_BATTERY_LOW:
case CHANNEL_CONTACT_STATE:
case CHANNEL_LAST_CHANGE:
case CHANNEL_OBSTRUCTION_ALARM:
case CHANNEL_TEMPERATURE_ALARM:
logger.debug("Channel {} is a read-only channel and cannot handle command '{}'", channelId, command);
break;
case CHANNEL_OUTLET:

4
bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
View File

@@ -137,6 +137,10 @@ channel-type.avmfritz.comfort_temp.label = Comfort Temperature
channel-type.avmfritz.comfort_temp.description = Thermostat Comfort temperature.
channel-type.avmfritz.contact_state.label = Contact State
channel-type.avmfritz.contact_state.description = Contact state information (OPEN/CLOSED).
channel-type.avmfritz.obstruction_alarm.label = Obstruction Alarm
channel-type.avmfritz.obstruction_alarm.description = Obstruction alarm of the blinds. The blinds were stopped and moved a bit in the opposite direction.
channel-type.avmfritz.temperature_alarm.label = Temperature Alarm
channel-type.avmfritz.temperature_alarm.description = Temperature alarm of the blinds. Indicates overheating of the motor.
channel-type.avmfritz.device_locked.label = Locked (manual)
channel-type.avmfritz.device_locked.description = Device is locked for switching by pressing the button on the device.
channel-type.avmfritz.eco_temp.label = Eco Temperature

15
bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
View File

@@ -224,6 +224,20 @@
<state pattern="%s" readOnly="true"/>
</channel-type>
<channel-type id="obstruction_alarm">
<item-type>Switch</item-type>
<label>Obstruction Alarm</label>
<description>Obstruction alarm of the blinds. The blinds were stopped and moved a bit in the opposite direction.</description>
<state readOnly="true"/>
</channel-type>
<channel-type id="temperature_alarm">
<item-type>Switch</item-type>
<label>Temperature Alarm</label>
<description>Temperature alarm of the blinds. Indicates overheating of the motor.</description>
<state readOnly="true"/>
</channel-type>
<channel-type id="last_change">
<item-type>DateTime</item-type>
<label>Last Change</label>
@@ -236,7 +250,6 @@
<item-type>Rollershutter</item-type>
<label>Rollershutter Control</label>
<description>Controls the rollershutter and states its opening level in percent</description>
<category>Blinds</category>
</channel-type>
</thing:thing-descriptions>

2
bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
View File

@@ -334,6 +334,8 @@
<channels>
<channel id="rollershutter" typeId="rollershutter"/>
<channel id="obstruction_alarm" typeId="obstruction_alarm"/>
<channel id="temperature_alarm" typeId="temperature_alarm"/>
</channels>
<representation-property>ain</representation-property>