Merge branch 'main' into i24-parameters

DiamondLightSource · Jun 23, 2023 · 4a148a3 · 4a148a3
2 parents 5b79e42 + 9d762c5
commit 4a148a3
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 813 deletions.
diff --git a/src/mx_bluesky/I24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl b/src/mx_bluesky/I24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl
@@ -1791,7 +1791,7 @@ buttonLabel "Custom Chip"
 numPvs 4
 numDsps 1
 displayFileName {
-  0 "sacla3_MappingLite-heidelberg_v7.edl"
+  0 "CustomChip_py3v1.edl"
 }
 endObjectProperties