search

areaDetector / ADSimDetector

A simulation driver for the EPICS areaDetector software. It contains the example driver and an example IOC directory.
https://areadetector.github.io/areaDetector/ADSimDetector/simDetector.html
Other
2 stars 16 forks source link

PVI #18

Closed GDYendell closed 12 months ago

GDYendell commented 4 years ago

Update simDetector to make use of the updated classes in ADCore and asyn. Split the parameter definitions into simDetectorParamSet and pass the instance to ADDriver to have the parameters created. Parameters access updated to use its paramSet pointer.

For full context see: areaDetector/ADCore#446

MarkRivers commented 4 years ago

This PR has lots of apparent changes. I think these are coming because you removed trailing whitespace before issuing the PR, but subsequently I have removed trailing whitespace in all files on the master branch. This makes it very difficult to see just what files you really changed.

Can you merge master into the dls-controls:pvi branch so these conflicts and apparent changes go away?

MarkRivers commented 4 years ago

I think you should remove the .dls-build-master file.

GDYendell commented 4 years ago

Thanks for making the whitespace changes, that makes things easier. The diff should be clearer now.