Merge pull request #129 from lucidcode/feature/artifact-filter

Add artifact filter

Author: IAmCoder

release/firmware.bin

@@ -26,6 +26,7 @@ def __init__(self):
         self.default['TriggerThreshold'] = 16
         self.default['TossThreshold'] = 256
         self.default['TossCooldown'] = 1
+        self.default['ArtifactFilter'] = 0.0
         self.default['TriggerDelay'] = 0
         self.default['TriggerInterval'] = 1000 * 60 * 1
         self.default['NREM1Delay'] = 1000 * 60 * 1
@@ -91,7 +92,7 @@ def set(self, setting, value):
             self.config[setting] = value
             return
 
-        float_settings = ["FaceThreshold", "FaceScaleFactor"]
+        float_settings = ["FaceThreshold", "FaceScaleFactor", "ArtifactFilter"]
         if setting in float_settings:
             self.config[setting] = float(value)
             return

software/config.py

@@ -13,19 +13,26 @@ def detect(self, variance, global_variance):
         if global_variance >= self.config.get('TossThreshold'):
             self.eye_movements = 0
             self.last_eye_movement = now + 1000 * self.config.get('TossCooldown')
+            return self.eye_movements
 
-        if now - self.last_eye_movement > 1000 * 60:
-            if self.eye_movements > 0:
-                self.eye_movements = self.eye_movements - 1
-                self.last_eye_movement = now - 1000 * 58
+        if now - self.last_eye_movement > 1000 * 60 and self.eye_movements > 0:
+            self.eye_movements = self.eye_movements - 1
+            self.last_eye_movement = now - 1000 * 58
 
         if (self.config.get('TrackFace') or self.config.get('TensorFlow')) and not self.face.has_face:
             return self.eye_movements
 
-        if variance >= self.config.get('TriggerThreshold'):
-            if now - self.last_eye_movement > 1000:
-                self.last_eye_movement = now
-                if self.eye_movements < 8:
-                    self.eye_movements = self.eye_movements + 1
+        if variance < self.config.get('TriggerThreshold'):
+            return self.eye_movements
+
+        artifact_filter = self.config.get('ArtifactFilter')
+        artifact_variance = variance + variance * (1.0 - artifact_filter)
+        if artifact_filter != 0 and global_variance > artifact_variance:
+            return self.eye_movements
+
+        if now - self.last_eye_movement > 1000:
+            self.last_eye_movement = now
+            if self.eye_movements < 8:
+                self.eye_movements = self.eye_movements + 1
 
         return self.eye_movements