From 0685066500af7ed2f4643ef0237717bf2a0a6ef1 Mon Sep 17 00:00:00 2001 From: csoti27 Date: Mon, 20 Mar 2023 16:09:24 +0100 Subject: [PATCH 1/3] harmadik feladat --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e26e034fc..23a7f7321 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,11 @@ This is a sample application for the verification laboratory. ## Getting started +Ez a 3 féle formázásom ~~sorrendben~~ +**Nem** +⋅⋅* Szoktam jó +#### Listákat készíteni + * The application is implemented in Java. * The project can be built using [Gradle](https://gradle.org/) or [Maven](https://maven.apache.org/) (currently **Maven** is preferred). * [JUnit](https://junit.org/junit5/) is used for tests. From 851302b8024f5db6c26434fbd6604e11333d4012 Mon Sep 17 00:00:00 2001 From: csoti27 Date: Mon, 20 Mar 2023 16:34:05 +0100 Subject: [PATCH 2/3] speedlimit issue fix --- .../src/main/java/hu/bme/mit/train/user/TrainUserImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java b/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java index 93d3b2e59..43dfa4214 100644 --- a/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java +++ b/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java @@ -27,5 +27,11 @@ public void overrideJoystickPosition(int joystickPosition) { this.joystickPosition = joystickPosition; controller.setJoystickPosition(joystickPosition); } + + + public void userOverwriteSpeedLimit(int joystickPosition){ + this.joystickPosition=joystickPosition; + this.controller.setSpeedLimit(joystickPosition); + } } From 2bbda6f811a2d6e422484b1c961a1e7481b411eb Mon Sep 17 00:00:00 2001 From: csoti27 Date: Mon, 20 Mar 2023 16:46:44 +0100 Subject: [PATCH 3/3] fix #1 --- .../java/hu/bme/mit/train/sensor/TrainSensorImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java b/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java index 4a640d1dd..c4c93aa96 100644 --- a/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java +++ b/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java @@ -18,12 +18,20 @@ public TrainSensorImpl(TrainController controller, TrainUser user) { @Override public int getSpeedLimit() { return speedLimit; + } + + + @Override public void overrideSpeedLimit(int speedLimit) { + int temp=0; this.speedLimit = speedLimit; controller.setSpeedLimit(speedLimit); + + + } }