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

Ensure initialization completed #41

Merged
merged 6 commits into from
Mar 8, 2022
Merged

Ensure initialization completed #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2554434
Added update mode
docbender Nov 1, 2021
734b706
Fix reconnect issue #34
docbender Nov 23, 2021
56e5780
Space between data in one area increased to 128
docbender Dec 9, 2021
843ac17
Version update
docbender Dec 23, 2021
24ec90d
Startup delay to ensure binding initialization completed
docbender Mar 7, 2022
17dfe7d
Merge branch 'master' into v.3.2.0
docbender Mar 7, 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
8 changes: 5 additions & 3 deletions ...atic/src/main/java/org/openhab/binding/simatic/internal/handler/simaticBridgeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.concurrent.TimeUnit;

import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.NonNullByDefault;
Expand Down Expand Up @@ -49,7 +50,6 @@
*/
@NonNullByDefault
public class SimaticBridgeHandler extends BaseBridgeHandler {

private final Logger logger = LoggerFactory.getLogger(SimaticBridgeHandler.class);

private @Nullable SimaticBridgeConfiguration config;
Expand All @@ -60,6 +60,8 @@ public class SimaticBridgeHandler extends BaseBridgeHandler {
private @Nullable ChannelUID chVersion, chPduSize, chAreasCount, chAreas, chTagCount, chRequests, chBytes;

private int channelCount = 0;
/** Initial scheduler delay */
private static final long INIT_SECONDS = 5;

/**
* Constructor
Expand Down Expand Up @@ -192,11 +194,11 @@ public void initialize() {
updateStatus(ThingStatus.UNKNOWN);

// background initialization
scheduler.execute(() -> {
scheduler.schedule(() -> {
if (!connection.open()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR);
}
});
}, INIT_SECONDS, TimeUnit.SECONDS);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...g.simatic/src/main/java/org/openhab/binding/simatic/internal/simaticBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@NonNullByDefault
public class SimaticBindingConstants {

public static final String VERSION = "3.2.0";
public static final String VERSION = "3.2.1";

private static final String BINDING_ID = "simatic";

Expand Down