mx/AareDAQ

Major update from x10sa #48

Merged

appleb_m merged 58 commits from x10sa into master

2026-03-27 12:00:23 +01:00

appleb_m commented

2026-03-27 12:00:09 +01:00

Contributor

No description provided.

appleb_m added 58 commits 2026-03-27 12:00:09 +01:00

Enhance SSE connection handling in tellupdater for compatibility and improved error handling 886bdcc032

Streamline SSE client setup in tellupdater by removing redundant HTTP stream handling 68df2930b3

Tell Client: temp fix of bug 6d0cf1fc47

TellUpdater: remove unessacery print statement 133a4a6876

SmargonTrace: change location of csv to /sls/mx/applications/logs 6a7e61c1a7

Aerotech: think we are removing automation1 api, WIP 3c769106bf

Aerotech: think we are removing automation1 api, WIP 6110a24d61

GUI: Use Pserv, spark and x10sa-queue a3d4027b08

DAQ: added park_and_dry functionality - needs testing b44fd51610

Improve SSE client resilience in tellupdater by adding retry mechanism and enhanced error logging 12412c29d8

GUI: FD panel bug fix 9db0e45f8b

GUI: main window add restore default view and way to recover refernece samples panel, also capture default window state. c25e20a10c

ALC: remove background function and button 322370ac08

Workflows: use ABR_POS_MOUNT cacc986785

GUI: fixed tell error flashing - hopefully ba559c5efa

DAQ: throttle userrightsexception. so it does not repeatedly log the same error eaa6f0cd0c

DAQ: throttle userrightsexception. so it does not repeatedly log the same error 95010444fd

Tell: start of rework - needs testing 3edf9200fd

Models: added aerotech connected and error to DAQStatusModel e9f3688952

GUI/DAQ: fixed connection error handling for tell, daq, smargon. Added handling for aerotech. Fixed bug where connection messaged flashed when polling status, fixed bug where tell connected would quash other messages and appear as an error. 5634554c00

BIG AEROTECH UPGRADE: transferred to aerotech api. Ported several functions from Coordinate to aerotech coordinate. Nees thorough testing as this could lead to strange behaviour 9a0f7abba0

devices: added magnet position sensor functions and moved set_transmission function 130f275197

jfjoch.py: added simulated mode. ae52d411e5

daq_worker: added missing aerotech and tell changes to status respone handler ecf4ccffb3

aerotech models 3b440cd1fa

Daq_worker - updating error message text for users if devices disconnect af4cd798d4

Enable mTLS support for WebSocket connections in tellupdater by configuring certificate and key files. 2e4adb5eff

Add CA certificate configuration to SSL settings in tellupdater to complete mTLS setup a965087669

Enable mandatory mTLS for SSE connections in tellupdater by configuring client certificates and CA root files. 6a07612509

Update CA certificate path in tellupdater to use the full chain file for improved SSL configuration 4e873fefc3

Conditionally apply mTLS for HTTPS connections in tellupdater to avoid certificate usage on plain HTTP requests. 87df42a179

Update certificate and key file paths in tellupdater to use database-specific mTLS credentials a4b6c2575e

Simplify mTLS handling in tellupdater by consolidating certificate paths and streamlining HTTP/HTTPS logic. d6d20d598f

Bump aaredb dependency version to 0.1.1a43 in pyproject.toml. eaf3083eca

Exception handler p- added exceptions for JFJOCH, Aerotech and AareDB communication errors 0225bb1e3b

Sever_exception_handler: added handlers for JFJOCH and Aerotech errors 624a8365a9

Fixes to alert banner 3d4e252438

Aerotech: added custom exception for communication error 98f665370a

jfjoch: added custom excpetions fbc9890fe4

DAQ/Daq_worker - changes to rotation and raster as well as handling of responses c9ec2e5028

Added mTLS certificates authentication to aaredb 100895f56b

ml_box: changed to new model yolo26l-seg-overlap-false_2026-03-16.engine b24e3aa12a

aaredb: changed certification, host and logging statements 6e3e14a837

modify tellupdater mTLS certificates f1a9147f10

Merge remote-tracking branch 'origin/x10sa' into x10sa 626ccdaebe

modify tellupdater mTLS certificates fd20ae50d8

modify spreadsheetupdater.py mTLS certificates 25163a5b4d

modify spreadsheetupdater.py mTLS certificates 97d7e56125

modify spreadsheetupdater.py mTLS certificates 12b749c4e6

modify spreadsheetupdater.py mTLS certificates 0de5cbfc01

modify spreadsheetupdater.py mTLS certificates d98769d67c

Automation 2.0: WIP added endpoints to backend, frontend connected and panel made, now debugging 3dd5f46f1e

aaredaq: continuing work on baton exchange procedure 3c1cf09417

aaredaq: continuing work on baton exchange procedure 5a47411727

Automation 2.0: WIP added endpoints to backend, frontend connected and panel made, now debugging 303173ae82

aaredaq: continuing work on baton exchange procedure 5949f14599

Merge branch 'x10sa' into x10sa-tutorial fec26c1186

# Conflicts:
#	src/aare/daq/devices.py
#	src/aare/daq/server.py
#	src/aare/devices/aerotech.py
#	src/aare/devices/tell_client.py
#	src/aare/gui/gui.py
#	src/aare/gui/threads/daq_worker.py
#	src/aare/gui/widgets/alert_banner.py

Bug fixes following big merge and updated alert banenr

Build and Publish / build (pull_request) Failing after 11s

Details

Build and Publish / Build and Deploy Docs (pull_request) Has been skipped

Details

Build and Publish / build (pull_request_target) Failing after 11s

Details

Build and Publish / Build and Deploy Docs (pull_request_target) Has been skipped

Details

53296a166e

appleb_m merged commit 21d64b3f7c into master

2026-03-27 12:00:23 +01:00

appleb_m referenced this issue from a commit

2026-03-27 12:00:25 +01:00

Merge pull request 'Major update from x10sa' (#48) from x10sa into master

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: mx/AareDAQ#48