minor refactorings

This commit is contained in:
hneemann 2020-07-22 09:48:52 +02:00
parent 72bd86dd43
commit b0c580b44f
2 changed files with 7 additions and 10 deletions

View File

@ -11,7 +11,7 @@ package de.neemann.digital.core;
public interface ModelStateObserver { public interface ModelStateObserver {
/** /**
* called if a event was detected. * called to propagate an event
* *
* @param event the event * @param event the event
*/ */

View File

@ -95,14 +95,11 @@ public class RealTimeClock implements ModelStateObserverTyped {
frequencyCalculator = new FrequencyCalculator(status, frequency); frequencyCalculator = new FrequencyCalculator(status, frequency);
else else
frequencyCalculator = null; frequencyCalculator = null;
timer = executor.scheduleAtFixedRate(new Runnable() { timer = executor.scheduleAtFixedRate(() -> {
@Override model.modify(() -> output.setValue(1 - output.getValue()));
public void run() { model.doStep();
model.modify(() -> output.setValue(1 - output.getValue())); if (frequencyCalculator != null)
model.doStep(); frequencyCalculator.calc();
if (frequencyCalculator != null)
frequencyCalculator.calc();
}
}, delay, delay, TimeUnit.MICROSECONDS); }, delay, delay, TimeUnit.MICROSECONDS);
} }
@ -142,7 +139,7 @@ public class RealTimeClock implements ModelStateObserverTyped {
private static final class FrequencyCalculator { private static final class FrequencyCalculator {
private final StatusInterface status; private final StatusInterface status;
private long minCounter; private final long minCounter;
private long checkCounter; private long checkCounter;
private int counter; private int counter;
private long time; private long time;