Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .idea/encodings.xml

This file was deleted.

4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
buildscript {
repositories {
mavenCentral()
flatDir {
dirs 'lib' //this way we can find the .aar file in libs folder
}
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.2'
}
}
apply plugin: 'com.android.application'



dependencies {
compile fileTree(dir: 'lib', include: '*.jar')
}
Expand Down
9 changes: 5 additions & 4 deletions iARoC-2015.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
Expand Down Expand Up @@ -76,11 +77,11 @@
<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="ioioirobot" level="project" />
<orderEntry type="library" exported="" name="ioiolibandroid" level="project" />
<orderEntry type="library" exported="" name="ioioirobot" level="project" />
</component>
</module>

</module>
Binary file modified lib/ioioirobot.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions src/org/jointheleague/iaroc/Brain.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import ioio.lib.api.IOIO;
import ioio.lib.api.exception.ConnectionLostException;
import org.wintrisstech.irobot.ioio.IRobotCreateAdapter;
import org.wintrisstech.irobot.ioio.IRobotCreateInterface;
import org.jointheleague.erik.irobot.IRobotCreateAdapter;
import org.jointheleague.erik.irobot.IRobotCreateInterface;
import org.jointheleague.iaroc.sensors.UltraSonicSensors;

public class Brain extends IRobotCreateAdapter {
Expand Down
4 changes: 2 additions & 2 deletions src/org/jointheleague/iaroc/Dashboard.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import java.util.Locale;

import org.wintrisstech.irobot.ioio.IRobotCreateInterface;
import org.wintrisstech.irobot.ioio.SimpleIRobotCreate;
import org.jointheleague.erik.irobot.IRobotCreateInterface;
import org.jointheleague.erik.irobot.SimpleIRobotCreate;

import android.content.Intent;
import android.content.pm.ActivityInfo;
Expand Down