rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed logging and split access and root file handlers

Browse source
This commit is contained in:
Joel Collins 2020-05-20 17:46:44 +01:00
parent b8c0ca257c
commit 4a553040d3
6 changed files with 54 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/microscope.py
View file

@ -83,7 +83,7 @@ class Microscope:
"""
### Detector
print("Creating camera")
logging.info("Creating camera")
if configuration.get("camera"):
camera_type = configuration["camera"].get("type")
if camera_type in ("PiCamera", "PiCameraStreamer"):
@ -94,7 +94,7 @@ class Microscope:
logging.warning("No compatible camera hardware found.")
### Stage
print("Creating stage")
logging.info("Creating stage")
if configuration.get("stage"):
stage_type = configuration["stage"].get("type")
stage_port = configuration["stage"].get("port")
@ -105,7 +105,7 @@ class Microscope:
logging.error(e)
logging.warning("No compatible Sangaboard hardware found.")
print("Handling fallbacks")
logging.info("Handling fallbacks")
### Fallbacks
if not self.camera:
self.camera = MissingCamera()
@ -113,7 +113,7 @@ class Microscope:
self.stage = MissingStage()
### Locks
print("Creating locks")
logging.info("Creating locks")
if hasattr(self.camera, "lock"):
self.lock.locks.append(self.camera.lock)
if hasattr(self.stage, "lock"):