Merge branch 'main' into 11_I24-exercise-motors

DiamondLightSource · Jun 23, 2023 · 699d368 · 699d368
2 parents d2ea514 + 9d762c5
commit 699d368
Show file tree

Hide file tree

Showing 29 changed files with 1,475 additions and 10,720 deletions.
diff --git a/src/mx_bluesky/I24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py b/src/mx_bluesky/I24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py
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