155 Commits

Author SHA1 Message Date
Jim Larsson
4f6a5b4d51 Merge branch 'ICSHWI-17419' into 'dev'
(Modify) Logic to #StopAfterCycles for cont. mode

See merge request epics-modules/adorca!17
2024-03-12 13:41:05 +00:00
Jim Larsson
2562f3d732 (Modify) Logic to #StopAfterCycles for cont. mode 2024-02-27 15:44:07 +01:00
Jim Larsson
ed1845acf2 Merge branch 'ICSHWI_17104' into 'dev'
Icshwi 17104

See merge request epics-modules/adhama!16
2024-02-21 09:03:41 +00:00
Jim Larsson
15e0849a58 fix(orca.cpp): timeout msg 2024-02-20 10:47:31 +01:00
Jim Larsson
9bf0389752 ICSHWI-17104: add waiting time until status update -taking too long 2024-02-13 14:32:11 +01:00
Jim Larsson
1a3c91838b add elapsedTotalTime and compare with max acq. 2024-02-13 11:45:02 +01:00
Douglas Araujo
e24c2f68e8 Merge branch 'ICSHWI-15886-Orca-frame-drop' into 'dev'
ICSHWI-15886: Orca frame drop

See merge request epics-modules/adhama!15
2024-01-29 14:27:01 +00:00
Douglas Araujo
81ee3c28a5 Add mechanism to check dropped frames 2024-01-29 08:25:27 +00:00
Douglas Araujo
94c13c6a48 Merge branch 'ICSHWI-15961' into 'dev'
ICSHWI-15961: rename Hama to Orca

See merge request epics-modules/adhama!14
2024-01-29 08:24:31 +00:00
Tomasz Brys
10d88aa479 rename Hama to Orca 2024-01-17 15:14:49 +01:00
Douglas Araujo
d77cb91b15 Merge branch 'ICSHWI-12967' into 'dev'
ICSHWI-12967: Add internal PVs to control when enable and stop EVR sequencer

See merge request epics-modules/adhama!13
2023-09-20 07:02:11 +00:00
Douglas Araujo
a9b6d1c4be Update st.cmd to run with external trigger by EVR 11 and update kafka topic 2023-09-18 11:33:28 +02:00
Douglas Araujo
16bb800227 Add mechanism to check if acquirePeriod is valid 2023-09-18 11:32:01 +02:00
Douglas Araujo
1d07985371 Stop sequencer when Acquire 0 2023-09-18 11:26:30 +02:00
Douglas Araujo
7118ae9186 Add internal PVs to control when enable and stop EVR sequencer instead only to use Acquire 1/0 2023-09-06 14:49:15 +02:00
George Kontogiorgos
dfb2786e54 Merge branch 'ICSHWI-12967' into 'dev'
Set startup script to use Kafka broker's SSL port

See merge request epics-modules/adhama!11
2023-07-03 13:45:59 +00:00
George Nicolas Kontogiorgos
cc537075ab Set startup script to use Kafka broker's SSL port 2023-06-16 16:10:55 +02:00
Douglas Araujo
29163e8bae Merge branch 'ICSHWI-12772_frame_rate' into 'dev'
ICSHWI-12772: Evaluate frame rate

See merge request epics-modules/adhama!10
2023-06-07 06:19:35 +00:00
Douglas Araujo
b3d88868ee Merge branch 'ICSHWI-12773_acquision_refactor' into 'dev'
ICSHWI-12773: Acquision Refactor

