Merge pull request #149 from lucidcode/feature/image-quality

Improve rapid eye movement image quality

Author: IAmCoder

images/settings/network.png

@@ -15,6 +15,7 @@ def __init__(self):
         self.default['WiFi'] = False
         self.default['WiFiNetworkName'] = "INSPEC"
         self.default['WiFiKey'] = "1234567890"
+        self.default['WiFiImageQuality'] = 50
         self.default['PixelFormat'] = 'Grayscale'
         self.default['PixelThreshold'] = 6
         self.default['PixelRange'] = 6

release/firmware.bin

@@ -118,11 +118,10 @@ def monitor(self):
                 self.process_api("variance", self.variance)
 
                 if (utime.ticks_ms() - self.last_update > 128):
-                    self.send_stream()
-
                     face = "1" if self.face.has_face else "0"
                     data = f'{str(self.peak_variance)};{self.rem.eye_movements};{face};{self.quality.indicator}'
                     self.comms.send_data(data)
+                    self.send_stream()
                     self.peak_variance = 0
                     self.last_update = utime.ticks_ms()
 
@@ -269,12 +268,8 @@ def process_trigger(self):
     def init_stream(self):
         try:
             self.stream = None
-            if self.config.get('AccessPoint'):
-                self.stream = inspec_stream("AccessPoint", self.config.get('AccessPointName'), self.config.get('AccessPointPassword'))
+            self.stream = inspec_stream(self.config)
 
-            if self.config.get('WiFi'):
-                self.stream = inspec_stream("Station", self.config.get('WiFiNetworkName'), self.config.get('WiFiKey'))
-                
         except Exception as e:
             self.error = str(e)
             print("init_stream error: ", self.error)

software/config.py

@@ -5,14 +5,15 @@
 
 class inspec_stream:
 
-    def __init__(self, interface, ssid, password):
+    def __init__(self, config):
+        self.config = config
         self.error = None
 
-        if interface == "AccessPoint":
-            self.start_access_point(ssid, password)
+        if self.config.get('WiFi'):
+            self.connect_network(self.config.get('WiFiNetworkName'), self.config.get('WiFiKey'))
 
-        if interface == "Station":
-            self.connect_network(ssid, password)
+        if self.config.get('AccessPoint'):
+            self.start_access_point(self.config.get('AccessPointName'), self.config.get('AccessPointPassword'))
 
         self.ip = self.wlan.ifconfig()[0]
         print("IP", self.ip)
@@ -35,9 +36,9 @@ def connect_network(self, ssid, password):
         attempts = 0
         while not self.wlan.isconnected():
             print("Connecting to " + ssid)
-            time.sleep_ms(1000)
+            time.sleep_ms(1024)
             attempts = attempts + 1
-            if attempts > 10:
+            if attempts > 12:
                 raise Exception("Failed to connect to " + ssid)
 
     def start_server(self, id):
@@ -91,7 +92,7 @@ def send_image(self, image):
         if self.connected[0] == False:
             return
 
-        cframe = image.to_jpeg(quality=35, copy=True)
+        cframe = image.to_jpeg(quality=self.config.get('WiFiImageQuality'), copy=True)
         header = (
             "\r\n--inspec\r\n"
             "Content-Type: image/jpeg\r\n"