o Reading values from the soil sensor.

o Rewrote the database schema to match the new device+sensors model.
o Storing samples in the database.
o To be able to reuse BT callbacks, added a way to always to directly to the next step instead of waiting for an event.

1 files changed, 27 insertions, 8 deletions

diff --git a/app/src/main/java/io/trygvis/soilmoisture/SmSensor.java b/app/src/main/java/io/trygvis/soilmoisture/SmSensor.java
index ec4b423..2a0d9cd 100644
--- a/app/src/main/java/io/trygvis/soilmoisture/SmSensor.java
+++ b/app/src/main/java/io/trygvis/soilmoisture/SmSensor.java
@@ -5,38 +5,57 @@ import java.util.Date;
 class SmSensor {
     private final SmDevice device;
 
-    private final int index;
+    public final long id;
+
+    public final int index;
+
+    private String name;
 
     private Date timestamp;
 
-    private int lastValue;
+    private Integer lastValue;
 
-    SmSensor(SmDevice device, int index) {
+    SmSensor(SmDevice device, long id, int index) {
         this.device = device;
+        this.id = id;
         this.index = index;
+        this.name = "Sensor #" + index;
     }
 
     public SmDevice getDevice() {
         return device;
     }
 
+    public long getId() {
+        return id;
+    }
+
     public int getIndex() {
         return index;
     }
 
-    public int getLastValue() {
-        return lastValue;
+    public String getName() {
+        return name;
     }
 
-    public void setLastValue(int lastValue) {
-        this.lastValue = lastValue;
+    public Integer getLastValue() {
+        return lastValue;
     }
 
     public Date getTimestamp() {
         return timestamp;
     }
 
-    public void setTimestamp(Date timestamp) {
+    // -----------------------------------------------------------------------
+    //
+    // -----------------------------------------------------------------------
+
+    public void readCurrentValue() {
+        device.smService.readCurrentValue(this);
+    }
+
+    void updateLastValue(Date timestamp, int lastValue) {
         this.timestamp = timestamp;
+        this.lastValue = lastValue;
     }
 }