Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diamond changes #4

Draft
wants to merge 51 commits into
base: master
Choose a base branch
from
Draft

Diamond changes #4

Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
46c07f4
Removed commonLibraryMakefile from src Makefile (there is no need for…
Jan 11, 2017
6e62e6c
Added default timeouts and address number to db.
Jan 11, 2017
194668b
Replaced all occurances of AREA_DETECTOR with ADCORE
Nov 18, 2016
2b1247a
Formatting changed.
Nov 24, 2016
bee53ef
Refactoring commit:
Nov 24, 2016
a4e3329
More refactoring.
Nov 24, 2016
e6b7da9
More refactoring.
Nov 24, 2016
5d70625
Some more trivial changes.
Nov 25, 2016
1eba091
Removed a few of the unncessary globals, more TODO comments.
Nov 25, 2016
a23b017
Added specializations for the readWrite functions.
Nov 25, 2016
2a1c2b0
More refactoring of the code.
Nov 29, 2016
38eeac4
Refactoring commit.
Dec 8, 2016
5da351a
Removed the ugly result interface I've introduced.
Dec 9, 2016
6dadd94
Minor fixes.
Dec 9, 2016
a7dfac9
Started with refactoring of the readout method.
Dec 9, 2016
98ea7a5
Refactoring of the acquisition method
Dec 12, 2016
e1efb6d
Doxygen comments change, added readout by filters
Jan 3, 2017
ed3c7bb
Removed the non-raw readout as it is the same as raw readout with 24 …
Jan 3, 2017
33071a2
Fixed the serial number handling
Jan 3, 2017
4b457c5
Added double status to remove the possibility for race condition on d…
Jan 3, 2017
41e9338
Moved the commands that are not supported on firmware < 3.
Jan 4, 2017
d1988ee
Refactoring to fully utilize ADCore
Jan 4, 2017
b9a746d
Re-added builder files.
Jan 11, 2017
9ffc251
Added release files for DLS.
Jan 11, 2017
4fb0f98
Added gui
Jan 23, 2017
d35e4bd
Fixed example
Jan 23, 2017
5a2b2e1
Only send -stop once.
Jan 30, 2017
fb3f925
Removed trailing whitespaces.
Feb 16, 2017
9c0ec1f
Bugfixes after first tests.
Feb 20, 2017
f5dc13d
Reimplemented the readout mode change.
Mar 14, 2017
7503149
Fixed the gui and minor bug
Mar 14, 2017
073d047
Readme fixes
Mar 14, 2017
826f9d7
Minor bugfix
Mar 14, 2017
42241a5
Added module.ini
Mar 15, 2017
117378d
Added firmware version and serial to edl screen
Jan 5, 2018
f976b56
Create preset settings records for versions 2 and 3 of the firmware, …
chris-martin-tessella Jul 24, 2018
039c16a
Add automatic mode to the list of presets - modules will set the thre…
chris-martin-tessella Aug 10, 2018
a24f6c5
Merge tag 'R2-0' into dls-master
niamhdougan Apr 23, 2019
69551d2
updating to R3.14.12.7
niamhdougan Apr 23, 2019
678c66a
remove checked in ioc
niamhdougan Apr 23, 2019
c546d6a
auto make example ioc
niamhdougan Apr 23, 2019
6836238
fix asyn conflict
niamhdougan Apr 23, 2019
f1512f4
remove checked in mythenioc, update asyn and adcore
niamhdougan Apr 24, 2019
4f45ef1
revert iocs/makefile
niamhdougan Apr 24, 2019
d231c5b
updating gitignore
niamhdougan Apr 30, 2019
ba9c43c
Merge branch 'dls-master' into merge-check
Aug 8, 2019
c691bf2
Fix missing example ioc used in test build.
Aug 8, 2019
1db8cbd
Rename the serial number PV to prevent conflict with ADCore.
Aug 22, 2019
e22c54f
Merge areaDetector/ADMythen 'master' branch into Diamond's dls-master
ulrikpedersen Feb 13, 2020
1f18164
Removing DLS-specific stuff
ulrikpedersen Feb 13, 2020
094f4b3
Re-adding example mythonIOC from upstream master
ulrikpedersen Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed example
  • Loading branch information
Blaz Kranjc committed Jan 23, 2017
commit d35e4bd2d968f09bd77a92489c0f533f5a0f71cb
4 changes: 2 additions & 2 deletions etc/makeIocs/example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<components arch="linux-x86_64">
<asyn.AsynIP name="MTYH.PORT" port="172.23.88.214:1031"/>
<EPICS_BASE.EpicsEnvSet key="EPICS_CA_MAX_ARRAY_BYTES" value="64008"/>
<ADMythen.mythenDetector IPPORT="MTYH.PORT" P="mythen" PORT="MYTH" R=":"/>
<ADCore.NDStdArrays ADDR="0" FTVL="DOUBLE" NDARRAY_PORT="MYTH" NELEMENTS="1280" P="mythen" PORT="MYTH.ARR" R=":ARR:" TIMEOUT="1" TYPE="Float64"/>
<ADMythen.mythenDetector IPPORT="MTYH.PORT" P="mythen" PORT="MYTH.CAM" R=":"/>
<ADCore.NDStdArrays ADDR="0" FTVL="DOUBLE" NDARRAY_PORT="MYTH.CAM" NELEMENTS="1280" P="mythen" PORT="MYTH.ARR" R=":ARR:" TIMEOUT="1" TYPE="Float64"/>
</components>