adding abilitz to select port for esp32cam

openUC2 · Jul 17, 2023 · 961f0d2 · 961f0d2
1 parent c6cd10a
commit 961f0d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/imswitch/imcontrol/controller/controllers/MCTController.py b/imswitch/imcontrol/controller/controllers/MCTController.py
@@ -410,8 +410,8 @@ def takeTimelapseThread(self, tperiod = 1):
 
                         image1 = image2.copy()
 
-save values 
-make sure not to have too large travelrange after last (e.g. initial position + 2*shift))                        
+                    #save values 
+                    #make sure not to have too large travelrange after last (e.g. initial position + 2*shift))                        
 
                     #increase iterator
                     self.nImagesTaken += 1

diff --git a/imswitch/imcontrol/model/interfaces/CameraESP32CamSerial.py b/imswitch/imcontrol/model/interfaces/CameraESP32CamSerial.py
@@ -8,11 +8,12 @@
 import io
 
 class CameraESP32CamSerial:
-    def __init__(self):
+    def __init__(self, port=None):
         super().__init__()
         self.__logger = initLogger(self, tryInheritParent=True)
 
         # many to be purged
+        self.port = port
         self.model = "ESP32Camera"
         self.shape = (0, 0)
 
@@ -39,6 +40,15 @@ def __init__(self):
         self.serialdevice = self.connect_to_usb_device()
 
     def connect_to_usb_device(self):
+        if self.port is not None:
+            try:
+                ser = serial.Serial(port.device, baudrate=2000000, timeout=1)
+                print("Succesfully connected to previously set port")
+                return ser
+            except:
+                pass
+
+
         ports = serial.tools.list_ports.comports()
         for port in ports:
             if port.manufacturer == self.manufacturer or port.manufacturer=="Microsoft":

diff --git a/imswitch/imcontrol/model/managers/detectors/ESP32SerialCamManager.py b/imswitch/imcontrol/model/managers/detectors/ESP32SerialCamManager.py
@@ -16,6 +16,10 @@ def __init__(self, detectorInfo, name, **_lowLevelManagers):
         self._running = False
         self._adjustingParameters = False
         fullShape = (320,240)
+        try:
+            self.port = detectorInfo.managerProperties['port']
+        except: 
+            self.port = None 
 
         # Prepare actions
         actions = {}
@@ -29,7 +33,7 @@ def __init__(self, detectorInfo, name, **_lowLevelManagers):
             }          
         # initialize camera
 
-        self._camera = self._getESP32CamObj()
+        self._camera = self._getESP32CamObj(self.port)
 
         # init super-class
         super().__init__(detectorInfo, name, fullShape=fullShape, supportedBinnings=[1],
@@ -112,11 +116,11 @@ def openPropertiesDialog(self):
         self._camera.openPropertiesGUI()
 
 
-    def _getESP32CamObj(self):
+    def _getESP32CamObj(self, port ):
         try:
             from imswitch.imcontrol.model.interfaces.CameraESP32CamSerial import CameraESP32CamSerial
             self.__logger.debug(f'Trying to initialize ESP32Camera')
-            camera = CameraESP32CamSerial()
+            camera = CameraESP32CamSerial(port)
         except Exception as e:
             self.__logger.warning(f'Failed to initialize PiCamera {e}, loading TIS mocker')
             from imswitch.imcontrol.model.interfaces.tiscamera_mock import MockCameraTIS