From 321707368f8ff78440282750d72478eb6bfd4fdb Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Fri, 25 Dec 2020 13:39:59 +0100 Subject: [PATCH] changed the IO interface --- .../com/example/aped/communication/IIO.java | 14 +++------- .../example/aped/communication/TestIO.java | 26 +++++-------------- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/APED/app/src/main/java/com/example/aped/communication/IIO.java b/APED/app/src/main/java/com/example/aped/communication/IIO.java index c327685..7b178a3 100644 --- a/APED/app/src/main/java/com/example/aped/communication/IIO.java +++ b/APED/app/src/main/java/com/example/aped/communication/IIO.java @@ -1,16 +1,8 @@ package com.example.aped.communication; public interface IIO { - /** - * - * @return Einlesewerte in Array - */ - String[][] rueckgabeAI(); - /** - * - * @return Einlesewerte in Array - */ - String rueckgabeDI(); - //DO (int); + public Object read(String deviceName); + + public Object write(String deviceName, Object value); } diff --git a/APED/app/src/main/java/com/example/aped/communication/TestIO.java b/APED/app/src/main/java/com/example/aped/communication/TestIO.java index 8c4acba..3ddfc0c 100644 --- a/APED/app/src/main/java/com/example/aped/communication/TestIO.java +++ b/APED/app/src/main/java/com/example/aped/communication/TestIO.java @@ -1,28 +1,14 @@ package com.example.aped.communication; public class TestIO implements IIO { - /** Test Klasse.*/ + @Override - public String[][] rueckgabeAI() { - String[][] AI = new String[3][3]; - /** AI[0][0]="Test"; - AI[1][1]="5.658"; - AI[1][2]="Volt"; - - AI[1][0]="Test2"; - AI[1][1]="10"; - AI[1][2]="Ohm"; - - AI[2][0]="Test3"; - AI[2][1]="9.88"; - AI[2][2]="Ampere"; - - AI[3][0]="END";*/ - return AI; + public Object read(String deviceName) { + return new String("test"); } - /** Test Klasse.*/ + @Override - public String rueckgabeDI() { - return null; + public Object write(String deviceName, Object value) { + return value; } }