From a8aa6cf83c68c07adaa9928d3e7eacee96c49a1d Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Wed, 3 Apr 2019 15:56:55 +0200
Subject: [PATCH] Expose new interface for Java and deprecate old
---
adaptors/java/src/se/lth/control/realtime/AnalogIn.java | 5 +++++
adaptors/java/src/se/lth/control/realtime/AnalogOut.java | 5 +++++
adaptors/java/src/se/lth/control/realtime/DigitalIn.java | 5 +++++
adaptors/java/src/se/lth/control/realtime/DigitalOut.java | 5 +++++
adaptors/java/src/se/lth/control/realtime/EncoderIn.java | 7 ++++++-
5 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/adaptors/java/src/se/lth/control/realtime/AnalogIn.java b/adaptors/java/src/se/lth/control/realtime/AnalogIn.java
index 3fc715f..9f4e0b4 100644
--- a/adaptors/java/src/se/lth/control/realtime/AnalogIn.java
+++ b/adaptors/java/src/se/lth/control/realtime/AnalogIn.java
@@ -35,8 +35,13 @@ public class AnalogIn extends IOChannel {
Moberg.analogInClose(index);
}
+ @Deprecated
public double get() throws IOChannelException {
return Moberg.analogIn(index);
}
+ public double read() throws IOChannelException {
+ return Moberg.analogIn(index);
+ }
+
}
diff --git a/adaptors/java/src/se/lth/control/realtime/AnalogOut.java b/adaptors/java/src/se/lth/control/realtime/AnalogOut.java
index 4310079..28372a6 100644
--- a/adaptors/java/src/se/lth/control/realtime/AnalogOut.java
+++ b/adaptors/java/src/se/lth/control/realtime/AnalogOut.java
@@ -39,8 +39,13 @@ public class AnalogOut extends IOChannel {
Moberg.analogOutClose(index);
}
+ @Deprecated
public void set(double value) throws IOChannelException {
Moberg.analogOut(index, value);
}
+ public double write(double value) throws IOChannelException {
+ return Moberg.analogOut(index, value);
+ }
+
}
diff --git a/adaptors/java/src/se/lth/control/realtime/DigitalIn.java b/adaptors/java/src/se/lth/control/realtime/DigitalIn.java
index e34e28b..90e2fcc 100644
--- a/adaptors/java/src/se/lth/control/realtime/DigitalIn.java
+++ b/adaptors/java/src/se/lth/control/realtime/DigitalIn.java
@@ -37,8 +37,13 @@ public class DigitalIn extends IOChannel {
Moberg.digitalInClose(index);
}
+ @Deprecated
public boolean get() throws IOChannelException {
return Moberg.digitalIn(index);
}
+ public boolean read() throws IOChannelException {
+ return Moberg.digitalIn(index);
+ }
+
}
diff --git a/adaptors/java/src/se/lth/control/realtime/DigitalOut.java b/adaptors/java/src/se/lth/control/realtime/DigitalOut.java
index a14f189..ff3d6ec 100644
--- a/adaptors/java/src/se/lth/control/realtime/DigitalOut.java
+++ b/adaptors/java/src/se/lth/control/realtime/DigitalOut.java
@@ -36,8 +36,13 @@ public class DigitalOut extends IOChannel {
Moberg.digitalOutClose(index);
}
+ @Deprecated
public void set(boolean value) throws IOChannelException {
Moberg.digitalOut(index, value);
}
+ public boolean write(boolean value) throws IOChannelException {
+ return Moberg.digitalOut(index, value);
+ }
+
}
diff --git a/adaptors/java/src/se/lth/control/realtime/EncoderIn.java b/adaptors/java/src/se/lth/control/realtime/EncoderIn.java
index d1f919d..a29e402 100644
--- a/adaptors/java/src/se/lth/control/realtime/EncoderIn.java
+++ b/adaptors/java/src/se/lth/control/realtime/EncoderIn.java
@@ -36,9 +36,14 @@ public class EncoderIn extends IOChannel {
protected void close() throws IOChannelException {
Moberg.encoderInClose(index);
}
-
+
+ @Deprecated
public long get() throws IOChannelException {
return Moberg.encoderIn(index);
}
+ public long read() throws IOChannelException {
+ return Moberg.encoderIn(index);
+ }
+
}
--
GitLab