Skip to content

Commit 835f4c1

Browse files
chriswschrisws
committed
IOIO: changed the package to "ioio.smallbasic"
1 parent 72614d4 commit 835f4c1

33 files changed

+328
-122
lines changed

‎ioio/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Download the GNU Public License (GPL) from www.gnu.org
66
#
77
# export LD_LIBRARY_PATH=/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/server:$LD_LIBRARY_PATH
8-
# javap -s -p -cp target/ioio-1.0.jar 'net.sourceforge.smallbasic.ioio.AnalogInputImpl'
8+
# javap -s -p -cp target/ioio-1.0.jar 'ioio.smallbasic.AnalogInputImpl'
99
#
1010

1111
sbasic=sbasic

‎ioio/ioio/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
sourceSets {
88
main {
99
java {
10-
exclude 'ioio/lib/pc/**'
10+
exclude 'ioio/smallbasic/pc/**'
1111
}
1212
}
1313
}

‎ioio/ioio/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<artifactId>maven-compiler-plugin</artifactId>
3030
<configuration>
3131
<excludes>
32-
<exclude>ioio/lib/android/**</exclude>
32+
<exclude>ioio/smallbasic/android/**</exclude>
3333
</excludes>
3434
</configuration>
3535
</plugin>

‎ioio/ioio/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="net.sourceforge.smallbasic.ioio" >
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<uses-feature android:name="android.hardware.usb.accessory" android:required="false" />
54
</manifest>

‎ioio/ioio/src/main/java/ioio/lib/spi/LogImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void write(int level, String tag, String message) {
4646
private static ILogger getAndroidLogger() {
4747
ILogger result;
4848
try {
49-
result = (ILogger) Class.forName("ioio.lib.android.AndroidLogger").newInstance();
49+
result = (ILogger) Class.forName("ioio.smallbasic.android.AndroidLogger").newInstance();
5050
}
5151
catch (IllegalAccessException | InstantiationException | ClassNotFoundException e) {
5252
result = null;

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/AnalogInputImpl.java renamed to ioio/ioio/src/main/java/ioio/smallbasic/AnalogInputImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sourceforge.smallbasic.ioio;
1+
package ioio.smallbasic;
22

33
import ioio.lib.api.AnalogInput;
44
import ioio.lib.api.IOIO;

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/CapSenseImpl.java renamed to ioio/ioio/src/main/java/ioio/smallbasic/CapSenseImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sourceforge.smallbasic.ioio;
1+
package ioio.smallbasic;
22

33
import ioio.lib.api.CapSense;
44
import ioio.lib.api.IOIO;

‎ioio/ioio/src/main/java/ioio/smallbasic/ConnectionController.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package ioio.smallbasic;
2+
3+
import ioio.lib.util.IOIOBaseApplicationHelper;
4+
import ioio.lib.util.IOIOConnectionManager;
5+
import ioio.lib.util.IOIOConnectionRegistry;
6+
import ioio.lib.util.IOIOLooperProvider;
7+
8+
public class ConnectionController extends IOIOBaseApplicationHelper {
9+
private final IOIOConnectionManager manager = new IOIOConnectionManager(this);
10+
private static final boolean isAndroid;
11+
private static final String ANDROID_BOOTSTRAP = "ioio.smallbasic.android.AccessoryConnectionBootstrap";
12+
private static final String PERMISSION_MANAGER = "ioio.smallbasic.android.AccessoryPermissionManager";
13+
private static final String DESKTOP_BOOTSTRAP = "ioio.smallbasic.pc.SerialPortIOIOConnectionBootstrap";
14+
15+
static {
16+
isAndroid = getIsAndroidBuild();
17+
if (isAndroid) {
18+
IOIOConnectionRegistry.addBootstraps(new String[] { ANDROID_BOOTSTRAP });
19+
} else {
20+
IOIOConnectionRegistry.addBootstraps(new String[] { DESKTOP_BOOTSTRAP });
21+
}
22+
}
23+
24+
public ConnectionController(IOIOLooperProvider provider) {
25+
super(provider);
26+
}
27+
28+
public void start() {
29+
if (isAndroid) {
30+
validateAccessoryPermission();
31+
}
32+
//manager.start();
33+
}
34+
35+
public void stop() {
36+
manager.stop();
37+
}
38+
39+
private static boolean getIsAndroidBuild() {
40+
boolean result;
41+
try {
42+
Class.forName(ANDROID_BOOTSTRAP);
43+
result = true;
44+
} catch (ClassNotFoundException e) {
45+
result = false;
46+
}
47+
return result;
48+
}
49+
50+
private static void validateAccessoryPermission() {
51+
try {
52+
Class.forName(PERMISSION_MANAGER).newInstance();
53+
}
54+
catch (Exception e) {
55+
throw new IOIOException(e.toString());
56+
}
57+
}
58+
}

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/Consumer.java renamed to ioio/ioio/src/main/java/ioio/smallbasic/Consumer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sourceforge.smallbasic.ioio;
1+
package ioio.smallbasic;
22

33
import ioio.lib.api.exception.ConnectionLostException;
44
import ioio.lib.api.exception.IncompatibilityException;

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/DigitalInputImpl.java renamed to ioio/ioio/src/main/java/ioio/smallbasic/DigitalInputImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sourceforge.smallbasic.ioio;
1+
package ioio.smallbasic;
22

33
import java.util.concurrent.atomic.AtomicBoolean;
44

0 commit comments

Comments
 (0)