Merge branch 'v2.1.0-dev' into stage-calibration

2020-03-25 16:36:41 +00:00 · 2020-03-25 16:36:41 +00:00 · 8a2a2abbec
commit 8a2a2abbec
parent 5d5cc7a72a 7304d6534e
12 changed files with 170 additions and 81 deletions
--- a/openflexure_microscope/api/default_extensions/init.py
+++ b/openflexure_microscope/api/default_extensions/init.py
@ -14,3 +14,5 @@ except Exception as e:
    logging.error(
        f"Exception loading builtin extension picamera_autocalibrate: \n{traceback.format_exc()}"
    )
+
+from ..example_extensions.custom_element import customelement_extension_v2
--- a/openflexure_microscope/api/default_extensions/autostorage.py
+++ b/openflexure_microscope/api/default_extensions/autostorage.py
@ -241,6 +241,7 @@ def dynamic_form():
    return {
        "icon": "sd_storage",
        "title": "Storage",
+        "viewPanel": "gallery",
        "forms": [
            {
                "name": "Autostorage",