See merge request epics-modules/adhama!9
2023-06-07 06:18:23 +00:00
Douglas Araujo
8d4e8ee925 Add logic to prevent always to process the PVs on readParameter function 2023-05-30 09:15:59 +02:00
Douglas Araujo
41d69d3ef1 Refactor sensor size and position definitions 2023-05-30 08:34:47 +02:00
Douglas Araujo
374a84971b Fix trigger_mode value to option start 2023-05-25 15:38:22 +02:00
Douglas Araujo
a66877b354 Update the enable/disable EVR softSequencer logic to work with different kinds of acquisition modes 2023-05-24 17:17:07 +02:00
Douglas Araujo
bfd746ac67 Fix acquireTime blocker logic to external trigger 2023-05-24 17:11:29 +02:00
Douglas Araujo
63fc03a41e Add logic to PV AcquirePeriod controls the EVR pulse period 2023-05-24 15:30:47 +02:00
Douglas Araujo
7b73325de8 Remove dcamwait frame since this is done by acquisition epicsThread 2023-05-23 14:59:29 +02:00
Douglas Araujo
25e346e970 Add logic to start and stop evr sequencer 2023-05-23 11:25:22 +02:00
Douglas Araujo
5751c2b703 Add logic to select the correct timestamp source 2023-05-20 09:27:05 +02:00
Douglas Araujo
11a7e3fe9e Add external (EVR) timestamp 2023-05-17 12:32:19 +02:00
Douglas Araujo
882f277114 Add dcambuf_release() function to release the internal receiving buffer in the DCAM module when stop an acquisition 2023-04-03 10:51:35 +02:00
Douglas Araujo
71a97f8170 Merge branch 'ICSHWI-11597' into 'dev'
Icshwi 11597

See merge request epics-modules/adhama!7
2023-03-31 08:14:12 +00:00
Iocuser
545fb7b0ec Add Tomasz's changes 2023-03-31 10:12:04 +02:00
Iocuser
e2368aa113 just update 2023-03-16 20:29:40 +01:00
Lucas Magalhães
45e223e40c Merge branch 'remove_old_makefile' into 'master'
Removing unused/old Makefiles

See merge request epics-modules/adhama!8
2023-03-15 14:46:13 +00:00
Lucas Magalhães
8003d9f75d Add old makefiles to .gitignore 2023-03-15 14:00:08 +00:00
Lucas Magalhães
e2ccdb9b7e Remove unused ADHama.Makefile 2023-03-15 12:30:33 +00:00
Iocuser
b01e13eb77 small update 2023-02-09 09:20:07 +01:00
Iocuser
27dabf4fdc remove comments and old code 2023-02-08 11:33:44 +01:00
Iocuser
ed7881d93c Merge branch 'ICSHWI-11597' of https://gitlab.esss.lu.se/epics-modules/adhama into ICSHWI-11597 2023-02-06 16:43:55 +01:00
Iocuser
b6de30a144 check and update getParameters 2023-02-06 16:37:54 +01:00
Iocuser
e7d48816d2 Add adpluginkafka 2023-02-06 12:51:02 +00:00
Iocuser
7dc9fd7cb3 add readAtributes, readSensor functions 2023-02-06 12:51:02 +00:00
Iocuser
37607c5f23 Add adpluginkafka 2023-02-06 13:20:07 +01:00
Iocuser
90d571bb43 add readAtributes, readSensor functions 2023-02-02 17:21:27 +01:00
Douglas Araujo
c3634f8157 Merge branch 'ICSHWI-11097_frame_rate' into 'dev'
Add frame rate and control to acquire period PV

See merge request epics-modules/adhama!6
2023-02-01 15:16:27 +00:00
Douglas Araujo
4f8962f9e1 Add conditional to not process time parameters when external trigger is activate 2023-01-02 11:56:11 +01:00
Douglas Araujo
ee066ef720 Add frame rate and control to acquire period PV 2022-12-30 17:22:13 +01:00
Douglas Araujo
e15fafea4b Add shared libraries 2022-12-23 11:39:58 +01:00
Iocuser
58aefc799d small fix in trigger out implementation 2022-12-20 14:24:21 +01:00
Iocuser
a4cbf7e909 fix in trigger output, not ready yet... 2022-12-20 10:27:02 +01:00