Merge pull request #22 from intel-iot-devkit/bjbeare

Split Driver Library into drivers and support

Author: Bruce j Beare

README.md

@@ -41,7 +41,7 @@ Importing UPM Android studio projects
    ````
    dependencies {
        compile 'io.mraa.at.upm:upm_jhd1313m1:1.1.0'
-       compile project(':driverlibrary')
+       compile project(':driversupport')
        provided 'com.google.android.things:androidthings:0.3-devpreview'
    }
     ````

accel_on_lcd/build.gradle

@@ -44,6 +44,7 @@ android {
 
 dependencies {
     compile 'io.mraa.at.upm:upm_jhd1313m1:1.1.0'
+    compile project(':driversupport')
     compile project(':driverlibrary')
     provided 'com.google.android.things:androidthings:0.3-devpreview'
 }

accel_on_lcd/src/main/java/com/example/upm/androidthings/driversamples/DispAccelActivity.java

@@ -26,7 +26,7 @@
 import android.hardware.SensorManager;
 
 import com.example.upm.androidthings.driverlibrary.Mma7660AccelerometerDriver;
-import com.example.upm.androidthings.driverlibrary.BoardDefaults;
+import com.example.upm.androidthings.driversupport.BoardDefaults;
 import mraa.mraa;
 
 import java.io.IOException;

bme280/build.gradle

@@ -29,6 +29,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':driverlibrary')
+    compile project(':driversupport')
     compile 'io.mraa.at.upm:upm_bmp280:1.2.0'
 }

bme280/src/main/java/com/example/upm/androidthings/driversamples/BMETempActivity.java

@@ -5,7 +5,7 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.example.upm.androidthings.driverlibrary.BoardDefaults;
+import com.example.upm.androidthings.driversupport.BoardDefaults;
 import mraa.mraa;
 
 public class BMETempActivity extends Activity {

driverlibrary/README.md

@@ -6,16 +6,8 @@ The files in this library are gathered here for convenience... they can be copie
 the examples or split into seperate libraries as desired.
 
 
-BoardDefaults.java
-------------------
-This code determines the SOM and carrier board that is being used based on the board information
-provided by the system and the characteristics of the board (Edison Arduino has a GPIO expander).
-
-Support for additonal SOMs and carrier boards can easily be added to this file.
-
-
 Mma7660AccelerometerDriver.java
 -------------------------------
 This code is a class that can be used to register with the Android Things sensor manager. It
 provides an interface between the sensor manager and UPM (and thus the desired sensor). Sensors of
-many types can be interfaced in this way with the sensor manager.
+many types can be interfaced in this way with the sensor manager.

driverlibrary/src/main/res/values/strings.xml

@@ -17,6 +17,4 @@
 
 <resources>
     <string name="app_name">driverlibrary</string>
-
-    <string name="GPIO_Edison_Arduino">IO0</string>
 </resources>

driversupport/.gitignore

@@ -0,0 +1 @@
+/build

driversupport/README.md

@@ -0,0 +1,6 @@
+BoardDefaults.java
+------------------
+This code determines the SOM and carrier board that is being used based on the board information
+provided by the system and the characteristics of the board (Edison Arduino has a GPIO expander).
+
+Support for additonal SOMs and carrier boards can easily be added to this file.

driversupport/build.gradle

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2017 Intel Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions{
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'io.mraa.at:mraa:1.6.1'
+    provided 'com.google.android.things:androidthings:0.3-devpreview'
+}