|
@@ -21,13 +21,11 @@ public class XRServer {
|
|
|
}
|
|
|
|
|
|
@XRMethod(value = "rel", help = "rel")
|
|
|
- public static boolean rel(String pos, String speedS) {
|
|
|
+ public static boolean rel(int relPos, int speed) {
|
|
|
try {
|
|
|
- logger.info("rel {}", pos);
|
|
|
+ logger.info("rel {}", relPos);
|
|
|
int curPos=Main.fhm.readStatus().get().istPosition;
|
|
|
- int relPos=Integer.parseInt(pos);
|
|
|
int targetPos=curPos+relPos;
|
|
|
- int speed=Integer.parseInt(speedS);
|
|
|
logger.info("Relative by {} from {} to {} speed {}", relPos, curPos, targetPos, speed);
|
|
|
Main.fhm.bereitschaft();
|
|
|
if(!Main.fhm.readStatus().get().enabled) {
|
|
@@ -39,7 +37,6 @@ public class XRServer {
|
|
|
Main.fhm.direktAuftrag(relPos, speed, 1, true);
|
|
|
Thread.sleep(10);
|
|
|
|
|
|
-
|
|
|
while(true) {
|
|
|
boolean reached=checkPos(targetPos);
|
|
|
if(reached) {
|
|
@@ -59,13 +56,12 @@ public class XRServer {
|
|
|
}
|
|
|
|
|
|
@XRMethod(value = "abs", help = "abs")
|
|
|
- public boolean abs(String pos, String speedS) {
|
|
|
+ public boolean abs(int targetPos, int speed) {
|
|
|
try {
|
|
|
|
|
|
- int targetPos=Integer.parseInt(pos);
|
|
|
- int speed=Integer.parseInt(speedS);
|
|
|
|
|
|
- logger.info("Absolute to {} speed {}", pos, speed);
|
|
|
+
|
|
|
+ logger.info("Absolute to {} speed {}", targetPos, speed);
|
|
|
Main.fhm.bereitschaft();
|
|
|
if(!Main.fhm.readStatus().get().enabled) {
|
|
|
logger.info("Controller not enabled");
|