Marco Filho
38218b883e
Merge branch 'ICSHWI-22046' into 'master'
...
Overwrite default initial values
See merge request epics-modules/adorca!30
2025-10-15 16:52:00 +02:00
marcofilho
77b5441d23
Overwrite default initial values
2025-10-15 16:48:35 +02:00
marcofilho
7ee6421657
Update example st.cmd
...
From this version onwards, it is possible to pass all the data to
ndpluginschemas and then to kafka newest versions, intead of passing
straight to kafka.
2025-10-15 13:09:47 +02:00
Marco Filho
def770e2f8
Merge branch 'improve-timestamp' into 'master'
...
Pass timestamp to epicsTS instead of timeStamp
See merge request epics-modules/adorca!29
2025-10-15 13:03:58 +02:00
marcofilho
cceb18989b
Make epicsTS carry the proper EVR timestamp
...
epicsTS is the one passed to kafka: https://gitlab.esss.lu.se/epics-modules/ADPluginKafka/-/blob/2.0.2/adpluginkafkaApp/src/KafkaPlugin.cpp?ref_type=tags#L40
The documentation is a bit confusing on what is the difference between
epicsTS and timeStamp, but apparently both can be modified with no
problems.
After [this discussion](github.com/areaDetector/ADCore/issues?q=is%3Aissue%20state%3Aclosed)
I decided it was fine to keep the epicsTS in nanoseconds with the EVR
values.
2025-10-15 13:00:16 +02:00
marcofilho
e2d6d48cde
Decrease image-timestamp latency.
...
The timestamp buffer is now filled unconditionally, always after
dcamcap_transferinfo is called. It is only used, however, if trigger
mode is external.
This reduces time between detecting an image and getting the timestamp
from around 1.6 ms to around 200 ns.
2025-10-10 16:48:07 +02:00
Jim Larsson
62065f7f44
Merge branch 'v1.1.2_fix' into 'master'
...
uncomment line
See merge request epics-modules/adorca!28
2024-12-19 10:49:18 +00:00
Jim Larsson
00cb454e8c
uncomment line
2024-12-19 11:24:08 +01:00
Jim Larsson
66cbff0ca4
Merge branch '1.1.2_bugfixes' into 'master'
...
fix compilation errors and warnings
See merge request epics-modules/adorca!27
2024-12-18 13:17:23 +00:00
Jim Larsson
934ce7afd0
fix compilation errors and warnings
2024-12-18 13:16:44 +00:00
Jim Larsson
47a2b8435f
Merge branch 'ICSHWI_19722_orca_acq_modes' into 'master'
...
Icshwi 19722 orca acq modes
See merge request epics-modules/adorca!26
2024-12-18 13:04:13 +00:00
Jim Larsson
eaebcece9d
added placeholder for LEVEL and sync triggers
2024-12-05 16:21:56 +01:00
Jim Larsson
994242e524
seperate timeout from syncreadout
2024-12-03 14:47:06 +01:00
Douglas Araujo
ca22a8166c
Fix initial value for SensorCooler
2024-10-29 10:57:26 +01:00
Douglas Araujo
6f0f6357be
Fix mbbi item string length
2024-10-29 10:55:30 +01:00
Caissa Roque
325821714a
Merge branch 'temperature-control' into 'master'
...
Temperature control
See merge request epics-modules/adorca!25
2024-10-04 09:03:51 +00:00
Caissa Roque
1abd258517
Fix SensorCooler init value
2024-10-04 09:02:44 +00:00
Caissa Roque
4c0a03fd81
Add sensor cooler
2024-10-04 09:02:44 +00:00
Douglas Araujo
4f29439529
Merge branch 'ICSHWI-1929-fix-evr-properties' into 'master'
...
ICSHWI-19294: Update EVR property names
Closes ICSHWI-19294
See merge request epics-modules/adorca!24
2024-10-02 10:29:59 +00:00
Douglas Araujo
f7410e5473
Update evr property names
2024-09-30 13:53:34 +02:00
Douglas Araujo
6384a20af1
Merge branch 'ICSHWI-11121-tidy-up' into 'master'
...
ICSHWI-11121: Tidyup code
See merge request epics-modules/adorca!23
2024-09-24 07:41:57 +00:00
Douglas Araujo
7e496979ce
Improve internalframe PV desc according DCAM-API
2024-09-23 15:37:33 +02:00
Douglas Araujo
5a14d155e3
Remove duplicate record
2024-09-23 15:23:53 +02:00
Douglas Araujo
429c991544
Remove empty if statement
2024-09-23 14:54:28 +02:00
Douglas Araujo
2d9bb69fb8
Remove unnecessary line
2024-09-23 14:53:15 +02:00
Douglas Araujo
2c23087d04
Improve descriptions
2024-09-23 14:52:29 +02:00
Douglas Araujo
7aacd3e881
Apply dbformat on template file, and add DESC field
2024-09-16 16:31:27 +02:00
Douglas Araujo
343a17ae9f
Replace ao printError calls
2024-09-16 15:28:58 +02:00
Douglas Araujo
49c9eb4c20
Refactor writeFloat64 method
2024-09-16 14:22:38 +02:00
Douglas Araujo
a94ca36d90
Refactor writeInt32 method
2024-09-16 13:16:18 +02:00
Douglas Araujo
587c23cacc
Add ERR message formatter
2024-09-16 13:11:54 +02:00
Douglas Araujo
7ac340473d
Remove disconnect method once that it was only returning true always
2024-09-13 12:01:49 +02:00
Douglas Araujo
52c274d5b2
Remove unused class parameter and update the devOrcaConfig iocsh function
2024-09-13 11:59:44 +02:00
Douglas Araujo
6652bc2264
Remove FLOWs in the constructor
2024-09-13 11:52:45 +02:00
Douglas Araujo
9225d07a0d
Replace printf to asynPrint
2024-09-12 12:59:05 +02:00
Douglas Araujo
481b7722c5
Remove unnecessary prints.
...
In the virtual asynFunctions the infos are available through asynPrint using ASYN_TRACEIO_DRIVER
2024-09-12 12:46:42 +02:00
Douglas Araujo
1ec9ec9f50
Add createAsynParams method to tidy up the constructor
2024-09-12 11:59:37 +02:00
Douglas Araujo
aa7a350688
Remove unused methods
2024-09-12 11:36:56 +02:00
Douglas Araujo
3b0e24798f
Remove commented code
2024-09-12 11:34:51 +02:00
Douglas Araujo
c587eabd00
Merge branch 'ICSHWI-11121-clang-format' into 'master'
...
Apply clang-format following google standards
See merge request epics-modules/adorca!22
2024-09-11 15:14:46 +00:00
Douglas Araujo
15fd21a1e0
Apply clang-format following google standards
2024-09-11 17:06:38 +02:00
marcofilho
2c951811fc
Merge branch 'remove-alarms'
...
Remove alarms when acquisition is aborted according to request in https://jira.esss.lu.se/browse/ECDC-4185
2024-09-06 14:18:15 +02:00
marcofilho
db6ce72e1d
Remove alarm severity when acq aborted.
...
As discussed in ECDC-4185
2024-09-06 14:04:27 +02:00
Marco Filho
081d5bfdd5
Merge branch 'ICSHWI-19117-fix-false-warning' into 'master'
...
Fix false alarm problem
Closes ICSHWI-19117
See merge request epics-modules/adorca!21
2024-08-26 15:03:55 +00:00
marcofilho
634c3b12ba
Fix false warning raise.
...
Fix concurrency problem.
Before this commit, if acquisition was aborted by user before the imagetask had
passed through the conditional
`if ((epicsTimeDiffInSeconds(¤tAcqTime, &prevAcqTime) > maxAcqusitionTime)`, condition would evaluate to true
and raise a warning saying that the acquisition timed out, which is not true.
After this, condition evaluates to false and no alarm is raised.
Tested several acquisitions and this does not seem to compromise the control flow.
It seems to work both with internal and with external triggers.
2024-08-26 16:48:24 +02:00
marcofilho
4bc89278fe
Update makefile
...
Makefile was using old e3 directives. I copied the makefile from the recipe.
2024-08-26 16:46:57 +02:00
Jim Larsson
acff3aedc0
Merge branch '0.1.0_fix' into 'master'
...
Fix OOPT error
See merge request epics-modules/adorca!19
2024-06-20 08:56:06 +00:00
Jim Larsson
bf9dccedc6
Fix OOPT error
2024-06-20 08:54:56 +00:00
Marco Antonio Barra Montevechi Filho
e7c34375ee
Merge dev into master
...
According to this MR:
https://gitlab.esss.lu.se/epics-modules/adorca/-/merge_requests/18 it
seems dev branch has been extensively used in the last few months. The
recipe is using the dev branch:
https://gitlab.esss.lu.se/e3/recipes/adorca-recipe/-/blob/master/recipe/meta.yaml?ref_type=heads
so merging it into master shouldn't break anything. It's just a sync
after some development time.
I initially thought about merging master into dev first to solve the
small conflict in .gitignore but then this would be acessible to the
recipe.
After this maybe we should update the recipe?
2024-06-17 17:44:59 +02:00
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
