Merge branch 'master' into auto-exposure-gain-awb

2021-04-21 12:10:47 +01:00 · 2021-04-21 12:10:47 +01:00 · 1f1a75c02a
commit 1f1a75c02a
parent a373afd955 e86e4d983a
13 changed files with 1848 additions and 167 deletions
--- a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue
+++ b/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue
@ -160,6 +160,7 @@ export default {
      stride_size: [800, 600, 10],
      fast_autofocus: true,
      autofocus_dz: 2000,
+      style: "raster",
      use_video_port: false
    };
  },