Progress

hereon-wpi · Apr 12, 2019 · 81dfdb8 · 81dfdb8
1 parent d870e3f
commit 81dfdb8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/StatusServer.iml b/StatusServer.iml
@@ -33,7 +33,7 @@
     <orderEntry type="library" name="Maven: org.tango:ezTangORB:2.0.11" level="project" />
     <orderEntry type="library" name="Maven: org.javatuples:javatuples:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
-    <orderEntry type="library" name="Maven: hzg.wpn:utils:16" level="project" />
+    <orderEntry type="library" name="Maven: hzg.wpn:utils:18" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.security:xml-security-impl:1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.tango-controls:JTangoServer:9.5.10-hzg.9" level="project" />

diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>de.hzg.wpi.tango</groupId>
                 <artifactId>tango-server-bom</artifactId>
-                <version>15</version>
+                <version>17</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/src/main/java/wpn/hdri/ss/tango/StatusServer2.java b/src/main/java/wpn/hdri/ss/tango/StatusServer2.java
@@ -20,10 +20,7 @@
 import org.tango.client.ez.data.type.TangoDataType;
 import org.tango.client.ez.data.type.TangoDataTypes;
 import org.tango.client.ez.data.type.UnknownTangoDataType;
-import org.tango.server.InvocationContext;
-import org.tango.server.ServerManager;
-import org.tango.server.ServerManagerUtils;
-import org.tango.server.StateMachineBehavior;
+import org.tango.server.*;
 import org.tango.server.annotation.Attribute;
 import org.tango.server.annotation.*;
 import org.tango.server.attribute.AttributeConfiguration;
@@ -78,27 +75,29 @@ public void setDynamicManager(DynamicManager manager) {
         this.dynamicManager = manager;
     }
 
-    @State
+    @State(isPolled = true)
     private DeviceState state;
 
     public DeviceState getState() {
         return state;
     }
 
+    @Status(isPolled = true)
+    private String status;
+
     public void setState(DeviceState state) {
         this.state = state;
+        new ChangeEventPusher<>("State", state, deviceManager).run();
     }
 
-    @Status
-    private String status;
-
 
     public String getStatus() {
         return status;
     }
 
     public void setStatus(String status) {
         this.status = status;
+        new ChangeEventPusher<>("Status", status, deviceManager).run();
     }
 
 
@@ -240,9 +239,10 @@ public PipeValue getPipe(){
         long lastTimestamp = ctx.lastTimestamp;
         ctx.lastTimestamp = System.currentTimeMillis();
 
-        return new PipeValue(
+        PipeValue value = new PipeValue(
                 (PipeBlob) OutputType.PIPE.toType(
                         engine.getStorage().getAllRecords().getRange(lastTimestamp), ctx));
+        return value;
     }
 
     @Command