From b7f2db2975eddbb2031edf8c6bc98099f8ddef7c Mon Sep 17 00:00:00 2001 From: remo Date: Mon, 25 Mar 2024 16:18:23 +0100 Subject: [PATCH 1/2] reacttoJoystickImplementation --- .../bme/mit/train/controller/TrainControllerImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 56df7dc62..a7eb08d75 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -1,12 +1,14 @@ package hu.bme.mit.train.controller; import hu.bme.mit.train.interfaces.TrainController; +import hu.bme.mit.train.interfaces.TrainUserImpl; public class TrainControllerImpl implements TrainController { private int step = 0; private int referenceSpeed = 0; private int speedLimit = 0; + private TrainUserImpl trainUser = new TrainUserImpl; @Override public void followSpeed() { @@ -50,4 +52,12 @@ public void emergencyBreak(){ referenceSpeed = 0; } + public reacttoJoystick(){ + if (trainUser.joystickPosition > 0){ + referenceSpeed += 1; + } + else if (trainUser.joystickPosition < 0){ + referenceSpeed -= 1; + } + } } From 237308dfd694551d8d616720fa0b5f8868eadf7f Mon Sep 17 00:00:00 2001 From: remo Date: Mon, 25 Mar 2024 16:29:57 +0100 Subject: [PATCH 2/2] reacttoJoystickImplFix1 --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index a7eb08d75..1a7f2cba0 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -8,7 +8,7 @@ public class TrainControllerImpl implements TrainController { private int step = 0; private int referenceSpeed = 0; private int speedLimit = 0; - private TrainUserImpl trainUser = new TrainUserImpl; + private TrainUserImpl trainUser; @Override public void followSpeed() {