[ENH] Fix non-connection on startup for rebooted iocs

[stuwilkins]

The following - tested - will keep trying to reconnect to the camera on startup if the camera indicated that it is not permitted to connect. This adds a 5 to 10s delay to startup but ensures that the camera comes up in a connected state.

This is particularly useful when the IOC is run with procServ and the IOC is hard rebooted.

Note: This is the same as Pull Request #6, with formatting changes

Thanks @bhill-slac!

[stuwilkins]

Hi @MarkRivers, Is this one good to go too? I looked at the conflict and it is just an issue with one line. I can merge and push back up if you like and agree. Once this is in, I am back using master at CSX.

[MarkRivers]

Sounds good, please merge and push back up.

[bhill-slac]

Hi Stuart, Thanks for testing and confirming this! I'm way behind on github updates as I've been out on med leave due to knee replacements.

Cheers,

• Bruce

On 11/1/2015 5:02 AM, Stuart Wilkins wrote:

The following - tested - will keep trying to reconnect to the camera on startup if the camera indicated that it is not permitted to connect. This adds a 5 to 10s delay to startup but ensures that the camera comes up in a connected state.

This is particularly useful when the IOC is run with procServ and the IOC is hard rebooted.

Thanks @bhill-slac https://github.com/bhill-slac!

---

    You can view, comment on, or merge this pull request online at:

https://github.com/areaDetector/ADProsilica/pull/13

    Commit Summary

• Added code to ck for and handle initial no-master status on connection,

• [ENH] Cleaned up startup and added sync of timestamps to connectCamera()

  File Changes

• M prosilicaApp/src/prosilica.cpp https://github.com/areaDetector/ADProsilica/pull/13/files#diff-0 (65)

  Patch Links:

• https://github.com/areaDetector/ADProsilica/pull/13.patch
• https://github.com/areaDetector/ADProsilica/pull/13.diff

— Reply to this email directly or view it on GitHub https://github.com/areaDetector/ADProsilica/pull/13.