diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2caec4f..10dad11 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,8 +3,10 @@ - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 677ab0f..823120d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + @@ -56,5 +56,4 @@ - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index a804323..669f30b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/WhiteLiner2015.iml b/WhiteLiner2014.iml similarity index 93% rename from WhiteLiner2015.iml rename to WhiteLiner2014.iml index 395fb56..d92fc3e 100644 --- a/WhiteLiner2015.iml +++ b/WhiteLiner2014.iml @@ -1,24 +1,25 @@ - + + + + + - - - - @@ -78,10 +79,9 @@ - + - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2eae697..df25441 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,10 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.2.2' } } -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { compile fileTree(dir: 'libs', include: '*.jar') @@ -15,8 +15,8 @@ dependencies { } android { - compileSdkVersion 19 - buildToolsVersion '21.0.2' + compileSdkVersion 22 + buildToolsVersion '22.0.1' sourceSets { main { diff --git a/src/org/wintrisstech/erik/iaroc/Lada.java b/src/org/wintrisstech/erik/iaroc/Lada.java index ab386d5..6a88c3e 100644 --- a/src/org/wintrisstech/erik/iaroc/Lada.java +++ b/src/org/wintrisstech/erik/iaroc/Lada.java @@ -12,6 +12,8 @@ import org.wintrisstech.irobot.ioio.IRobotCreateInterface; import org.wintrisstech.sensors.UltraSonicSensors; +import java.util.Random; + /** * A Lada is an implementation of the IRobotCreateInterface, inspired by Vic's * awesome API. It is entirely event driven. @@ -19,6 +21,7 @@ */ public class Lada extends IRobotCreateAdapter { private final Dashboard dashboard; + Random r = new Random(); public UltraSonicSensors sonar; private boolean firstPass = true;; private int commandAzimuth;