X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=dsl%2Fruntime%2Fsrc%2Fnl%2Fru%2Fdes%2Fsensors%2FSensorCollector.java;h=64a26b4728a6d5e389367a03caf008d274089962;hb=8ac11d4775c780e307727b0e5dc865cf64517a59;hp=af8e87ae7d717d0036e03e8668602c54a31f47ef;hpb=ac44621696b120a5aec35edff6b7181a4aafa383;p=des2015.git 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 --- 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 nl.ru.des.LCDPrinter; public class SensorCollector implements MessageHandler{ public static final int DELAY = 200; @@ -57,32 +56,32 @@ public class SensorCollector implements MessageHandler{ 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]; - LCDPrinter.print("Light limit: " + Float.toString(DANGER_LIGHT)); + System.out.println("Light limit: " + Float.toString(DANGER_LIGHT)); 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; - LCDPrinter.print("Light limit: " + Float.toString(DANGER_LIGHT)); + System.out.println("Light limit: " + Float.toString(DANGER_LIGHT)); 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; - LCDPrinter.print("Back ultra limit: " + Float.toString(DANGER_DISTANCE_BACK)); + System.out.println("Back ultra limit: " + Float.toString(DANGER_DISTANCE_BACK)); Delay.msDelay(350); - LCDPrinter.print("Place front ultra in danger"); + System.out.println("Place front ultra in danger"); 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