Diamond Light Source has been operational since 2007 and expanded to now include around 32 photon beamlines, each with its own unique set of instrumentation and capabilities. All of these are operating with EPICS Controls Systems. This talk gives an overview and status of the current controls systems in production at Diamond.
The future of Diamond is envisaged to include a major upgrade, commonly known as Diamond-II. This upgrade will be replacing the existing machine with a new 4th generation accelerator along with upgrades to existing beamline and a new suite of flagship beamlines, ensuring that Diamond will remain a world-class facility. This talk will include current ideas and plans to evolve and upgrade the Controls Systems for Diamond-II.