update readme, release wakelock, check for non triggering values betwee triggers

Author: hanscappelle

Diff for: README.md

@@ -61,13 +61,13 @@ And the manifest needs to contain:
 * complete sensor listing and data visualisation
 * add grahps for data view
 * communicate sensor readings from service to configuration fragment
-* add check for threshold values, should go beyond threshold before triggering again
 
 ## Version History
 
-### Upcoming 0.1.1
+### 0.1.1 (Upcoming)
 
-* update on deprecated wakelock options, using the methods referenced at http://developer.android.com/reference/android/os/PowerManager.html form now on.
+* release wake lock directly after acquiring it now
+* check for non triggering values between triggers
 
 ### 0.1.0
 

Diff for: app/src/main/java/be/hcpl/android/sensors/service/SensorBackgroundService.java

@@ -34,9 +34,9 @@ public class SensorBackgroundService extends Service implements SensorEventListe
     private boolean mLogging = false;
 
     /**
-     * an interval for the sensor value reading;
+     * also keep track of the previous value
      */
-    private long mInterval;
+    private static float previousValue;
 
     /**
      * treshold values
@@ -117,7 +117,7 @@ public void onSensorChanged(SensorEvent event) {
             for (float value : event.values)
                 sb.append(String.valueOf(value)).append(" | ");
 
-            Log.d(TAG, "received sensor valures are: " + sb.toString());
+            Log.d(TAG, "received sensor valures are: " + sb.toString()+ " and previosValue was: "+previousValue);
         }
 
         // get the value
@@ -126,25 +126,33 @@ public void onSensorChanged(SensorEvent event) {
 
         // if first value is below min or above max threshold but only when configured
         // we need to enable the screen
-        if (sensorValue < mThresholdMin || sensorValue > mThresholdMax) {
+        if ((previousValue > mThresholdMin && sensorValue < mThresholdMin)
+                || (previousValue < mThresholdMax && sensorValue > mThresholdMax)) {
 
             // and a check in between that there should have been a non triggering value before
             // we can mark a given value as trigger. This is to overcome unneeded wakeups during
             // night for instance where the sensor readings for a light sensor would always be below
             // the threshold needed for day time use.
 
-
             // TODO we could even make the actions configurable...
 
             // wake screen here
-            PowerManager pm = (PowerManager) getSystemService(getApplicationContext().POWER_SERVICE);
-            PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, TAG);
-            wl.acquire();
-            //..screen will stay on during this section..
-            wl.release();
+            PowerManager pm = (PowerManager) getApplicationContext().getSystemService(getApplicationContext().POWER_SERVICE);
+            PowerManager.WakeLock wakeLock = pm.newWakeLock((PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), TAG);
+            wakeLock.acquire();
+
+            //and release again
+            wakeLock.release();
+
+            // optional to release screen lock
+            //KeyguardManager keyguardManager = (KeyguardManager) getApplicationContext().getSystemService(getApplicationContext().KEYGUARD_SERVICE);
+            //KeyguardManager.KeyguardLock keyguardLock =  keyguardManager.newKeyguardLock(TAG);
+            //keyguardLock.disableKeyguard();
         }
 
-        // stop the sensor and service
+        previousValue = sensorValue;
+
+                // stop the sensor and service
         mSensorManager.unregisterListener(this);
         stopSelf();
     }