Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ref speed mod #3

Merged
merged 2 commits into from
Apr 17, 2023
Merged

Ref speed mod #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
736d95b
ref speed mod
LaszloAbrok Apr 17, 2023
23ee2f0
fixed review issues
LaszloAbrok Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import hu.bme.mit.train.interfaces.TrainController;

public class TrainControllerImpl implements TrainController {
public class TrainControllerImpl implements TrainController, Runnable {

private int step = 0;
private int referenceSpeed = 0;
Expand Down Expand Up @@ -45,11 +45,24 @@ private void enforceSpeedLimit() {

@Override
public void setJoystickPosition(int joystickPosition) {
this.step = joystickPosition;
try {
this.step = joystickPosition;
Thread.sleep(200);
} catch (Exception e) {
System.out.println("thread exception");
}

}

@Override
public void emergencyBrake(){
this.referenceSpeed=0;
}


public void run(){
while(true){
followSpeed();
}
}
}
2 changes: 1 addition & 1 deletion ...ntroller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/cloud/Desktop/mit2/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java
/home/cloud/Desktop/mit_3/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java
6 changes: 3 additions & 3 deletions ...terfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java
/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java
/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java
/home/cloud/Desktop/mit_3/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java
/home/cloud/Desktop/mit_3/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java
/home/cloud/Desktop/mit_3/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java
2 changes: 1 addition & 1 deletion ...n-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/cloud/Desktop/mit2/base/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java
/home/cloud/Desktop/mit_3/base/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java
2 changes: 1 addition & 1 deletion .../target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/cloud/Desktop/mit2/base/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java
/home/cloud/Desktop/mit_3/base/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java
8 changes: 4 additions & 4 deletions train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="1" failures="0" name="hu.bme.mit.train.sensor.TrainSensorTest" time="0.011" errors="0" skipped="0">
<testsuite tests="1" failures="0" name="hu.bme.mit.train.sensor.TrainSensorTest" time="0.003" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="java.vm.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Desktop/mit2/base"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Desktop/mit_3/base"/>
<property name="java.vm.vendor" value="Ubuntu"/>
<property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
Expand All @@ -14,7 +14,7 @@
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/cloud/Desktop/mit2/base"/>
<property name="user.dir" value="/home/cloud/Desktop/mit_3/base"/>
<property name="java.vm.compressedOopsMode" value="32-bit"/>
<property name="java.runtime.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
Expand Down Expand Up @@ -60,5 +60,5 @@
<property name="sun.cpu.endian" value="little"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="hu.bme.mit.train.sensor.TrainSensorTest" name="ThisIsAnExampleTestStub" time="0.011"/>
<testcase classname="hu.bme.mit.train.sensor.TrainSensorTest" name="ThisIsAnExampleTestStub" time="0.003"/>
</testsuite>
2 changes: 1 addition & 1 deletion train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: hu.bme.mit.train.sensor.TrainSensorTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 sec
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.169 sec
1 change: 1 addition & 0 deletions ...system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
hu/bme/mit/train/system/TrainSystem.class
hu/bme/mit/train/system/Tachograph.class
2 changes: 2 additions & 0 deletions ...arget/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hu/bme/mit/train/system/TachographTest.class
hu/bme/mit/train/system/TrainSystemTest.class
8 changes: 4 additions & 4 deletions train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="1" failures="0" name="hu.bme.mit.train.system.TachographTest" time="0.045" errors="0" skipped="0">
<testsuite tests="1" failures="0" name="hu.bme.mit.train.system.TachographTest" time="0.082" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="java.vm.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Desktop/mit2/base"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Desktop/mit_3/base"/>
<property name="java.vm.vendor" value="Ubuntu"/>
<property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="path.separator" value=":"/>
Expand All @@ -13,7 +13,7 @@
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.os.patch.level" value="unknown"/>
<property name="user.dir" value="/home/cloud/Desktop/mit2/base"/>
<property name="user.dir" value="/home/cloud/Desktop/mit_3/base"/>
<property name="java.vm.compressedOopsMode" value="32-bit"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="java.runtime.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
Expand Down Expand Up @@ -60,5 +60,5 @@
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="hu.bme.mit.train.system.TachographTest" name="EntryTest" time="0.045"/>
<testcase classname="hu.bme.mit.train.system.TachographTest" name="EntryTest" time="0.082"/>
</testsuite>
12 changes: 6 additions & 6 deletions train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="3" failures="0" name="hu.bme.mit.train.system.TrainSystemTest" time="0.003" errors="0" skipped="0">
<testsuite tests="3" failures="0" name="hu.bme.mit.train.system.TrainSystemTest" time="0.806" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="java.vm.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Desktop/mit2/base"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Desktop/mit_3/base"/>
<property name="java.vm.vendor" value="Ubuntu"/>
<property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="path.separator" value=":"/>
Expand All @@ -13,7 +13,7 @@
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.os.patch.level" value="unknown"/>
<property name="user.dir" value="/home/cloud/Desktop/mit2/base"/>
<property name="user.dir" value="/home/cloud/Desktop/mit_3/base"/>
<property name="java.vm.compressedOopsMode" value="32-bit"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="java.runtime.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
Expand Down Expand Up @@ -60,7 +60,7 @@
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero" time="0.001"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="NewTest" time="0.001"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPosition_IncreasesReferenceSpeed" time="0.001"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero" time="0.404"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="NewTest" time="0.201"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPosition_IncreasesReferenceSpeed" time="0.201"/>
</testsuite>
2 changes: 1 addition & 1 deletion train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: hu.bme.mit.train.system.TachographTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.087 sec
2 changes: 1 addition & 1 deletion train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: hu.bme.mit.train.system.TrainSystemTest
-------------------------------------------------------------------------------
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.113 sec
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.955 sec
2 changes: 1 addition & 1 deletion train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/cloud/Desktop/mit2/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java
/home/cloud/Desktop/mit_3/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java