lin-epics-modules/adorca
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143 Commits 2 Branches 10 Tags
eaebcece9da8a59c848cd997e25f0555ae9ae080
Commit Graph

143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 1.1.1 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
1.1.0 		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
1.0.2 		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
1.0.1 		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(&currentAcqTime, &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
1.0.0 		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
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