diff --git a/src/org/hwo/pulscounter/Application.java b/src/org/hwo/pulscounter/Application.java index 00641fe..220f1f1 100644 --- a/src/org/hwo/pulscounter/Application.java +++ b/src/org/hwo/pulscounter/Application.java @@ -11,7 +11,6 @@ public class Application { Logging.Init(args, "synololog.log"); PulsCounterApplication application = new PulsCounterApplication(args); - log(LogLevel.INFO,"Application initialized, starting up user interface"); diff --git a/src/org/hwo/pulscounter/PulsCounterApplication.java b/src/org/hwo/pulscounter/PulsCounterApplication.java index 0d1eaad..1ce2a6a 100644 --- a/src/org/hwo/pulscounter/PulsCounterApplication.java +++ b/src/org/hwo/pulscounter/PulsCounterApplication.java @@ -259,11 +259,11 @@ public class PulsCounterApplication implements ServiceLinkListener{ waitUiFinished(); - ShutdownNotification sn = new ShutdownNotification(); - if (Component.class.isInstance(ui)){ - sn.setLocationRelativeTo((Component)ui); - } - sn.setVisible(true); +// ShutdownNotification sn = new ShutdownNotification(); +// if (Component.class.isInstance(ui)){ +// sn.setLocationRelativeTo((Component)ui); +// } +// sn.setVisible(true); try { @@ -273,7 +273,7 @@ public class PulsCounterApplication implements ServiceLinkListener{ log(e); } - sn.setVisible(false); +// sn.setVisible(false); } private void initialize(){ diff --git a/src/org/hwo/pulscounter/device/IDeviceConnector.java b/src/org/hwo/pulscounter/device/IDeviceConnector.java index 1483c53..98a636f 100644 --- a/src/org/hwo/pulscounter/device/IDeviceConnector.java +++ b/src/org/hwo/pulscounter/device/IDeviceConnector.java @@ -77,4 +77,6 @@ public interface IDeviceConnector { public void shutdown(); + public void checkRealTimeClock(); + } diff --git a/src/org/hwo/pulscounter/device/SimpleLinkDeviceConnector.java b/src/org/hwo/pulscounter/device/SimpleLinkDeviceConnector.java index aeeb2cd..95dc6ba 100644 --- a/src/org/hwo/pulscounter/device/SimpleLinkDeviceConnector.java +++ b/src/org/hwo/pulscounter/device/SimpleLinkDeviceConnector.java @@ -118,6 +118,8 @@ public class SimpleLinkDeviceConnector implements IDeviceConnector { public int[] getCounters() { checkOpen(); + checkRealTimeClock(); + try { return ArrayHelper.unbox(this.simpleLink.readInt(0x0600,32)); } catch (ServiceLinkException | IOException e){ @@ -734,6 +736,8 @@ public class SimpleLinkDeviceConnector implements IDeviceConnector { Calendar calendar = Calendar.getInstance(); try { + checkOpen(); + Integer deviceTime = simpleLink.readInt(0x001C); Long currentTime = (System.currentTimeMillis()/1000); diff --git a/src/org/hwo/pulscounter/device/SimulatedCounter.java b/src/org/hwo/pulscounter/device/SimulatedCounter.java index ca788cf..933155c 100644 --- a/src/org/hwo/pulscounter/device/SimulatedCounter.java +++ b/src/org/hwo/pulscounter/device/SimulatedCounter.java @@ -303,4 +303,8 @@ public class SimulatedCounter implements IDeviceConnector { @Override public void shutdown() { } + + @Override + public void checkRealTimeClock() { + } } diff --git a/src/org/hwo/pulscounter/ui/BatchRunner.java b/src/org/hwo/pulscounter/ui/BatchRunner.java index 278a765..8812ab0 100644 --- a/src/org/hwo/pulscounter/ui/BatchRunner.java +++ b/src/org/hwo/pulscounter/ui/BatchRunner.java @@ -26,6 +26,7 @@ public class BatchRunner implements PulsCounterApplicationListener{ } public void run(){ + pulsCounterApplication.getInterfaces().get(0).checkRealTimeClock(); for (String cmd: pulsCounterApplication.getBatchCommands()){ String[] tokens = cmd.split(":");