From dee393457b3712d847db3d426aece29f2d2ca045 Mon Sep 17 00:00:00 2001 From: HannahCawley Date: Wed, 25 Jan 2023 16:04:38 +0000 Subject: [PATCH 01/10] create inital OPI for wish automatic needle valve --- .../resources/opi_info.xml | 10 + .../resources/wish_automatic_needle_valve.opi | 1775 +++++++++++++++++ 2 files changed, 1785 insertions(+) create mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index d29720bada..7e62f8a25d 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2916,6 +2916,16 @@ + + WISH Automatic Needle Valve + + UNKNOWN + wish_automatic_needle_valve.opi + WISH Automatic Needle Valve + + + + Tektronix AFG3000 diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi new file mode 100644 index 0000000000..0834b9d0cf --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi @@ -0,0 +1,1775 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0 + + + + 6 + 600 + + true + + + + + true + true + true + true + true + Display + 800 + -6c70a930:185e92885a4:-7fd3 + -1 + -1 + + + false + + + + + + + 0 + 1 + true + + ISIS_Header1_NEW + + + + + 37 + 0 + Title_Label + + + true + true + false + + + false + WISH Automatic Needle Valve + + false + 1 + true + Label + 367 + true + -6c70a930:185e92885a4:-7eac + 12 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Header2_NEW + + + + + 37 + 0 + Name_Label + + + true + true + false + + + false + $(NAME) + + false + 1 + true + Label + 775 + true + -6c70a930:185e92885a4:-7ea4 + 12 + 42 + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 102 + false + + true + + Mode + + + true + true + false + + + true + + false + true + Grouping Container + 373 + -6c70a930:185e92885a4:-7d2e + 6 + 84 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 0 + Flow_setpoint_mode_Label + + + true + true + false + + + false + Flow Setpoint mode: + + false + 1 + true + Label + 121 + true + -6c70a930:185e92885a4:-7b6e + 12 + 9 + + + + false + false + + + + true + + + + 0 + 1 + true + + Default + + false + + + + 25 + true + + Automatic + Manual + + false + Flow_setpoint_mode_Choice_Button + + + + + true + true + false + + + + + + $(pv_name) +$(pv_value) + true + Choice Button + 194 + -6c70a930:185e92885a4:-7d14 + 144 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 0 + Manager_mode_Label + + + true + true + false + + + false + Manager mode enabled? (required for writing) + + false + 1 + true + Label + 258 + true + -6c70a930:185e92885a4:-7c69 + 12 + 42 + + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 24 + Manager_mode_LED + + + + OFF + + + + ON + $(P)CS:MANAGER + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 24 + -6c70a930:185e92885a4:-7c68 + 314 + 40 + + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 265 + false + + true + + Flow + + + true + true + false + + + true + + false + true + Grouping Container + 372 + -6c70a930:185e92885a4:-7d7e + 6 + 192 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Flow_Label + + + true + true + false + + + false + Manual flow: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7c5a + 18 + 12 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Flow_SP_RBV_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7c59 + 132 + 12 + + + + false + false + false + + + + false + + + + 3 + 1 + + false + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Flow_SP_RBV_Text_Input + 0 + true + + + 0.0 + + + + true + + $(P)CS:MANAGER + + + + true + true + false + + + 0 + true + + 0.0 + $(pv_name) +$(pv_value) + false + true + Text Input + 90 + -6c70a930:185e92885a4:-7c58 + 216 + 12 + + + + false + 255 + true + 20 + 0 + false + + + + false + + + + 0 + 1 + true + true + 0.0 + + Default + + false + + + + 1 + true + 0 + 1 + Setpoint_Polyline + + + + + + + 0.0 + + + true + true + true + + + $(pv_name) +$(pv_value) + false + true + Polyline + 312 + ebaac8:185e95ee376:-7e26 + 6 + 42 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Flow_Label + + + true + true + false + + + false + Flow low limit: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7c27 + 18 + 54 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Flow_SP_RBV_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7c26 + 132 + 54 + + + + false + false + false + + + + false + + + + 3 + 1 + + false + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Flow_SP_RBV_Text_Input + 0 + true + + + 0.0 + + + + true + + $(P)CS:MANAGER + + + + true + true + false + + + 0 + true + + 0.0 + $(pv_name) +$(pv_value) + false + true + Text Input + 90 + -6c70a930:185e92885a4:-7c25 + 216 + 54 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Flow_Label_2 + + + true + true + false + + + false + Flow high limit: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7c1c + 18 + 84 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Flow_SP_RBV_Text_Update_2 + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7c1b + 132 + 84 + + + + false + false + false + + + + false + + + + 3 + 1 + + false + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Flow_SP_RBV_Text_Input_2 + 0 + true + + + 0.0 + + + + true + + $(P)CS:MANAGER + + + + true + true + false + + + 0 + true + + 0.0 + $(pv_name) +$(pv_value) + false + true + Text Input + 90 + -6c70a930:185e92885a4:-7c1a + 216 + 84 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 31 + 2 + Flow_rbv_Label + + + true + true + false + + + false + "Flow" flow readback: + + false + 1 + true + Label + 108 + true + ebaac8:185e95ee376:-7e0f + 6 + 114 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Flow_rbv_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + ebaac8:185e95ee376:-7e0e + 132 + 114 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Valve_direction_Label + + + true + true + false + + + false + Valve direction: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7b56 + 18 + 156 + + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 20 + Valve_dir_LED + + + + OFF + + + + ON + + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 20 + -6c70a930:185e92885a4:-7b52 + 132 + 156 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_Small + + + + + 20 + 0 + Valve_dir_Label + + + true + true + false + + + false + $direction + + false + 1 + true + Label + 96 + true + ebaac8:185e95ee376:-7e3a + 213 + 156 + + + + false + 255 + true + 20 + 0 + false + + + + false + + + + 0 + 1 + true + true + 0.0 + + Default + + false + + + + 1 + true + 0 + 1 + Setpoint_Polyline + + + + + + + 0.0 + + + true + true + true + + + $(pv_name) +$(pv_value) + false + true + Polyline + 311 + -6c70a930:185e92885a4:-7c12 + 6 + 186 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Temp_Label + + + true + true + false + + + false + Temperature: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7c4f + 18 + 198 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Temp_SP_RBV_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7c4e + 132 + 198 + + + + false + false + false + + + + false + + + + 3 + 1 + + false + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Temp_SP_RBV_Text_Input + 0 + true + + + 0.0 + + + + true + + $(P)CS:MANAGER + + + + true + true + false + + + 0 + true + + 0.0 + $(pv_name) +$(pv_value) + false + true + Text Input + 90 + -6c70a930:185e92885a4:-7c45 + 216 + 198 + + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 163 + false + + true + + IP Addresses + + + true + true + false + + + true + + false + true + Grouping Container + 337 + -6c70a930:185e92885a4:-7b9b + 390 + 84 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + IP_addr_1_Label + + + true + true + false + + + false + IP Address 1: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7b9a + 18 + 12 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + IP_address_1_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7b99 + 132 + 12 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + IP_addr_2_Label + + + true + true + false + + + false + IP Address 2: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7b83 + 18 + 42 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + IP_address_2_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7b82 + 132 + 42 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + IP_addr_3_Label + + + true + true + false + + + false + IP Address 3: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7b77 + 18 + 72 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + IP_address_3_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7b76 + 132 + 72 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + IP_addr_4_Label + + + true + true + false + + + false + IP Address 4: + + false + 1 + true + Label + 96 + true + -6c70a930:185e92885a4:-7b47 + 18 + 102 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + IP_address_4_Text_Update + 0 + true + + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -6c70a930:185e92885a4:-7b46 + 132 + 102 + + + \ No newline at end of file From 21a312729adb864a25493b97851dfb168595e9c3 Mon Sep 17 00:00:00 2001 From: HannahCawley Date: Mon, 13 Feb 2023 14:01:24 +0000 Subject: [PATCH 02/10] Connect to basic PVs --- .../resources/wish_automatic_needle_valve.opi | 274 +++++++++--------- 1 file changed, 141 insertions(+), 133 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi index 0834b9d0cf..eca8c17017 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi @@ -18,6 +18,7 @@ 600 true + $(P)EUROTHRM_01:A01: @@ -218,13 +219,9 @@ 25 true - - Automatic - Manual - - false + true Flow_setpoint_mode_Choice_Button - + $(PV_ROOT)FLOW_SP_MODE_SELECT @@ -363,7 +360,7 @@ $(pv_value) - 265 + 271 false true @@ -414,6 +411,99 @@ $(pv_value) false + Flow: + + false + 1 + true + Label + 96 + true + 699302c9:18631f8a2ab:-7fd1 + 18 + 18 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Flow_SP_RBV_Text_Update + 0 + true + $(PV_ROOT)FLOW + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + 699302c9:18631f8a2ab:-7fd0 + 132 + 18 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Manual_flow_Label + + + true + true + false + + + false Manual flow: false @@ -424,7 +514,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7c5a 18 - 12 + 54 @@ -451,10 +541,10 @@ $(pv_value) 0 20 0 - Flow_SP_RBV_Text_Update + Manual_flow_SP_RBV_Text_Update 0 true - + $(PV_ROOT)MANUAL_FLOW 0.0 @@ -476,7 +566,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c59 132 - 12 + 54 @@ -508,10 +598,10 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Flow_SP_RBV_Text_Input + Manual_flow_SP_RBV_Text_Input 0 true - + $(PV_ROOT)MANUAL_FLOW:SP 0.0 @@ -540,7 +630,7 @@ $(pv_value) 90 -6c70a930:185e92885a4:-7c58 216 - 12 + 54 @@ -575,8 +665,8 @@ $(pv_value) 1 Setpoint_Polyline - - + + @@ -596,7 +686,7 @@ $(pv_value) 312 ebaac8:185e95ee376:-7e26 6 - 42 + 84 @@ -637,7 +727,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7c27 18 - 54 + 96 @@ -667,7 +757,7 @@ $(pv_value) Flow_SP_RBV_Text_Update 0 true - + $(PV_ROOT)FLOW_LOW_LIM 0.0 @@ -689,7 +779,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c26 132 - 54 + 96 @@ -724,7 +814,7 @@ $(pv_value) Flow_SP_RBV_Text_Input 0 true - + $(PV_ROOT)FLOW_LOW_LIM:SP 0.0 @@ -753,7 +843,7 @@ $(pv_value) 90 -6c70a930:185e92885a4:-7c25 216 - 54 + 96 @@ -794,7 +884,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7c1c 18 - 84 + 126 @@ -846,7 +936,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c1b 132 - 84 + 126 @@ -910,100 +1000,7 @@ $(pv_value) 90 -6c70a930:185e92885a4:-7c1a 216 - 84 - - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 31 - 2 - Flow_rbv_Label - - - true - true - false - - - false - "Flow" flow readback: - - false - 1 - true - Label - 108 - true - ebaac8:185e95ee376:-7e0f - 6 - 114 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - Flow_rbv_Text_Update - 0 - true - - - 0.0 - - - true - true - false - - - true - ###### - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 85 - false - ebaac8:185e95ee376:-7e0e - 132 - 114 + 126 @@ -1084,7 +1081,7 @@ $(pv_value) ON - + $(PV_ROOT)VALVE_DIR @@ -1104,12 +1101,15 @@ $(pv_value) 132 156 - + + false false + false + true @@ -1117,14 +1117,21 @@ $(pv_value) 1 true - ISIS_Label_Small + ISIS_Value_NEW + false + 0 20 0 - Valve_dir_Label + Valve_dir_Text_Update + 0 + true + $(PV_ROOT)VALVE_DIR + + 0.0 true @@ -1132,17 +1139,18 @@ $(pv_value) false - false - $direction - - false + true + ###### + $(pv_name) +$(pv_value) + true 1 true - Label - 96 - true - ebaac8:185e95ee376:-7e3a - 213 + Text Update + 85 + false + 699302c9:18631f8a2ab:-7fc8 + 218 156 @@ -1270,7 +1278,7 @@ $(pv_value) Temp_SP_RBV_Text_Update 0 true - + $(PV_ROOT)TEMP:SP:RBV 0.0 @@ -1327,7 +1335,7 @@ $(pv_value) Temp_SP_RBV_Text_Input 0 true - + $(PV_ROOT)TEMP:SP 0.0 From a0e65de18472c53cedf561c2e42855dd483972f7 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 6 Feb 2023 16:05:43 +0000 Subject: [PATCH 03/10] update target platform to pydev branch for disabling autocomplete --- .../targetplatform.target | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index bdac125638..33c23871d8 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -59,12 +59,6 @@ - - - - - - @@ -227,7 +221,7 @@ - + com.google.code.gson @@ -237,6 +231,11 @@ + + + + + linux From 014368366381820107500425256ffbd5938f7b25 Mon Sep 17 00:00:00 2001 From: HannahCawley Date: Thu, 16 Feb 2023 10:27:04 +0000 Subject: [PATCH 04/10] Minor changes and add rules for writing --- .../resources/wish_automatic_needle_valve.opi | 584 ++++++------------ 1 file changed, 172 insertions(+), 412 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi index eca8c17017..48f5c2ae96 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi @@ -133,7 +133,7 @@ - 102 + 139 false true @@ -196,9 +196,69 @@ 12 9 - + false + false + false + + + + true + + + + 0 + 1 + true + + + + false + + + + 0 + 20 + 0 + Flow_SP_mode_Text_Update + 0 + true + $(PV_ROOT)FLOW_SP_MODE_SELECT + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -3fe86e35:1864f8abbd8:-7921 + 144 + 9 + + + + + $(PV_ROOT)FLOW_SP_MODE_SELECT + + 10 + + + + + false false @@ -240,7 +300,7 @@ $(pv_value) 194 -6c70a930:185e92885a4:-7d14 144 - 6 + 36 @@ -271,17 +331,17 @@ $(pv_value) false - Manager mode enabled? (required for writing) + Manager mode enabled? false 1 true Label - 258 + 145 true -6c70a930:185e92885a4:-7c69 12 - 42 + 74 @@ -338,8 +398,49 @@ $(pv_value) LED 24 -6c70a930:185e92885a4:-7c68 - 314 - 40 + 300 + 72 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 0 + Manager_mode_Label_1 + + + true + true + false + + + false + (required for writing) + + false + 1 + true + Label + 127 + true + -3fe86e35:1864f8abbd8:-7913 + 156 + 74 @@ -360,7 +461,7 @@ $(pv_value) - 271 + 277 false true @@ -378,10 +479,10 @@ $(pv_value) false true Grouping Container - 372 + 373 -6c70a930:185e92885a4:-7d7e 6 - 192 + 228 false @@ -448,7 +549,7 @@ $(pv_value) 0 20 0 - Flow_SP_RBV_Text_Update + Flow_Text_Update 0 true $(PV_ROOT)FLOW @@ -514,7 +615,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7c5a 18 - 54 + 48 @@ -541,7 +642,7 @@ $(pv_value) 0 20 0 - Manual_flow_SP_RBV_Text_Update + Manual_flow_Text_Update 0 true $(PV_ROOT)MANUAL_FLOW @@ -566,7 +667,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c59 132 - 54 + 48 @@ -598,18 +699,19 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Manual_flow_SP_RBV_Text_Input + Manual_flow_Text_Input 0 true $(PV_ROOT)MANUAL_FLOW:SP 0.0 - - + + true $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT @@ -629,8 +731,8 @@ $(pv_value) Text Input 90 -6c70a930:185e92885a4:-7c58 - 216 - 54 + 227 + 48 @@ -665,7 +767,7 @@ $(pv_value) 1 Setpoint_Polyline - + @@ -683,7 +785,7 @@ $(pv_value) false true Polyline - 312 + 325 ebaac8:185e95ee376:-7e26 6 84 @@ -717,17 +819,17 @@ $(pv_value) false - Flow low limit: + Flow SP low limit: false 1 true Label - 96 + 108 true -6c70a930:185e92885a4:-7c27 - 18 - 96 + 6 + 102 @@ -754,10 +856,10 @@ $(pv_value) 0 20 0 - Flow_SP_RBV_Text_Update + Flow_lowlim_Text_Update 0 true - $(PV_ROOT)FLOW_LOW_LIM + $(PV_ROOT)FLOW_SP_LOWLIM 0.0 @@ -779,7 +881,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c26 132 - 96 + 102 @@ -811,15 +913,15 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Flow_SP_RBV_Text_Input + Flow_lowlim_Text_Input 0 true - $(PV_ROOT)FLOW_LOW_LIM:SP + $(PV_ROOT)FLOW_SP_LOWLIM:SP 0.0 - - + + true $(P)CS:MANAGER @@ -842,8 +944,8 @@ $(pv_value) Text Input 90 -6c70a930:185e92885a4:-7c25 - 216 - 96 + 227 + 102 @@ -874,17 +976,17 @@ $(pv_value) false - Flow high limit: + Flow SP high limit: false 1 true Label - 96 + 108 true -6c70a930:185e92885a4:-7c1c - 18 - 126 + 6 + 132 @@ -911,10 +1013,10 @@ $(pv_value) 0 20 0 - Flow_SP_RBV_Text_Update_2 + Flow_hilim_Text_Update_2 0 true - + $(PV_ROOT)FLOW_SP_HILIM 0.0 @@ -936,71 +1038,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c1b 132 - 126 - - - - false - false - false - - - - false - - - - 3 - 1 - - false - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - false - 1.7976931348623157E308 - -1.7976931348623157E308 - false - Flow_SP_RBV_Text_Input_2 - 0 - true - - - 0.0 - - - - true - - $(P)CS:MANAGER - - - - true - true - false - - - 0 - true - - 0.0 - $(pv_name) -$(pv_value) - false - true - Text Input - 90 - -6c70a930:185e92885a4:-7c1a - 216 - 126 + 132 @@ -1041,7 +1079,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7b56 18 - 156 + 162 @@ -1098,8 +1136,8 @@ $(pv_value) LED 20 -6c70a930:185e92885a4:-7b52 - 132 - 156 + 227 + 162 @@ -1150,8 +1188,8 @@ $(pv_value) 85 false 699302c9:18631f8a2ab:-7fc8 - 218 - 156 + 132 + 162 @@ -1186,8 +1224,8 @@ $(pv_value) 1 Setpoint_Polyline - - + + @@ -1204,10 +1242,10 @@ $(pv_value) false true Polyline - 311 + 325 -6c70a930:185e92885a4:-7c12 6 - 186 + 192 @@ -1248,7 +1286,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7c4f 18 - 198 + 210 @@ -1300,7 +1338,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c4e 132 - 198 + 210 @@ -1332,18 +1370,19 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Temp_SP_RBV_Text_Input + Manual_flow_Text_Input 0 true $(PV_ROOT)TEMP:SP 0.0 - - + + true $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT @@ -1362,9 +1401,9 @@ $(pv_value) true Text Input 90 - -6c70a930:185e92885a4:-7c45 - 216 - 198 + 7eabd1c5:18655c11206:-7fd3 + 227 + 210 @@ -1385,7 +1424,7 @@ $(pv_value) - 163 + 79 false true @@ -1403,10 +1442,10 @@ $(pv_value) false true Grouping Container - 337 + 372 -6c70a930:185e92885a4:-7b9b - 390 - 84 + 7 + 510 false @@ -1427,7 +1466,7 @@ $(pv_value) 20 2 - IP_addr_1_Label + IP_addr_Label true @@ -1436,16 +1475,16 @@ $(pv_value) false - IP Address 1: + Engineering Port IP Address: false 1 true Label - 96 + 157 true -6c70a930:185e92885a4:-7b9a - 18 + 12 12 @@ -1473,7 +1512,7 @@ $(pv_value) 0 20 0 - IP_address_1_Text_Update + IP_address_Text_Update 0 true @@ -1497,287 +1536,8 @@ $(pv_value) 85 false -6c70a930:185e92885a4:-7b99 - 132 + 180 12 - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 20 - 2 - IP_addr_2_Label - - - true - true - false - - - false - IP Address 2: - - false - 1 - true - Label - 96 - true - -6c70a930:185e92885a4:-7b83 - 18 - 42 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - IP_address_2_Text_Update - 0 - true - - - 0.0 - - - true - true - false - - - true - ###### - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 85 - false - -6c70a930:185e92885a4:-7b82 - 132 - 42 - - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 20 - 2 - IP_addr_3_Label - - - true - true - false - - - false - IP Address 3: - - false - 1 - true - Label - 96 - true - -6c70a930:185e92885a4:-7b77 - 18 - 72 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - IP_address_3_Text_Update - 0 - true - - - 0.0 - - - true - true - false - - - true - ###### - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 85 - false - -6c70a930:185e92885a4:-7b76 - 132 - 72 - - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 20 - 2 - IP_addr_4_Label - - - true - true - false - - - false - IP Address 4: - - false - 1 - true - Label - 96 - true - -6c70a930:185e92885a4:-7b47 - 18 - 102 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - IP_address_4_Text_Update - 0 - true - - - 0.0 - - - true - true - false - - - true - ###### - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 85 - false - -6c70a930:185e92885a4:-7b46 - 132 - 102 - \ No newline at end of file From 733ea64d72754af718f0c8d93775a73b55dce855 Mon Sep 17 00:00:00 2001 From: HannahCawley Date: Tue, 14 Mar 2023 14:15:57 +0000 Subject: [PATCH 05/10] Remove IP address, add TEMP box --- .../resources/opi_info.xml | 13 +- .../resources/wish_automatic_needle_valve.opi | 181 +++++++----------- 2 files changed, 82 insertions(+), 112 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 7e62f8a25d..7c3cd8af1c 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2922,7 +2922,18 @@ UNKNOWN wish_automatic_needle_valve.opi WISH Automatic Needle Valve - + + + EURO + The Eurotherm PV prefix (e.g. EUROTHRM_01). + EUROTHRM_01 + + + SENSOR + The temperature sensor number (e.g. 1). + 1 + + diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi index 48f5c2ae96..279ea4705b 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi @@ -18,7 +18,7 @@ 600 true - $(P)EUROTHRM_01:A01: + $(P)$(EURO):A0$(SENSOR): @@ -248,60 +248,6 @@ $(pv_value) 144 9 - - - - $(PV_ROOT)FLOW_SP_MODE_SELECT - - 10 - - - - - false - false - - - - true - - - - 0 - 1 - true - - Default - - false - - - - 25 - true - true - Flow_setpoint_mode_Choice_Button - $(PV_ROOT)FLOW_SP_MODE_SELECT - - - - true - true - false - - - - - - $(pv_name) -$(pv_value) - true - Choice Button - 194 - -6c70a930:185e92885a4:-7d14 - 144 - 36 - false @@ -442,6 +388,60 @@ $(pv_value) 156 74 + + + + $(PV_ROOT)FLOW_SP_MODE_SELECT + + 10 + + + + + false + false + + + + true + + + + 0 + 1 + true + + Default + + false + + + + 25 + true + true + Flow_setpoint_mode_Choice_Button + $(PV_ROOT)FLOW_SP_MODE_SELECT:SP + + + + true + true + false + + + + + + $(pv_name) +$(pv_value) + true + Choice Button + 194 + -6c70a930:185e92885a4:-7d14 + 144 + 36 + @@ -461,7 +461,7 @@ $(pv_value) - 277 + 319 false true @@ -1267,7 +1267,7 @@ $(pv_value) 20 2 - Temp_Label + Temp_SP_Label true @@ -1276,7 +1276,7 @@ $(pv_value) false - Temperature: + Temp Setpoint: false 1 @@ -1370,7 +1370,7 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Manual_flow_Text_Input + Temp_SP_Text_Input 0 true $(PV_ROOT)TEMP:SP @@ -1405,47 +1405,6 @@ $(pv_value) 227 210 - - - - - - - - - - 13 - 1 - true - false - - ISIS_GroupBox_NEW - - - - - 79 - false - - true - - IP Addresses - - - true - true - false - - - true - - false - true - Grouping Container - 372 - -6c70a930:185e92885a4:-7b9b - 7 - 510 false @@ -1466,7 +1425,7 @@ $(pv_value) 20 2 - IP_addr_Label + Temp_Label true @@ -1475,17 +1434,17 @@ $(pv_value) false - Engineering Port IP Address: + Temperature: false 1 true Label - 157 + 96 true - -6c70a930:185e92885a4:-7b9a - 12 - 12 + -632252ef:186bb56c0bf:-3516 + 18 + 240 @@ -1512,10 +1471,10 @@ $(pv_value) 0 20 0 - IP_address_Text_Update + Temp_Text_Update 0 true - + $(PV_ROOT)TEMP 0.0 @@ -1535,9 +1494,9 @@ $(pv_value) Text Update 85 false - -6c70a930:185e92885a4:-7b99 - 180 - 12 + -632252ef:186bb56c0bf:-3515 + 132 + 240 \ No newline at end of file From 110759979408013f8e5b69f81516920d515f5829 Mon Sep 17 00:00:00 2001 From: HannahCawley Date: Mon, 17 Apr 2023 18:21:46 +0100 Subject: [PATCH 06/10] Rename OPI, tidy property names, make rules consistent --- ...e_valve.opi => automatic_needle_valve.opi} | 853 +++++++++++++----- .../resources/opi_info.xml | 6 +- 2 files changed, 630 insertions(+), 229 deletions(-) rename base/uk.ac.stfc.isis.ibex.opis/resources/{wish_automatic_needle_valve.opi => automatic_needle_valve.opi} (73%) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi similarity index 73% rename from base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi rename to base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi index 279ea4705b..abc3f0c5ac 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/wish_automatic_needle_valve.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi @@ -62,13 +62,13 @@ false - WISH Automatic Needle Valve + Automatic Needle Valve Controller false 1 true Label - 367 + 463 true -6c70a930:185e92885a4:-7eac 12 @@ -109,7 +109,7 @@ 1 true Label - 775 + 367 true -6c70a930:185e92885a4:-7ea4 12 @@ -221,7 +221,7 @@ 0 20 0 - Flow_SP_mode_Text_Update + Flow_SP_mode_RBV 0 true $(PV_ROOT)FLOW_SP_MODE_SELECT @@ -242,7 +242,7 @@ $(pv_value) 1 true Text Update - 85 + 90 false -3fe86e35:1864f8abbd8:-7921 144 @@ -389,15 +389,7 @@ $(pv_value) 74 - - - $(PV_ROOT)FLOW_SP_MODE_SELECT - - 10 - - - - + false false @@ -417,10 +409,10 @@ $(pv_value) - 25 + 28 true true - Flow_setpoint_mode_Choice_Button + mode_button $(PV_ROOT)FLOW_SP_MODE_SELECT:SP @@ -437,8 +429,8 @@ $(pv_value) $(pv_value) true Choice Button - 194 - -6c70a930:185e92885a4:-7d14 + 133 + 4ec5f80:1872cc883d3:-795b 144 36 @@ -461,7 +453,7 @@ $(pv_value) - 319 + 229 false true @@ -549,7 +541,7 @@ $(pv_value) 0 20 0 - Flow_Text_Update + Flow_RBV 0 true $(PV_ROOT)FLOW @@ -642,7 +634,7 @@ $(pv_value) 0 20 0 - Manual_flow_Text_Update + Manual_flow_RBV 0 true $(PV_ROOT)MANUAL_FLOW @@ -677,7 +669,7 @@ $(pv_value) - false + true @@ -699,15 +691,33 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Manual_flow_Text_Input + Manual_flow_SP 0 true $(PV_ROOT)MANUAL_FLOW:SP 0.0 - - + + + + + + + $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT + + + + + + + + $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT + + + true $(P)CS:MANAGER @@ -767,8 +777,8 @@ $(pv_value) 1 Setpoint_Polyline - - + + @@ -788,7 +798,7 @@ $(pv_value) 325 ebaac8:185e95ee376:-7e26 6 - 84 + 114 @@ -829,7 +839,7 @@ $(pv_value) true -6c70a930:185e92885a4:-7c27 6 - 102 + 78 @@ -856,7 +866,7 @@ $(pv_value) 0 20 0 - Flow_lowlim_Text_Update + Flow_lowlim_RBV 0 true $(PV_ROOT)FLOW_SP_LOWLIM @@ -881,7 +891,7 @@ $(pv_value) false -6c70a930:185e92885a4:-7c26 132 - 102 + 78 @@ -891,7 +901,7 @@ $(pv_value) - false + true @@ -913,7 +923,7 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Flow_lowlim_Text_Input + Flow_lowlim_SP 0 true $(PV_ROOT)FLOW_SP_LOWLIM:SP @@ -926,6 +936,22 @@ $(pv_value) $(P)CS:MANAGER + + + + + + + $(P)CS:MANAGER + + + + + + + + $(P)CS:MANAGER + true @@ -945,100 +971,7 @@ $(pv_value) 90 -6c70a930:185e92885a4:-7c25 227 - 102 - - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 20 - 2 - Flow_Label_2 - - - true - true - false - - - false - Flow SP high limit: - - false - 1 - true - Label - 108 - true - -6c70a930:185e92885a4:-7c1c - 6 - 132 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - Flow_hilim_Text_Update_2 - 0 - true - $(PV_ROOT)FLOW_SP_HILIM - - 0.0 - - - true - true - false - - - true - ###### - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 85 - false - -6c70a930:185e92885a4:-7c1b - 132 - 132 + 78 @@ -1164,7 +1097,7 @@ $(pv_value) 0 20 0 - Valve_dir_Text_Update + Valve_dir_RBV 0 true $(PV_ROOT)VALVE_DIR @@ -1191,62 +1124,6 @@ $(pv_value) 132 162 - - - false - 255 - true - 20 - 0 - false - - - - false - - - - 0 - 1 - true - true - 0.0 - - Default - - false - - - - 1 - true - 0 - 1 - Setpoint_Polyline - - - - - - - 0.0 - - - true - true - true - - - $(pv_name) -$(pv_value) - false - true - Polyline - 325 - -6c70a930:185e92885a4:-7c12 - 6 - 192 - false @@ -1267,7 +1144,7 @@ $(pv_value) 20 2 - Temp_SP_Label + Stop_Label true @@ -1276,17 +1153,17 @@ $(pv_value) false - Temp Setpoint: + Needle valve stop: false 1 true Label - 96 + 108 true - -6c70a930:185e92885a4:-7c4f - 18 - 210 + 2cad3757:186e08b90f4:-5d6f + 6 + 132 @@ -1313,10 +1190,10 @@ $(pv_value) 0 20 0 - Temp_SP_RBV_Text_Update + Stop_RBV 0 true - $(PV_ROOT)TEMP:SP:RBV + $(PV_ROOT)NEEDLE_VALVE_STOP 0.0 @@ -1336,9 +1213,9 @@ $(pv_value) Text Update 85 false - -6c70a930:185e92885a4:-7c4e + 2cad3757:186e08b90f4:-5d6e 132 - 210 + 132 @@ -1348,7 +1225,7 @@ $(pv_value) - false + true @@ -1370,19 +1247,34 @@ $(pv_value) 1.7976931348623157E308 -1.7976931348623157E308 false - Temp_SP_Text_Input + Stop_SP_SP 0 true - $(PV_ROOT)TEMP:SP + $(PV_ROOT)NEEDLE_VALVE_STOP:SP 0.0 - + true $(P)CS:MANAGER - $(PV_ROOT)FLOW_SP_MODE_SELECT + + + + + + + + $(P)CS:MANAGER + + + + + + + + $(P)CS:MANAGER @@ -1401,16 +1293,60 @@ $(pv_value) true Text Input 90 - 7eabd1c5:18655c11206:-7fd3 + 2cad3757:186e08b90f4:-5d6d 227 - 210 + 132 - + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 181 + false + + true + + Temperature Control + + + true + true + false + + + false + + false + true + Grouping Container + 355 + 4ec5f80:1872cc883d3:-7ef8 + 384 + 228 + + false false + false + true @@ -1418,14 +1354,21 @@ $(pv_value) 1 true - ISIS_Label_NEW + ISIS_Value_NEW + false - 20 - 2 - Temp_Label + 0 + 19 + 0 + Temperature_RBV + 3 + false + $(PV_ROOT)TEMP + + 0.0 true @@ -1433,18 +1376,19 @@ $(pv_value) false - false - Temperature: - + false + ###### + $(pv_name) +$(pv_value) false 1 true - Label - 96 - true - -632252ef:186bb56c0bf:-3516 - 18 - 240 + Text Update + 80 + false + 4ec5f80:1872cc883d3:-7ef7 + 123 + 18 @@ -1469,12 +1413,12 @@ $(pv_value) 0 - 20 + 19 0 - Temp_Text_Update - 0 - true - $(PV_ROOT)TEMP + Setpoint_RBV + 3 + false + $(PV_ROOT)TEMP:SP:RBV 0.0 @@ -1484,19 +1428,476 @@ $(pv_value) false - true + false ###### $(pv_name) $(pv_value) - true + false 1 true Text Update - 85 + 80 false - -632252ef:186bb56c0bf:-3515 - 132 - 240 + 4ec5f80:1872cc883d3:-7ef6 + 124 + 48 + + + + false + false + false + + + + true + + + + 3 + 1 + + false + + ISIS_Value_NEW + + false + + + + 0 + 19 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Setpoint_SP + 3 + false + $(PV_ROOT)TEMP:SP + + 0.0 + + + + + + + + $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT + + + + + + + + $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT + + + + true + + $(P)CS:MANAGER + $(PV_ROOT)FLOW_SP_MODE_SELECT + + + + true + true + false + + + 0 + false + + 0.0 + $(pv_name) +$(pv_value) + false + true + Text Input + 80 + 4ec5f80:1872cc883d3:-7ef5 + 216 + 48 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 19 + 0 + Heater_RBV + 3 + false + $(PV_ROOT)OUTPUT + + 0.0 + + + true + true + false + + + false + ###### + $(pv_name) +$(pv_value) + false + 1 + true + Text Update + 80 + false + 4ec5f80:1872cc883d3:-7ef4 + 124 + 78 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Setpoint_label + + + true + true + false + + + false + Setpoint: + + false + 1 + true + Label + 96 + true + 4ec5f80:1872cc883d3:-7ef3 + 6 + 48 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Heater_label + + + true + true + false + + + false + Heater: + + false + 1 + true + Label + 96 + true + 4ec5f80:1872cc883d3:-7ef2 + 6 + 78 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Temerature_label + + + true + true + false + + + false + Temperature: + + false + 1 + true + Label + 96 + true + 4ec5f80:1872cc883d3:-7ef1 + 6 + 18 + + + + false + false + false + + + + false + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 19 + 0 + Temperature_units_RBV + 3 + false + $(PV_ROOT)TEMP.EGU + + 0.0 + + + true + true + false + + + false + ###### + $(pv_name) +$(pv_value) + false + 1 + true + Text Update + 80 + false + 4ec5f80:1872cc883d3:-7ef0 + 215 + 18 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Ramping_label + + + true + true + false + + + false + Heating: + + false + 1 + true + Label + 96 + true + 4ec5f80:1872cc883d3:-7eef + 6 + 108 + + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + ISIS_Label_Small + + false + + + + 25 + Ramping_LED + + + + OFF + + + + ON + $(PV_ROOT)RAMPING + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 25 + 4ec5f80:1872cc883d3:-7eee + 126 + 108 + + + + + false + + + + + + + 0 + 1 + true + + ISIS_Header2_NEW + + + + + 37 + 0 + Label_15 + + + + true + + $(P)CS:MANAGER + + + + true + true + false + + + false + To control this device, enable manager mode! + + false + 1 + false + Label + 403 + true + -6c823268:187747e8255:-7ebb + 384 + 42 \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 7c3cd8af1c..0b995ebcde 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2917,11 +2917,11 @@ - WISH Automatic Needle Valve + Automatic Needle Valve Controller UNKNOWN - wish_automatic_needle_valve.opi - WISH Automatic Needle Valve + automatic_needle_valve.opi + Automatic Needle Valve Controller EURO From 56b5229e6a8c5adc17d10c8f54e6598a75e14477 Mon Sep 17 00:00:00 2001 From: HannahCawley Date: Fri, 14 Jul 2023 15:14:39 +0100 Subject: [PATCH 07/10] Fix OPI type --- base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 0b995ebcde..0b07b46332 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2919,7 +2919,7 @@ Automatic Needle Valve Controller - UNKNOWN + EUROTHERM automatic_needle_valve.opi Automatic Needle Valve Controller From 52c2810bb75f5ace65b0c02450fc00ab9a583ea0 Mon Sep 17 00:00:00 2001 From: esmithExperimentControls Date: Tue, 1 Aug 2023 14:59:49 +0100 Subject: [PATCH 08/10] Changed N.V. stop SP to Choice button --- .../resources/automatic_needle_valve.opi | 76 +++++-------------- 1 file changed, 21 insertions(+), 55 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi index abc3f0c5ac..8c12222e43 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/automatic_needle_valve.opi @@ -471,7 +471,7 @@ $(pv_value) false true Grouping Container - 373 + 379 -6c70a930:185e92885a4:-7d7e 6 228 @@ -1217,85 +1217,51 @@ $(pv_value) 132 132 - + false - false false - + true - + - 3 + 0 1 - - false + true - ISIS_Value_NEW + Default false - + - 0 - 20 - 0 - false - 1.7976931348623157E308 - -1.7976931348623157E308 - false - Stop_SP_SP - 0 - true + 28 + true + true + STOP_SP_button $(PV_ROOT)NEEDLE_VALVE_STOP:SP - 0.0 - - - - true - - $(P)CS:MANAGER - - - - - - - - $(P)CS:MANAGER - - - - - - - - $(P)CS:MANAGER - - + true true false - 0 - true - - 0.0 + + + $(pv_name) $(pv_value) - false true - Text Input - 90 - 2cad3757:186e08b90f4:-5d6d - 227 - 132 + Choice Button + 133 + 597b1303:189b03ee6d7:-7fb3 + 216 + 128 From a2bf70e742233679a4d56092b0d349d3f1c1f671 Mon Sep 17 00:00:00 2001 From: esmithExperimentControls Date: Tue, 1 Aug 2023 15:39:50 +0100 Subject: [PATCH 09/10] Changed target platform file to same as current master branch --- ...rm.target => targetplatform.target.target} | 155 ++++++++++++------ 1 file changed, 104 insertions(+), 51 deletions(-) rename base/uk.ac.stfc.isis.ibex.targetplatform/{targetplatform.target => targetplatform.target.target} (77%) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target.target similarity index 77% rename from base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target rename to base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target.target index 33c23871d8..1f857fe4fd 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target.target @@ -11,7 +11,7 @@ - + @@ -48,23 +48,36 @@ - - - - - - + + - - + + + + + + + + + + + + + + + + + + + - - + + - + @@ -79,21 +92,11 @@ - - - - - - - - - - - - - - - + + + + + @@ -102,21 +105,16 @@ - - - - - - - - + + + org.apache.logging.log4j log4j-core - 2.18.0 + 2.19.0 jar @@ -126,7 +124,7 @@ org.apache.logging.log4j log4j-api - 2.18.0 + 2.19.0 jar @@ -136,7 +134,7 @@ org.apache.activemq activemq-all - 5.17.1 + 5.17.3 jar @@ -144,9 +142,9 @@ - mysql - mysql-connector-java - 8.0.30 + com.mysql + mysql-connector-j + 8.0.32 jar @@ -166,7 +164,7 @@ joda-time joda-time - 2.11.0 + 2.12.2 jar @@ -176,7 +174,7 @@ org.zeromq jeromq - 0.5.2 + 0.5.3 jar @@ -186,7 +184,7 @@ org.mockito mockito-core - 4.7.0 + 5.1.1 jar @@ -216,7 +214,7 @@ org.glassfish.tyrus.bundles tyrus-standalone-client - 2.1.0 + 2.1.2 jar @@ -226,15 +224,70 @@ com.google.code.gson gson - 2.9.1 + 2.10.1 jar - - - - + + + + jakarta.mail + jakarta.mail-api + 2.1.1 + jar + + + + + + + jakarta.activation + jakarta.activation-api + 2.1.1 + jar + + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + jar + + + + + + + org.glassfish.jaxb + jaxb-runtime + 4.0.2 + jar + + + + + + + javax.activation + activation + 1.1.1 + jar + + + + + + + org.mockito + mockito-inline + 4.7.0 + jar + + @@ -250,4 +303,4 @@ x86_64 en_GB - \ No newline at end of file + From 1cee5fa177990e4f7a0101a34e594ac531020d05 Mon Sep 17 00:00:00 2001 From: esmithExperimentControls Date: Tue, 1 Aug 2023 15:58:01 +0100 Subject: [PATCH 10/10] Fixed typo in file name --- .../{targetplatform.target.target => targetplatform.target} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename base/uk.ac.stfc.isis.ibex.targetplatform/{targetplatform.target.target => targetplatform.target} (100%) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target similarity index 100% rename from base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target.target rename to base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target