Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[avmfritz] Decode alarm state for blinds #13672

Merged
merged 4 commits into from
Nov 11, 2022
Merged

[avmfritz] Decode alarm state for blinds #13672

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e1ea57
[avmfritz] Decode alarm state for blinds
quidam Nov 6, 2022
49f5b60
[avmfritz] Incorporate changes from partial code review
quidam Nov 9, 2022
4d40ac2
[avmfritz] Incorporate changes from final code review
quidam Nov 10, 2022
5960083
[avmfritz] Incorporate further changes from final code review
quidam Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bundles/org.openhab.binding.avmfritz/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ The AIN (actor identification number) can be found in the FRITZ!Box interface ->
| contact_state | Contact | Contact state information (OPEN/CLOSED). | HAN-FUN contact (e.g. SmartHome Tür-/Fensterkontakt or SmartHome Bewegungsmelder)- FRITZ!OS 7 |
| last_change | DateTime | States the last time the button was pressed. | FRITZ!DECT 400, FRITZ!DECT 440, HAN-FUN switch (e.g. SmartHome Wandtaster) - FRITZ!OS 7 |
| rollershutter | Rollershutter | Rollershutter control and status. Accepts UP/DOWN/STOP commands and the opening level in percent. States the opening level in percent. | HAN-FUN blind (e.g. Rolltron DECT 1213) - FRITZ!OS 7 |
| obstruction_alarm | Obstruction Alarm | Rollershutter obstruction alarm. (OPEN/CLOSED). | HAN-FUN blind (e.g. Rolltron DECT 1213) - FRITZ!OS 7 |
| temperature_alarm | Temperature Alarm | Rollershutter temperature alarm. (OPEN/CLOSED). | HAN-FUN blind (e.g. Rolltron DECT 1213) - FRITZ!OS 7 |
quidam marked this conversation as resolved.
Show resolved Hide resolved

### Triggers

Expand Down
2 changes: 2 additions & 0 deletions ...vmfritz/src/main/java/org/openhab/binding/avmfritz/internal/AVMFritzBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
12 changes: 12 additions & 0 deletions ....binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/dto/AlertModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ public void setState(BigDecimal state) {
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();
Expand Down
20 changes: 19 additions & 1 deletion ...src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzBaseThingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ public void onDeviceUpdated(ThingUID thingUID, AVMFritzBaseModel device) {
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());
Expand All @@ -174,6 +178,18 @@ private void updateHANFUNAlarmSensor(@Nullable AlertModel alertModel) {
}
}

private void updateHANFUNBlindsAlarmSensor(@Nullable AlertModel alertModel) {
if (alertModel != null) {
updateThingChannelState(CHANNEL_OBSTRUCTION_ALARM,
alertModel.hasObstructionAlarmOccurred() ? OpenClosedType.CLOSED : OpenClosedType.OPEN);
updateThingChannelState(CHANNEL_TEMPERATURE_ALARM,
alertModel.hasTemperaturAlarmOccurred() ? OpenClosedType.CLOSED : OpenClosedType.OPEN);
if (alertModel.hasUnknownAlarmOccurred()) {
logger.warn("Unknown blinds alarm {}", alertModel.getState());
}
}
}

protected void updateTemperatureSensor(@Nullable TemperatureModel temperatureModel) {
if (temperatureModel != null) {
updateThingChannelState(CHANNEL_TEMPERATURE,
Expand Down Expand Up @@ -397,6 +413,8 @@ public void handleCommand(ChannelUID channelUID, Command command) {
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:
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
description = Temperature alarm of the blinds. Indicates overheating of the motor.
quidam marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
16 changes: 16 additions & 0 deletions bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,22 @@
<state pattern="%s" readOnly="true"/>
</channel-type>

<channel-type id="obstruction_alarm">
<item-type>Contact</item-type>
quidam marked this conversation as resolved.
Show resolved Hide resolved
<label>Obstruction Alarm</label>
<description>Obstruction alarm of the blinds. The blinds were stopped and moved a bit in the opposite direction.</description>
<category>Blinds</category>
quidam marked this conversation as resolved.
Show resolved Hide resolved
<state pattern="%s" readOnly="true"/>
quidam marked this conversation as resolved.
Show resolved Hide resolved
</channel-type>

<channel-type id="temperature_alarm">
quidam marked this conversation as resolved.
Show resolved Hide resolved
<item-type>Contact</item-type>
quidam marked this conversation as resolved.
Show resolved Hide resolved
<label>Temperature Alarm</label>
<description>Temperature alarm of the blinds. Indicates overheating of the motor.</description>
<category>Blinds</category>
quidam marked this conversation as resolved.
Show resolved Hide resolved
<state pattern="%s" readOnly="true"/>
quidam marked this conversation as resolved.
Show resolved Hide resolved
</channel-type>

<channel-type id="last_change">
<item-type>DateTime</item-type>
<label>Last Change</label>
Expand Down
2 changes: 2 additions & 0 deletions bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down