Skip to content

Commit 068b0c2

Browse files
committed
Merge under_dev_v2_Smart into main
Combines hardware implementations from under_dev_v2_Smart: - MCL stage enhancements (move_to_z, get_z_position) - Microdrive positioner work - Focus lock testing - Triggerscope reset fixes - Objective positioner GUI With maintenance updates from main: - Compat entries for all dependencies - CLAUDE.md guidance file - Subprocess serialization/timing metrics
2 parents 77785b5 + 2b75dbd commit 068b0c2

File tree

95 files changed

+10614
-656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+10614
-656
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/Manifest.toml
55
/docs/Manifest.toml
66
/docs/build/
7+
.DS_Store

Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ authors = ["klidke@unm.edu"]
44
version = "1.0.0-DEV"
55

66
[deps]
7+
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
78
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
89
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
910
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
@@ -12,12 +13,14 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
1213
ImageView = "86fae568-95e7-573e-a6b2-d8a6b900c9ef"
1314
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
1415
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
16+
LibSerialPort = "a05a14c7-6e3b-5ba9-90a2-45558833e1df"
1517
NIDAQ = "66b72792-1abf-55ab-8064-6e9051317175"
1618
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
1719
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1820

1921
[compat]
2022
CairoMakie = "0.12, 0.13, 0.14, 0.15"
23+
CEnum = "0.5.0"
2124
FFTW = "1"
2225
GLMakie = "0.10, 0.11, 0.12, 0.13"
2326
HDF5 = "0.17"

0 commit comments

Comments
 (0)