From f903a072dd048ba60ce7129b1ecd80b93ebb7a6c Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Mon, 4 Nov 2024 19:19:43 -0300 Subject: [PATCH 1/2] MacShift.ENH: include BeamlineCommissioning shift --- pyqt-apps/siriushla/as_ap_machshift/widgets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyqt-apps/siriushla/as_ap_machshift/widgets.py b/pyqt-apps/siriushla/as_ap_machshift/widgets.py index 63f6a7468..99d76acac 100644 --- a/pyqt-apps/siriushla/as_ap_machshift/widgets.py +++ b/pyqt-apps/siriushla/as_ap_machshift/widgets.py @@ -25,12 +25,13 @@ def __init__(self, parent=None, prefix=''): SiriusFrame.Yellow, # Users SiriusFrame.MediumBlue, # Commissioning SiriusFrame.DarkCyan, # Conditioning - SiriusFrame.LightSalmon, # Injection + SiriusFrame.Salmon, # Injection SiriusFrame.LightBlue, # MachineStudy SiriusFrame.MediumGreen, # Maintenance SiriusFrame.LightGray, # Standby SiriusFrame.DarkGray, # Shutdown SiriusFrame.MediumBlue, # MachineStartup + SiriusFrame.LightSalmon, # BeamlineCommissioning ] self.frame = SiriusFrame( self, pvname, From 2a1fdbcf1cf7254e5ee3c14fff83732c50e3bcc4 Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Mon, 4 Nov 2024 19:20:04 -0300 Subject: [PATCH 2/2] Update version to 1.6.0 --- pyqt-apps/siriushla/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyqt-apps/siriushla/VERSION b/pyqt-apps/siriushla/VERSION index bc80560fa..dc1e644a1 100644 --- a/pyqt-apps/siriushla/VERSION +++ b/pyqt-apps/siriushla/VERSION @@ -1 +1 @@ -1.5.0 +1.6.0