Merge branch 'manual-config' into 'v3'

Configuration for manual microscope

See merge request openflexure/openflexure-microscope-server!439
This commit is contained in:
Joe Knapper 2025-11-13 14:42:29 +00:00
commit 23989977c2
2 changed files with 12 additions and 1 deletions

11
ofm_config_manual.json Normal file
View file

@ -0,0 +1,11 @@
{
"things": {
"/camera/": {
"class": "openflexure_microscope_server.things.camera.opencv:OpenCVCamera",
"kwargs": {"camera_index": 0}
},
"/system/": "openflexure_microscope_server.things.system:OpenFlexureSystem"
},
"settings_folder": "./openflexure/settings/",
"log_folder": "./openflexure/logs/"
}

View file

@ -106,7 +106,7 @@ class OpenCVCamera(BaseCamera):
raise RuntimeError( raise RuntimeError(
f"Failed to capture frame from camera {self.camera_index}" f"Failed to capture frame from camera {self.camera_index}"
) )
return frame return cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
def capture_image( def capture_image(
self, self,