Skip to content

Revert onState addtion in DigitalBase #830

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

Merged
stefanhaustein merged 2 commits into from
Oct 28, 2026
Merged

Revert onState addtion in DigitalBase #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4102190
Revert onState addtion in DigitalBase
stefanhaustein Oct 27, 2026
5fe7576
remove obsolete methods
stefanhaustein Oct 28, 2026
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
26 changes: 3 additions & 23 deletions pi4j-core/src/main/java/com/pi4j/io/gpio/digital/DigitalBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ protected DigitalBase(CONFIG_TYPE config, Consumer<?> onClose) {
(listener, event) -> listener.onDigitalStateChange(event));
}

@Override
public Consumer<Boolean> addConsumer(Consumer<Boolean> listener) {
DigitalState on = onState();
addListener(new ConsumerAdapter(listener, on != null ? on : DigitalState.HIGH));
return listener;
}

@Override
public void removeConsumer(Consumer<Boolean> listener) {
stateChangeEventManager.remove(
Expand Down Expand Up @@ -91,24 +84,11 @@ public void close() {
super.close();
}

@Override
public boolean isOn() {
DigitalState on = onState();
return state().equals(on != null ? on : DigitalState.HIGH);
}

/**
* Returns the configured on-state for this digital I/O instance.
*
* @return the configured {@link DigitalState}
*/
public abstract DigitalState onState();

private static class ConsumerAdapter implements DigitalStateChangeListener {
private final Consumer<Boolean> consumer;
protected static class ConsumerAdapter implements DigitalStateChangeListener {
final Consumer<Boolean> consumer;
private final DigitalState onState;

private ConsumerAdapter(Consumer<Boolean> consumer, DigitalState onState) {
protected ConsumerAdapter(Consumer<Boolean> consumer, DigitalState onState) {
this.consumer = consumer;
this.onState = onState;
}
Expand Down
12 changes: 10 additions & 2 deletions pi4j-core/src/main/java/com/pi4j/io/gpio/digital/DigitalInputBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ protected DigitalInputBase(DigitalInputConfig config, Consumer<?> onClose){
}

@Override
public DigitalState onState() {
return config().onState();
public Consumer<Boolean> addConsumer(Consumer<Boolean> listener) {
DigitalState on = config().onState();
addListener(new ConsumerAdapter(listener, on != null ? on : DigitalState.HIGH));
return listener;
}

@Override
public boolean isOn() {
DigitalState on = config().onState();
return state().equals(on != null ? on : DigitalState.HIGH);
}
}
12 changes: 10 additions & 2 deletions pi4j-core/src/main/java/com/pi4j/io/gpio/digital/DigitalOutputBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,16 @@ protected DigitalOutputBase(DigitalOutputConfig config, Consumer<?> onClose) {
}

@Override
public DigitalState onState() {
return config().onState();
public Consumer<Boolean> addConsumer(Consumer<Boolean> listener) {
DigitalState on = config().onState();
addListener(new ConsumerAdapter(listener, on != null ? on : DigitalState.HIGH));
return listener;
}

@Override
public boolean isOn() {
DigitalState on = config().onState();
return state().equals(on != null ? on : DigitalState.HIGH);
}

/**
Expand Down
Loading