diff --git a/config/hsfei/hsfei_piaadeploy.yaml b/config/hsfei/hsfei_piaadeploy.yaml index 0df4644..0a8ffef 100644 --- a/config/hsfei/hsfei_piaadeploy.yaml +++ b/config/hsfei/hsfei_piaadeploy.yaml @@ -1,20 +1,14 @@ -# PIAA lens deploy, RED and BLUE in/out, on one Xeryon XD-M-3 controller, -# resource hsfei_15. Only two of its three axes are wired. +# PIAA lens deploy, RED and BLUE in/out, on one Xeryon XD-M-3 controller. # # Usage: # daemons/hsfei/xeryon -c config/hsfei/hsfei_piaadeploy.yaml -# -# TODO: fill in ip_address/tcp_port, confirm which axis is red and which is -# blue, and measure the in/out positions. -# If the controller turns out to report a third axis, add it here with -# `expose: false` so its data isn't filed against axis A. peer_id: piaadeploy group_id: hsfei hardware: - ip_address: - tcp_port: + ip_address: 192.168.29.100 + tcp_port: 10011 settings_file: hispec/driver/xeryon/config/settings_FEI_XD24514_20250902.txt position_tolerance: 0.01 # mm @@ -22,22 +16,23 @@ stages: - name: red suffix: r axis: A - stage: XLS_5_3N # XLS-3-80-5 + stage: XLS_5_3N units: mm softmin: -25.0 softmax: 25.0 - name: blue suffix: b axis: B - stage: XLS_5_3N # XLS-3-80-5 + stage: XLS_5_3N units: mm softmin: -25.0 softmax: 25.0 - # positionnamedb appears once these are measured, likewise - # positionnamedr for the axis above: - # named_positions: - # in: 0.0 - # out: 0.0 + # Nothing is wired to axis C, which reports a drifting position + - name: spare + axis: C + stage: XLS_5_3N + units: mm + expose: false logging: level: INFO diff --git a/docs/architecture/daemons.md b/docs/architecture/daemons.md index 2955cdd..664ee16 100644 --- a/docs/architecture/daemons.md +++ b/docs/architecture/daemons.md @@ -25,6 +25,7 @@ its `pdu_models/` capability files. | `hsfei/adc` | `newport.smc100pp` | Newport SMC100PP ADC prism rotators | `hsfei_adc` | | `hsfei/atccryo` | `sunpower.sunpower_cryocooler` | Sunpower cryocooler | `hsfei_atccryo` | | `hsfei/piaa-gimbalmount` | `thorlabs.ppc102` | Thorlabs PPC102 piezo gimbal mount | `hsfei_piaagimb`, `hsfei_piaagimr` | +| `hsfei/xeryon` | `xeryon.XeryonController` | Xeryon XD-M-3 piezo motion controllers | `hsfei_hkfam`, `hsfei_piaadeploy`, `hsfei_yjfam` | | `hscal/smc8_attenuator` | `standa.smc8` | Standa SMC8 (libximc) attenuator | `hscal_hketatten` | | `hspower/pdu` | `pdu.src.emat08_10` | Eaton EMAT08-10 networked PDU | `hspower_fei1/2`, `hspower_cal1`–`4`, `hspower_fib1`, `hspower_bspec1`, `hspower_rspec1` | @@ -49,6 +50,8 @@ camera) environment. | `hsfei_atcp` | ATC pickoff stage | | `hsfei_adc` | atmospheric dispersion corrector, two prism rotators | | `hsfei_piaagimb` / `hsfei_piaagimr` | PIAA gimbal mounts, blue and red | +| `hsfei_piaadeploy` | PIAA lens deploy, blue and red in/out | +| `hsfei_yjfam` / `hsfei_hkfam` | fiber alignment mechanisms, blue and red | | `hsfei_atcfw` | ATC filter wheel | | `hsfei_atctherm` | ATC temperature control | | `hsfei_atcpress` | ATC vacuum pressure |