final ev3 stuff

[des2015.git] / mart / ev3 / ex1 / nl / ru / des / Main.java

diff --git a/mart/ev3/ex1/nl/ru/des/Main.java b/mart/ev3/ex1/nl/ru/des/Main.java
index 805ff02..7416dd7 100644 (file)
--- a/mart/ev3/ex1/nl/ru/des/Main.java
+++ b/mart/ev3/ex1/nl/ru/des/Main.java
@@ -14,8 +14,21 @@ import lejos.robotics.subsumption.Behavior;
 import lejos.utility.Delay;
 
 public class Main {
+       public static Arbitrator arbitrator;
 
        public static void main(String[] args) {
+               String[] sounds = new String[]{
+                               "bootaudio.wav",
+                               "bootsystem.wav",
+                               "bounds.wav",
+                               "bump.wav",
+                               "calibrate.wav",
+                               "detect.wav",
+                               "takeoff.wav",
+                               "rick.wav"
+               };
+
+               
                EV3 brick = LocalEV3.get();
                LCDPrinter lcdprinter = new LCDPrinter(brick.getGraphicsLCD(), Font.getSmallFont());
                LCDPrinter.print("Starting up systems");
@@ -24,8 +37,9 @@ public class Main {
                LCDPrinter.print("Loading audio...");
                Audio audio = brick.getAudio();
                WavPlayer wavplayer = new WavPlayer(audio);
+               wavplayer.preLoad(sounds);
                wavplayer.start();
-               WavPlayer.playWav("boot.wav");
+               WavPlayer.playWav("bootaudio.wav");
                
                LCDPrinter.print("Loading keylistener...");
                brick.getKey("Escape").addKeyListener(new ButtonListener());
@@ -59,12 +73,12 @@ public class Main {
                WavPlayer.playWav("calibrate.wav");
                
                LCDPrinter.print("Initializing arbitrator...");
-               Arbitrator arb = new Arbitrator(behaviorList);
+               Main.arbitrator = new Arbitrator(behaviorList);
                
                WavPlayer.playWav("takeoff.wav");
-               Delay.msDelay(1850);
+               Delay.msDelay(2000);
                LCDPrinter.print("Takeoff!");
-               arb.start();
+               Main.arbitrator.start();
                lightSensor.close();
                ultraSensor.close();
        }