Commit 068b0c2
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 metricsFile tree
95 files changed
+10614
-656
lines changed- dev
- src
- hardware_implementations
- crysta_laser_561
- daq_transmission_light
- dcam4_camera
- mcl_micro_positioner
- mcl_stage
- meadowlark_slm
- nidaq
- ok_xem
- pi_n472
- pi_stage
- simulated_camera
- simulated_light
- simulated_stage
- tcube_laser
- thorcam_csc
- thorcam_dcx
- triggerscope
- vortran_laser_488
- hardware_interfaces
- camera_interface
- daq_interface
- lightsource_interface
- objective_positioner_interface
- slm_interface
- stage_interface
- triggerscope_interface
- test
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| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
| 23 | + | |
21 | 24 | | |
22 | 25 | | |
23 | 26 | | |
| |||
0 commit comments