Update so mutiple requests can be handled

mplacona · mplacona · commit 666f3fd9f29b · 2017-03-30T11:48:12.000+01:00
diff --git a/README.md b/README.md
@@ -39,23 +39,15 @@ dht22Driver = new Dht22Driver(mArduino);
         dht22Driver.startup();
 ```
 
-- Call it in a handler (to be modified)
+- Call it 
 ```
-new Handler().postDelayed(new Runnable() {
-    public void run() {
-        try {
-            dht22Driver.getTemperature(temperature, MainActivity.this);
-            Log.d(TAG, "run: Temperature");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }, 0);
+String temperature = dht22Driver.getTemperature();
+String humidity = dht22Driver.getHumidity();
 ```
 
 Connections
 ----------
-![Conenctions](https://github.com/mplacona/arduwrap/blob/master/arduwrap.png?raw=true)
+![Connections](https://github.com/mplacona/arduwrap/blob/master/arduwrap.png?raw=true)
 
 License
 =======
diff --git a/app/src/main/java/rocks/androidthings/arduwrap_sample/MainActivity.java b/app/src/main/java/rocks/androidthings/arduwrap_sample/MainActivity.java
@@ -1,35 +1,37 @@
 package rocks.androidthings.arduwrap_sample;
 
 import android.databinding.DataBindingUtil;
-import android.os.Handler;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
+import android.view.View;
 import android.widget.TextView;
 
 import java.io.IOException;
 
 import rocks.androidthings.arduwrap.Arduino;
 import rocks.androidthings.arduwrap.Dht22Driver;
-import rocks.androidthings.arduwrap.OnMessageCompleteListener;
 import rocks.androidthings.arduwrap_sample.databinding.ActivityMainBinding;
 
-public class MainActivity extends AppCompatActivity implements OnMessageCompleteListener {
+public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
     private static final String UART_DEVICE_NAME = "UART0";
     private static final int BAUD_RATE = 115200;
     private static final int DATA_BITS = 8;
     private static final int STOP_BITS = 1;
-    Dht22Driver dht22Driver;
+    private Dht22Driver dht22Driver;
+    private TextView mTemperature;
+    private TextView mHumidity;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
+        FloatingActionButton fab = binding.floatingActionButton;
 
-        final TextView temperature = binding.temperatureTv;
-        final TextView humidity = binding.humidityTv;
+        mTemperature = binding.temperatureTv;
+        mHumidity = binding.humidityTv;
 
         Arduino mArduino = new Arduino.ArduinoBuilder()
                 .uartDeviceName(UART_DEVICE_NAME)
@@ -41,28 +43,13 @@ protected void onCreate(Bundle savedInstanceState) {
         dht22Driver = new Dht22Driver(mArduino);
         dht22Driver.startup();
 
-
-        new Handler().postDelayed(new Runnable() {
-            public void run() {
-                try {
-                    dht22Driver.getTemperature(temperature, MainActivity.this);
-                    Log.d(TAG, "run: Temperature");
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }, 0);
-
-        new Handler().postDelayed(new Runnable() {
-            public void run() {
-                try {
-                    dht22Driver.getHumidity(humidity, MainActivity.this);
-                    Log.d(TAG, "run: Humidity");
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mTemperature.setText(String.format("%s°C", dht22Driver.getTemperature()));
+                mHumidity.setText(String.format("%s%%", dht22Driver.getHumidity()));
             }
-        }, 1000);
+        });
 
     }
 
@@ -71,9 +58,4 @@ protected void onDestroy(){
         dht22Driver.shutdown();
         super.onDestroy();
     }
-
-    @Override
-    public void onMessageComplete(String message, TextView field) {
-        field.setText(message);
-    }
 }
diff --git a/arduwrap/src/main/java/rocks/androidthings/arduwrap/BaseSensor.java b/arduwrap/src/main/java/rocks/androidthings/arduwrap/BaseSensor.java
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-public interface BaseSensor {
-    void onStart();
-    void onStop();
+interface BaseSensor {
     void startup();
     void shutdown();
 }
diff --git a/arduwrap/src/main/java/rocks/androidthings/arduwrap/Dht22Driver.java b/arduwrap/src/main/java/rocks/androidthings/arduwrap/Dht22Driver.java
@@ -1,11 +1,9 @@
 package rocks.androidthings.arduwrap;
 
 import android.util.Log;
-import android.widget.TextView;
 
 import com.google.android.things.pio.PeripheralManagerService;
 import com.google.android.things.pio.UartDevice;
-import com.google.android.things.pio.UartDeviceCallback;
 
 import java.io.IOException;
 
@@ -25,15 +23,11 @@
  * limitations under the License.
  */
 
-public class Dht22Driver implements BaseSensor {
+public class Dht22Driver implements BaseSensor, AutoCloseable {
     private static final String TAG = "Dht22Driver";
     private final Arduino arduino;
 
     private UartDevice mDevice;
-    private StringBuffer message = new StringBuffer();
-    private boolean receiving = false;
-    private OnMessageCompleteListener messageCompleteListener;
-    private TextView field;
 
     public Dht22Driver(Arduino arduino){
         this.arduino = arduino;
@@ -50,97 +44,75 @@ public void startup() {
             mDevice.setStopBits(arduino.getStopBits());
             mDevice.setBaudrate(arduino.getBaudRate());
         } catch (IOException e){
+            try {
+                close();
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
             throw new IllegalStateException("Sensor can't start", e);
         }
+    }
+
+    public String getTemperature() {
+        String mode = "T";
+        String response = "";
+        byte[] buffer = new byte[10];
 
         try {
-            mDevice.registerUartDeviceCallback(mUartCallback);
+            response = fillBuffer(buffer, mode);
         } catch (IOException e) {
-            throw new IllegalStateException("Sensor can't register callback", e);
+
+            e.printStackTrace();
         }
+        return response;
     }
 
-    public void getTemperature(TextView field, OnMessageCompleteListener listener) throws IOException {
-        String mode = "T";
-        mDevice.write(mode.getBytes(), mode.length());
-        this.messageCompleteListener = listener;
-        this.field = field;
-    }
 
-    public void getHumidity(TextView field, OnMessageCompleteListener listener) throws IOException {
+    public String getHumidity() {
         String mode = "H";
-        mDevice.write(mode.getBytes(), mode.length());
-        this.messageCompleteListener = listener;
-        this.field = field;
-    }
+        String response = "";
+        byte[] buffer = new byte[10];
 
-    @Override
-    public void onStart() {
         try {
-            mDevice.registerUartDeviceCallback(mUartCallback);
+            response = fillBuffer(buffer, mode);
         } catch (IOException e) {
             e.printStackTrace();
         }
+        return response;
     }
 
-    @Override
-    public void onStop() {
-        mDevice.unregisterUartDeviceCallback(mUartCallback);
+    private String fillBuffer(byte[] buffer, String mode) throws IOException {
+        mDevice.write(mode.getBytes(), mode.length());
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        mDevice.read(buffer, buffer.length);
+        return new String(buffer, "UTF-8");
     }
 
     @Override
-    public void shutdown() {
-        if (mDevice != null) {
+    public void close() throws Exception {
+        if(mDevice != null){
             try {
                 mDevice.close();
+            } finally {
                 mDevice = null;
-            } catch (IOException e) {
-                Log.w(TAG, "Unable to close UART device", e);
             }
         }
     }
 
-    private UartDeviceCallback mUartCallback = new UartDeviceCallback() {
-        @Override
-        public boolean onUartDeviceDataAvailable(UartDevice uart) {
-            // Read available data from the UART device
+    @Override
+    public void shutdown() {
+        if (mDevice != null) {
             try {
-                readUartBuffer(uart);
+                mDevice.close();
+                mDevice = null;
             } catch (IOException e) {
-                Log.w(TAG, "Unable to access UART device", e);
+                Log.w(TAG, "Unable to close UART device", e);
             }
-
-            // Continue listening for more interrupts
-            return true;
-        }
-
-        @Override
-        public void onUartDeviceError(UartDevice uart, int error) {
-            Log.w(TAG, uart + ": Error event " + error);
-        }
-    };
-
-    private void readUartBuffer(UartDevice uart) throws IOException {
-        byte[] buffer = new byte[1];
-
-        uart.read(buffer, buffer.length);
-        String character = new String(buffer, "UTF-8");
-
-        if(character.compareTo("#") == 0){
-            receiving = false;
-            this.messageCompleteListener.onMessageComplete(message.toString(), this.field);
-            Log.d(TAG, "Complete Message: " + message);
-
-            // clear buffer
-            message.delete(0, message.length());
-        }
-
-        if(receiving){
-            message.append(character);
-        }
-
-        if(character.compareTo("$") == 0){
-            receiving = true;
         }
     }
 }
diff --git a/arduwrap/src/main/java/rocks/androidthings/arduwrap/OnMessageCompleteListener.java b/arduwrap/src/main/java/rocks/androidthings/arduwrap/OnMessageCompleteListener.java
@@ -19,5 +19,5 @@
  */
 
 public interface OnMessageCompleteListener {
-    void onMessageComplete(String message, TextView field);
+    void onMessageComplete(String message);
 }

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`public interface OnMessageCompleteListener {`
`22`		`- void onMessageComplete(String message, TextView field);`
	`22`	`+ void onMessageComplete(String message);`
`23`	`23`	`}`