Browse Source

parse additional messages

Martin Kunz 5 years ago
parent
commit
772badf580

+ 10 - 0
src/main/java/at/acdp/urweb/sclient/SecondaryClient.java

@@ -66,6 +66,16 @@ public class SecondaryClient {
                 m.read(di, size);
                 URLog.add(m);
                 break;
+            case MessageType.SAFETY_COMPLIANCE_TOLERANCES_MESSAGE:
+                var sc=new SafetyComplianceTolerancesMessage();
+                sc.read(di, size);
+                URLog.add(sc);
+                break;
+            case MessageType.SAFETY_SETUP_BROADCAST_MESSAGE:
+                var ss=new SafetySetupBroadcastMessage();
+                ss.read(di, size);
+                URLog.add(ss);
+                break;
             default:
                 log.warn("unknown ptype: "+pType+", size: "+size);
                 byte[] pack=new byte[size-5];

+ 24 - 0
src/main/java/at/acdp/urweb/sclient/data/SafetyComplianceTolerancesMessage.java

@@ -0,0 +1,24 @@
+package at.acdp.urweb.sclient.data;
+
+import at.acdp.urweb.CountDataInputStream;
+import com.eclipsesource.json.JsonObject;
+
+import java.io.IOException;
+
+public class SafetyComplianceTolerancesMessage implements IRead, IJsonObject{
+    public String data;
+
+    @Override
+    public JsonObject toJSON() {
+        return new JsonObject()
+                .add("data", data)
+                ;
+    }
+
+    @Override
+    public void read(CountDataInputStream di, int size) throws IOException {
+        byte[] asd=new byte[size-5];
+        di.readFully(asd);
+        data=new String(asd);
+    }
+}

+ 24 - 0
src/main/java/at/acdp/urweb/sclient/data/SafetySetupBroadcastMessage.java

@@ -0,0 +1,24 @@
+package at.acdp.urweb.sclient.data;
+
+import at.acdp.urweb.CountDataInputStream;
+import com.eclipsesource.json.JsonObject;
+
+import java.io.IOException;
+
+public class SafetySetupBroadcastMessage implements IRead, IJsonObject {
+    public String data;
+
+    @Override
+    public JsonObject toJSON() {
+        return new JsonObject()
+                .add("data", data)
+                ;
+    }
+
+    @Override
+    public void read(CountDataInputStream di, int size) throws IOException {
+        byte[] asd=new byte[size-5];
+        di.readFully(asd);
+        data=new String(asd);
+    }
+}

+ 1 - 1
src/main/java/at/acdp/urweb/sclient/data/ScReadThread.java

@@ -43,7 +43,7 @@ public class ScReadThread implements Runnable {
     private void read() throws IOException {
         rde = new SecondaryClient(ip, port, urBot);
         VersionMessage vm = rde.connect();
-        log.info("Connected to: {}:{}");
+        log.info("Connected to: {}:{}", ip, port);
         while (true) {
             rde.readPackage();
         }