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

Fix #6939 - Forced channel triggering without previous state (#10356) 

Signed-off-by: Gabor Bicskei <gbicskei@gmail.com>
This commit is contained in:
Gabor Bicskei 2021-03-31 21:47:26 +02:00 committed by GitHub
parent 6f516ee7ac
commit d64f13351e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.gpstracker/README.md
View File

@ -249,8 +249,6 @@ After a location message received from the tracker the log should contain these
2018-10-05 09:27:58.794 [TRACE] [cker.internal.handler.TrackerHandler] - System uses SI measurement units. No conversion is needed. 2018-10-05 09:27:58.794 [TRACE] [cker.internal.handler.TrackerHandler] - System uses SI measurement units. No conversion is needed.
``` ```
**Note**: If the binding was restarted or the distance channel is new (this is the first location message for the channel) only the second location update will trigger event as the binding has to know the previous state.
### External Region and Presence Switch ### External Region and Presence Switch
Assumptions: Assumptions:

11
bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/handler/TrackerHandler.java
View File

@ -262,7 +262,7 @@ public class TrackerHandler extends BaseThingHandler {
*/ */
private void updateTriggerChannelsWithTransition(TransitionMessage message) { private void updateTriggerChannelsWithTransition(TransitionMessage message) {
String regionName = message.getRegionName(); String regionName = message.getRegionName();
triggerRegionChannel(regionName, message.getEvent()); triggerRegionChannel(regionName, message.getEvent(), true);
} }
/** /**
@ -270,11 +270,12 @@ public class TrackerHandler extends BaseThingHandler {
* *
* @param regionName Region name * @param regionName Region name
* @param event Occurred event * @param event Occurred event
* @param forced Force channel triggering in case the transition event is received from the mobile application.
*/ */
private void triggerRegionChannel(@NonNull String regionName, @NonNull String event) { private void triggerRegionChannel(@NonNull String regionName, @NonNull String event, boolean forced) {
Boolean lastState = lastTriggeredStates.get(regionName); Boolean lastState = lastTriggeredStates.get(regionName);
Boolean newState = EVENT_ENTER.equals(event); Boolean newState = EVENT_ENTER.equals(event);
if (!newState.equals(lastState) && lastState != null) { if (!newState.equals(lastState) || forced) {
String payload = regionName + "/" + event; String payload = regionName + "/" + event;
triggerChannel(CHANNEL_REGION_TRIGGER, payload); triggerChannel(CHANNEL_REGION_TRIGGER, payload);
lastTriggeredStates.put(regionName, newState); lastTriggeredStates.put(regionName, newState);
@ -327,9 +328,9 @@ public class TrackerHandler extends BaseThingHandler {
// convert into meters which is the unit of the calculated distance // convert into meters which is the unit of the calculated distance
double radiusMeter = convertToMeters(ConfigHelper.getRegionRadius(c.getConfiguration())); double radiusMeter = convertToMeters(ConfigHelper.getRegionRadius(c.getConfiguration()));
if (radiusMeter > newDistance) { if (radiusMeter > newDistance) {
triggerRegionChannel(regionName, EVENT_ENTER); triggerRegionChannel(regionName, EVENT_ENTER, false);
} else { } else {
triggerRegionChannel(regionName, EVENT_LEAVE); triggerRegionChannel(regionName, EVENT_LEAVE, false);
} }
} }
} }