diff --git a/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/BoardDefaults.java b/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/BoardDefaults.java index 2573572..ffd830f 100644 --- a/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/BoardDefaults.java +++ b/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/BoardDefaults.java @@ -19,6 +19,7 @@ import android.os.Build; import android.util.Log; + @SuppressWarnings("WeakerAccess") public class BoardDefaults { private static final String TAG = BoardDefaults.class.getSimpleName(); diff --git a/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/Ds3231Receiver.java b/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/Ds3231Receiver.java index 04a4ea7..2467c3c 100644 --- a/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/Ds3231Receiver.java +++ b/driver-ds3231-receiver/src/main/java/com/leinardi/android/things/driver/ds3231/receiver/Ds3231Receiver.java @@ -60,7 +60,7 @@ private void handleBootComplete(Context context) { // Otherwise, set the DS3231 using the system time if the system time appears sane if (isSaneTimestamp(ds3231Timestamp)) { Log.i(TAG, "Setting system clock using DS3231"); - TimeManager timeManager = new TimeManager(); + TimeManager timeManager = TimeManager.getInstance(); timeManager.setTime(ds3231Timestamp); // Re-enable NTP updates. The call to setTime() disables them automatically, diff --git a/driver-ds3231/build.gradle b/driver-ds3231/build.gradle index bf956a5..dc6907b 100644 --- a/driver-ds3231/build.gradle +++ b/driver-ds3231/build.gradle @@ -14,6 +14,7 @@ * limitations under the License. */ + apply plugin: 'com.android.library' apply from: rootProject.file('checkstyle.gradle') diff --git a/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231.java b/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231.java index 0b234e1..ac657fe 100644 --- a/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231.java +++ b/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231.java @@ -21,7 +21,7 @@ import android.util.Log; import com.google.android.things.pio.I2cDevice; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import java.io.Closeable; import java.io.IOException; @@ -224,7 +224,7 @@ public Ds3231(String i2cName) throws IOException { * @throws IOException */ public Ds3231(String i2cName, int i2cAddress) throws IOException { - I2cDevice device = new PeripheralManagerService().openI2cDevice(i2cName, i2cAddress); + I2cDevice device = PeripheralManager.getInstance().openI2cDevice(i2cName, i2cAddress); try { connect(device); } catch (IOException | RuntimeException e) { diff --git a/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231SensorDriver.java b/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231SensorDriver.java index 6b1b54e..9314900 100644 --- a/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231SensorDriver.java +++ b/driver-ds3231/src/main/java/com/leinardi/android/things/driver/ds3231/Ds3231SensorDriver.java @@ -19,9 +19,9 @@ import android.hardware.Sensor; import com.google.android.things.userdriver.UserDriverManager; -import com.google.android.things.userdriver.UserSensor; -import com.google.android.things.userdriver.UserSensorDriver; -import com.google.android.things.userdriver.UserSensorReading; +import com.google.android.things.userdriver.sensor.UserSensor; +import com.google.android.things.userdriver.sensor.UserSensorDriver; +import com.google.android.things.userdriver.sensor.UserSensorReading; import java.io.IOException; import java.util.UUID; @@ -96,7 +96,7 @@ public void registerTemperatureSensor() { if (mTemperatureUserDriver == null) { mTemperatureUserDriver = new TemperatureUserDriver(); - UserDriverManager.getManager().registerSensor(mTemperatureUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mTemperatureUserDriver.getUserSensor()); } } @@ -105,12 +105,12 @@ public void registerTemperatureSensor() { */ public void unregisterTemperatureSensor() { if (mTemperatureUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mTemperatureUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mTemperatureUserDriver.getUserSensor()); mTemperatureUserDriver = null; } } - private class TemperatureUserDriver extends UserSensorDriver { + private class TemperatureUserDriver implements UserSensorDriver { private UserSensor mUserSensor; private UserSensor getUserSensor() { diff --git a/driver-epaperdriverhat/src/main/java/com/leinardi/android/things/driver/epaperdriverhat/Epd.java b/driver-epaperdriverhat/src/main/java/com/leinardi/android/things/driver/epaperdriverhat/Epd.java index 7ef7966..3a1581d 100644 --- a/driver-epaperdriverhat/src/main/java/com/leinardi/android/things/driver/epaperdriverhat/Epd.java +++ b/driver-epaperdriverhat/src/main/java/com/leinardi/android/things/driver/epaperdriverhat/Epd.java @@ -17,7 +17,7 @@ package com.leinardi.android.things.driver.epaperdriverhat; import com.google.android.things.pio.Gpio; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import com.google.android.things.pio.SpiDevice; import java.io.Closeable; @@ -60,7 +60,7 @@ public Epd() throws IOException { } public Epd(String spiBusPort, String resetPin, String dataCommandPin, String busyPin) throws IOException { - PeripheralManagerService pioService = new PeripheralManagerService(); + PeripheralManager pioService = PeripheralManager.getInstance(); mSpiDevice = pioService.openSpiDevice(spiBusPort); mResetPin = pioService.openGpio(resetPin); mDataCommandPin = pioService.openGpio(dataCommandPin); diff --git a/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04.java b/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04.java index 867552c..8309096 100644 --- a/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04.java +++ b/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04.java @@ -21,7 +21,7 @@ import android.util.Log; import com.google.android.things.pio.Gpio; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import java.io.Closeable; import java.io.IOException; @@ -56,7 +56,7 @@ public class Hcsr04 implements Closeable { * @throws IOException */ public Hcsr04(String trigPin, String echoPin) throws IOException { - PeripheralManagerService pioService = new PeripheralManagerService(); + PeripheralManager pioService = PeripheralManager.getInstance(); Gpio trigGpio = pioService.openGpio(trigPin); Gpio echoGpio = pioService.openGpio(echoPin); try { diff --git a/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04SensorDriver.java b/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04SensorDriver.java index 978023d..1001f0d 100644 --- a/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04SensorDriver.java +++ b/driver-hcsr04/src/main/java/com/leinardi/android/things/driver/hcsr04/Hcsr04SensorDriver.java @@ -19,9 +19,9 @@ import android.hardware.Sensor; import com.google.android.things.userdriver.UserDriverManager; -import com.google.android.things.userdriver.UserSensor; -import com.google.android.things.userdriver.UserSensorDriver; -import com.google.android.things.userdriver.UserSensorReading; +import com.google.android.things.userdriver.sensor.UserSensor; +import com.google.android.things.userdriver.sensor.UserSensorDriver; +import com.google.android.things.userdriver.sensor.UserSensorReading; import java.io.IOException; import java.util.UUID; @@ -83,7 +83,7 @@ public void registerProximitySensor() { if (mDistanceUserDriver == null) { mDistanceUserDriver = new DistanceUserDriver(); - UserDriverManager.getManager().registerSensor(mDistanceUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mDistanceUserDriver.getUserSensor()); } } @@ -92,12 +92,12 @@ public void registerProximitySensor() { */ public void unregisterProximitySensor() { if (mDistanceUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mDistanceUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mDistanceUserDriver.getUserSensor()); mDistanceUserDriver = null; } } - private class DistanceUserDriver extends UserSensorDriver { + private class DistanceUserDriver implements UserSensorDriver { private UserSensor mUserSensor; private UserSensor getUserSensor() { diff --git a/driver-hd44780/src/main/java/com/leinardi/android/things/driver/hd44780/Hd44780.java b/driver-hd44780/src/main/java/com/leinardi/android/things/driver/hd44780/Hd44780.java index a5ded15..4be9203 100644 --- a/driver-hd44780/src/main/java/com/leinardi/android/things/driver/hd44780/Hd44780.java +++ b/driver-hd44780/src/main/java/com/leinardi/android/things/driver/hd44780/Hd44780.java @@ -20,7 +20,7 @@ import android.util.Log; import com.google.android.things.pio.I2cDevice; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import java.io.IOException; import java.lang.annotation.Retention; @@ -115,7 +115,7 @@ public Hd44780(String i2cName, int i2cAddress, @Geometry int geometry) throws IO */ public Hd44780(String i2cName, int i2cAddress, @Geometry int geometry, boolean use5x10Dots) throws IOException { mLcdGeometry = GEOMETRIES[geometry]; - I2cDevice device = new PeripheralManagerService().openI2cDevice(i2cName, i2cAddress); + I2cDevice device = PeripheralManager.getInstance().openI2cDevice(i2cName, i2cAddress); try { init(device, use5x10Dots); } catch (IOException | RuntimeException e) { diff --git a/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1.java b/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1.java index 906e2c0..1e10ca3 100644 --- a/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1.java +++ b/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1.java @@ -21,7 +21,7 @@ import android.support.annotation.IntDef; import com.google.android.things.pio.I2cDevice; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import java.io.Closeable; import java.io.IOException; @@ -211,7 +211,7 @@ public class Lsm9ds1 implements Closeable { * @throws IOException */ private Lsm9ds1(Builder builder) throws IOException { - PeripheralManagerService pioService = new PeripheralManagerService(); + PeripheralManager pioService = PeripheralManager.getInstance(); I2cDevice accelGyroDevice = pioService.openI2cDevice(builder.mI2cBus, builder.mI2cAddressAccelGyro); I2cDevice magDevice = pioService.openI2cDevice(builder.mI2cBus, builder.mI2cAddressMag); try { diff --git a/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1SensorDriver.java b/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1SensorDriver.java index 390f906..04a4b58 100644 --- a/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1SensorDriver.java +++ b/driver-lsm9ds1/src/main/java/com/leinardi/android/things/driver/lsm9ds1/Lsm9ds1SensorDriver.java @@ -19,9 +19,9 @@ import android.hardware.Sensor; import com.google.android.things.userdriver.UserDriverManager; -import com.google.android.things.userdriver.UserSensor; -import com.google.android.things.userdriver.UserSensorDriver; -import com.google.android.things.userdriver.UserSensorReading; +import com.google.android.things.userdriver.sensor.UserSensor; +import com.google.android.things.userdriver.sensor.UserSensorDriver; +import com.google.android.things.userdriver.sensor.UserSensorReading; import java.io.IOException; import java.util.UUID; @@ -110,7 +110,7 @@ public void registerAccelerometerSensor() { if (mAccelerationUserDriver == null) { mAccelerationUserDriver = new AccelerationUserDriver(); - UserDriverManager.getManager().registerSensor(mAccelerationUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mAccelerationUserDriver.getUserSensor()); } } @@ -119,7 +119,7 @@ public void registerAccelerometerSensor() { */ public void unregisterAccelerometerSensor() { if (mAccelerationUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mAccelerationUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mAccelerationUserDriver.getUserSensor()); mAccelerationUserDriver = null; } } @@ -136,7 +136,7 @@ public void registerGyroscopeSensor() { if (mAngularVelocityUserDriver == null) { mAngularVelocityUserDriver = new AngularVelocityUserDriver(); - UserDriverManager.getManager().registerSensor(mAngularVelocityUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mAngularVelocityUserDriver.getUserSensor()); } } @@ -145,7 +145,7 @@ public void registerGyroscopeSensor() { */ public void unregisterGyroscopeSensor() { if (mAngularVelocityUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mAngularVelocityUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mAngularVelocityUserDriver.getUserSensor()); mAngularVelocityUserDriver = null; } } @@ -162,7 +162,7 @@ public void registerMagneticFieldSensor() { if (mMagneticInductionUserDriver == null) { mMagneticInductionUserDriver = new MagneticInductionUserDriver(); - UserDriverManager.getManager().registerSensor(mMagneticInductionUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mMagneticInductionUserDriver.getUserSensor()); } } @@ -171,7 +171,7 @@ public void registerMagneticFieldSensor() { */ public void unregisterMagneticFieldSensor() { if (mMagneticInductionUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mMagneticInductionUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mMagneticInductionUserDriver.getUserSensor()); mMagneticInductionUserDriver = null; } } @@ -188,7 +188,7 @@ public void registerTemperatureSensor() { if (mTemperatureUserDriver == null) { mTemperatureUserDriver = new TemperatureUserDriver(); - UserDriverManager.getManager().registerSensor(mTemperatureUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mTemperatureUserDriver.getUserSensor()); } } @@ -197,7 +197,7 @@ public void registerTemperatureSensor() { */ public void unregisterTemperatureSensor() { if (mTemperatureUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mTemperatureUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mTemperatureUserDriver.getUserSensor()); mTemperatureUserDriver = null; } } @@ -249,7 +249,7 @@ private void maybeSleep() throws IOException { } } - private class AccelerationUserDriver extends UserSensorDriver { + private class AccelerationUserDriver implements UserSensorDriver { // DRIVER parameters // documented at https://source.android.com/devices/sensors/hal-interface.html#sensor_t private static final float DRIVER_MAX_RANGE = Lsm9ds1.MAX_ACCEL_RANGE_G_DEFAULT; @@ -296,7 +296,7 @@ private boolean isEnabled() { } } - private class AngularVelocityUserDriver extends UserSensorDriver { + private class AngularVelocityUserDriver implements UserSensorDriver { // DRIVER parameters // documented at https://source.android.com/devices/sensors/hal-interface.html#sensor_t private static final float DRIVER_MAX_RANGE = Lsm9ds1.MAX_GYRO_RATE_DPS_DEFAULT; @@ -343,7 +343,7 @@ private boolean isEnabled() { } } - private class MagneticInductionUserDriver extends UserSensorDriver { + private class MagneticInductionUserDriver implements UserSensorDriver { // DRIVER parameters // documented at https://source.android.com/devices/sensors/hal-interface.html#sensor_t private static final float DRIVER_MAX_RANGE = Lsm9ds1.MAX_MAG_GAIN_GS_DEFAULT; @@ -390,7 +390,7 @@ private boolean isEnabled() { } } - private class TemperatureUserDriver extends UserSensorDriver { + private class TemperatureUserDriver implements UserSensorDriver { // DRIVER parameters // documented at https://source.android.com/devices/sensors/hal-interface.html#sensor_t private static final float DRIVER_MAX_RANGE = Lsm9ds1.MAX_TEMP_C; diff --git a/driver-sh1106/src/main/java/com/leinardi/android/things/driver/sh1106/Sh1106.java b/driver-sh1106/src/main/java/com/leinardi/android/things/driver/sh1106/Sh1106.java index b40e6ed..4f8a4c0 100644 --- a/driver-sh1106/src/main/java/com/leinardi/android/things/driver/sh1106/Sh1106.java +++ b/driver-sh1106/src/main/java/com/leinardi/android/things/driver/sh1106/Sh1106.java @@ -19,7 +19,7 @@ import android.graphics.Bitmap; import com.google.android.things.pio.I2cDevice; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import java.io.Closeable; import java.io.IOException; @@ -149,7 +149,7 @@ public Sh1106(String i2cName, int i2cAddress) throws IOException { * @throws IOException */ public Sh1106(String i2cName, int i2cAddress, int width, int height) throws IOException { - I2cDevice device = new PeripheralManagerService().openI2cDevice(i2cName, i2cAddress); + I2cDevice device = PeripheralManager.getInstance().openI2cDevice(i2cName, i2cAddress); try { init(device, width, height); } catch (IOException | RuntimeException e) { diff --git a/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256x.java b/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256x.java index e08fd64..9abfff5 100644 --- a/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256x.java +++ b/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256x.java @@ -21,7 +21,7 @@ import android.util.Log; import com.google.android.things.pio.I2cDevice; -import com.google.android.things.pio.PeripheralManagerService; +import com.google.android.things.pio.PeripheralManager; import java.io.Closeable; import java.io.IOException; @@ -178,7 +178,7 @@ public class Tsl256x implements Closeable { * @throws IOException */ public Tsl256x(String i2cName, int i2cAddress) throws IOException { - PeripheralManagerService pioService = new PeripheralManagerService(); + PeripheralManager pioService = PeripheralManager.getInstance(); I2cDevice device = pioService.openI2cDevice(i2cName, i2cAddress); try { connect(device); diff --git a/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256xSensorDriver.java b/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256xSensorDriver.java index c4273bb..9d7f245 100644 --- a/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256xSensorDriver.java +++ b/driver-tsl256x/src/main/java/com/leinardi/android/things/driver/tsl256x/Tsl256xSensorDriver.java @@ -19,9 +19,9 @@ import android.hardware.Sensor; import com.google.android.things.userdriver.UserDriverManager; -import com.google.android.things.userdriver.UserSensor; -import com.google.android.things.userdriver.UserSensorDriver; -import com.google.android.things.userdriver.UserSensorReading; +import com.google.android.things.userdriver.sensor.UserSensor; +import com.google.android.things.userdriver.sensor.UserSensorDriver; +import com.google.android.things.userdriver.sensor.UserSensorReading; import java.io.IOException; import java.util.UUID; @@ -97,7 +97,7 @@ public void registerLightSensor() { if (mLightUserDriver == null) { mLightUserDriver = new LightUserDriver(); - UserDriverManager.getManager().registerSensor(mLightUserDriver.getUserSensor()); + UserDriverManager.getInstance().registerSensor(mLightUserDriver.getUserSensor()); } } @@ -106,12 +106,12 @@ public void registerLightSensor() { */ public void unregisterLightSensor() { if (mLightUserDriver != null) { - UserDriverManager.getManager().unregisterSensor(mLightUserDriver.getUserSensor()); + UserDriverManager.getInstance().unregisterSensor(mLightUserDriver.getUserSensor()); mLightUserDriver = null; } } - private class LightUserDriver extends UserSensorDriver { + private class LightUserDriver implements UserSensorDriver { private UserSensor mUserSensor; private UserSensor getUserSensor() { diff --git a/versions.gradle b/versions.gradle index 74173ee..7e5236a 100644 --- a/versions.gradle +++ b/versions.gradle @@ -23,7 +23,7 @@ def versions = [:] versions.android_checkstyle_plugin = "1.0.0" versions.android_gradle_plugin = "3.1.0-beta1" versions.android_maven_gradle_plugin = "2.0" -versions.androidthings = "0.6.1-devpreview" +versions.androidthings = "0.7-devpreview" versions.apache_commons = "2.5" versions.arch = hasProperty("ARCH_VERSION") ? getProperty("ARCH_VERSION") : "1.0.0" versions.atsl_rules = "1.0.1"