From b2d72e08f2225a91ab8a202c5910ab41c086d226 Mon Sep 17 00:00:00 2001
From: Ian Brandt <ian@ianbrandt.com>
Date: Sun, 3 May 2015 12:18:35 -0700
Subject: [PATCH] Renamed project to iARoC-2015.

---
 .idea/.name                               |  2 +-
 .idea/compiler.xml                        |  6 +--
 .idea/encodings.xml                       |  5 --
 .idea/gradle.xml                          |  3 +-
 .idea/misc.xml                            | 63 +++++------------------
 .idea/modules.xml                         |  5 +-
 .idea/scopes/scope_settings.xml           |  5 --
 .idea/vcs.xml                             |  3 +-
 WhiteLiner2014.iml => iARoC-2015.iml      |  5 +-
 src/org/wintrisstech/erik/iaroc/Lada.java |  2 +-
 10 files changed, 23 insertions(+), 76 deletions(-)
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/scopes/scope_settings.xml
 rename WhiteLiner2014.iml => iARoC-2015.iml (95%)

diff --git a/.idea/.name b/.idea/.name
index c54ca22..cf46042 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-WhiteLiner2014
\ No newline at end of file
+iARoC-2015
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index da84ac3..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,13 +11,12 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="1.6" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4d8ce81..747f24e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 338abca..e930905 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,57 +3,20 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>Android SDK</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 669f30b..3131055 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/WhiteLiner2014.iml" filepath="$PROJECT_DIR$/WhiteLiner2014.iml" />
+      <module fileurl="file://$PROJECT_DIR$/iARoC-2015.iml" filepath="$PROJECT_DIR$/iARoC-2015.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 275077f..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/WhiteLiner2014.iml b/iARoC-2015.iml
similarity index 95%
rename from WhiteLiner2014.iml
rename to iARoC-2015.iml
index 6b851f7..458f8aa 100644
--- a/WhiteLiner2014.iml
+++ b/iARoC-2015.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="WhiteLiner2014" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="iARoC-2015" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -77,11 +77,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="ioiolibandroid" level="project" />
     <orderEntry type="library" exported="" name="ioioirobot" level="project" />
+    <orderEntry type="library" exported="" name="ioiolibandroid" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/org/wintrisstech/erik/iaroc/Lada.java b/src/org/wintrisstech/erik/iaroc/Lada.java
index 6a88c3e..9a6a67d 100644
--- a/src/org/wintrisstech/erik/iaroc/Lada.java
+++ b/src/org/wintrisstech/erik/iaroc/Lada.java
@@ -45,7 +45,7 @@ public Lada(IOIO ioio, IRobotCreateInterface create, Dashboard dashboard)
 	}
 
 	public void initialize() throws ConnectionLostException {
-		dashboard.log("WhiteLiner2014 version 140903B");
+		dashboard.log("iARoC-2015");
 		driveDirect(wheelSpeed, wheelSpeed);
 	}