repositories
/
des2015.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
final commit
[des2015.git]
/
dsl
/
runtime
/
src
/
nl
/
ru
/
des
/
sensors
/
SensorCollector.java
diff --git
a/dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
b/dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
index
af8e87a
..
64a26b4
100644
(file)
--- a/
dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
+++ b/
dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
@@
-7,7
+7,6
@@
import lejos.hardware.Button;
import lejos.hardware.sensor.EV3GyroSensor;
import lejos.robotics.SampleProvider;
import lejos.utility.Delay;
import lejos.hardware.sensor.EV3GyroSensor;
import lejos.robotics.SampleProvider;
import lejos.utility.Delay;
-import nl.ru.des.LCDPrinter;
public class SensorCollector implements MessageHandler{
public static final int DELAY = 200;
public class SensorCollector implements MessageHandler{
public static final int DELAY = 200;
@@
-57,32
+56,32
@@
public class SensorCollector implements MessageHandler{
public void calibrate() {
public void calibrate() {
-
LCDPrinter.print
("Put left light on Blue");
+
System.out.println
("Put left light on Blue");
Button.waitForAnyEvent();
leftLight();
DANGER_LIGHT = leftLightSamples[0];
Button.waitForAnyEvent();
leftLight();
DANGER_LIGHT = leftLightSamples[0];
-
LCDPrinter.print
("Light limit: " + Float.toString(DANGER_LIGHT));
+
System.out.println
("Light limit: " + Float.toString(DANGER_LIGHT));
Delay.msDelay(350);
Delay.msDelay(350);
-
LCDPrinter.print
("Put left light on Black");
+
System.out.println
("Put left light on Black");
Button.waitForAnyEvent();
leftLight();
DANGER_LIGHT = (leftLightSamples[0]+DANGER_LIGHT)/2.0f;
Button.waitForAnyEvent();
leftLight();
DANGER_LIGHT = (leftLightSamples[0]+DANGER_LIGHT)/2.0f;
-
LCDPrinter.print
("Light limit: " + Float.toString(DANGER_LIGHT));
+
System.out.println
("Light limit: " + Float.toString(DANGER_LIGHT));
Delay.msDelay(350);
Delay.msDelay(350);
-
LCDPrinter.print
("Place back ultra safe");
+
System.out.println
("Place back ultra safe");
Button.waitForAnyEvent();
backDistance();
DANGER_DISTANCE_BACK = ultraSamples[0] + 0.05f;
Button.waitForAnyEvent();
backDistance();
DANGER_DISTANCE_BACK = ultraSamples[0] + 0.05f;
-
LCDPrinter.print
("Back ultra limit: " + Float.toString(DANGER_DISTANCE_BACK));
+
System.out.println
("Back ultra limit: " + Float.toString(DANGER_DISTANCE_BACK));
Delay.msDelay(350);
Delay.msDelay(350);
-
LCDPrinter.print
("Place front ultra in danger");
+
System.out.println
("Place front ultra in danger");
Button.waitForAnyEvent();
DANGER_DISTANCE_FRONT = frontUltra;
Button.waitForAnyEvent();
DANGER_DISTANCE_FRONT = frontUltra;
-
LCDPrinter.print
("Calibration done");
-
LCDPrinter.print
("Front ultra limit: " + Float.toString(DANGER_DISTANCE_FRONT));
+
System.out.println
("Calibration done");
+
System.out.println
("Front ultra limit: " + Float.toString(DANGER_DISTANCE_FRONT));
}
//Local sensors
}
//Local sensors