fixed some timings

mariolukas · Sep 23, 2016 · 1c95c48 · 1c95c48
1 parent c02063f
commit 1c95c48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/fabscan/scanner/laserscanner/FSCamera.py b/src/fabscan/scanner/laserscanner/FSCamera.py
@@ -242,7 +242,8 @@ def startStream(self, auto_exposure=False):
         self.semaphore.acquire()
         self.is_idle = False
         self.semaphore.release()
-        time.sleep(1)
+        self.camera_buffer.flush()
+        time.sleep(0.5)
 
     def stopStream(self):
         self.semaphore.acquire()
@@ -258,19 +259,18 @@ def setExposureMode(self, auto_exposure=False):
 
                     self.camera.iso = 120
                     # Wait for the automatic gain control to settle
-                    time.sleep(2)
+                    time.sleep(1.4)
                     # Now fix the values
                     self.camera.shutter_speed = self.camera.exposure_speed
                     self.camera.exposure_mode = 'off'
                     g = self.camera.awb_gains
                     self.camera.awb_mode = 'off'
                     self.camera.awb_gains = g
+
                 else:
                     self.camera.awb_mode = "flash"
                     time.sleep(1)
 
-                self.camera_buffer.flush()
-
 
 class DummyCam:
 

diff --git a/src/fabscan/scanner/laserscanner/FSScanProcessor.py b/src/fabscan/scanner/laserscanner/FSScanProcessor.py
@@ -252,6 +252,7 @@ def finish_texture_scan(self):
 
         self.hardwareController.camera.device.stopStream()
         self.hardwareController.camera.device.flushStream()
+        time.sleep(0.8)
 
         self._worker_pool.kill()
 
@@ -280,9 +281,10 @@ def init_object_scan(self):
 
         self.hardwareController.led.on(self.settings.led.red, self.settings.led.green, self.settings.led.blue)
         self.hardwareController.laser.on()
+        time.sleep(0.5)
         self.hardwareController.camera.device.startStream()
         self.hardwareController.camera.device.flushStream()
-        time.sleep(0.8)
+        time.sleep(0.5)
 
         #self._laser_angle = self.image_processor.calculate_laser_angle(self.hardwareController.camera.device.getFrame())
         self._laser_angle = self.settings.backwall.laser_angle