added column to FC

WebSites/pbifc/dashboard.json

@@ -5,7 +5,7 @@
 	"plugins": [],
 	"panes": [
 		{
-			"title": "",
+			"title": "Beam Destinations",
 			"width": 1,
 			"row": {
 				"1": 1,
@@ -19,12 +19,12 @@
 				"3": 1,
 				"4": 1
 			},
-			"col_width": 4,
+			"col_width": 5,
 			"widgets": [
 				{
 					"type": "html",
 					"settings": {
-						"html": "let clock = datasources[\"Clock\"][\"numeric_value\"]; // trick to trigger the update\nlet cols = document.getElementsByClassName('gs_w')[0].getAttribute('data-sizex');\ndocument.getElementsByClassName('gs_w')[0].firstElementChild.firstElementChild.innerHTML = \"\";\n\nlet title = \"NCL Faraday cups\"; // Change this title. Try not to exceed the 30 chars\n\nlet fontsize = Math.round((-0.66486486*title.length+66.67567568)*cols/4);\nlet lmargin = Math.round((0.43918919*title.length-4.05405405)+3.75*cols*cols-34.75*cols+79.75);\nlet width = 100-lmargin;\n\nvar text = `<div style=\\\"position: relative; margin-top: -15px; text-align: left;\\\">\n\t\t\t<div style=\\\"position: relative;\\\">\n\t\t\t\t<img src=\\\"../img/ess-logo.svg\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\"></img>\n\t\t\t</div>\n<div class=\\\"tw-value\\\" style=\\\"font-size: `+String(fontsize)+`px; color:#ffffff !important; position: absolute; left: `+String(lmargin)+`%; width: `+String(width)+`%; height: 100%; justify-content: center; display: flex; align-items: center;\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\">\n\t\t\t\t`+title+`\n\t\t\t</div>\n\t\t</div>`;\n\nif (cols == 1){\n    text = \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 30px; color:#ffffff !important; position: relative; bottom: 55px; left: 30px;\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\"></div></img></div>\";\n    document.getElementsByClassName('gs_w')[0].firstElementChild.firstElementChild.innerHTML = title;\n}\n\nreturn text;",
+						"html": "let clock = datasources[\"Clock\"][\"numeric_value\"]; // trick to trigger the update\nlet cols = document.getElementsByClassName('gs_w')[0].getAttribute('data-sizex');\ndocument.getElementsByClassName('gs_w')[0].firstElementChild.firstElementChild.innerHTML = \"\";\n\nlet title = \"Beam Destinations\"; // Change this title. Try not to exceed the 30 chars\n\nlet fontsize = Math.round((-0.66486486*title.length+66.67567568)*cols/4);\nlet lmargin = Math.round((0.43918919*title.length-4.05405405)+3.75*cols*cols-34.75*cols+79.75);\nlet width = 100-lmargin;\n\nvar text = `<div style=\\\"position: relative; margin-top: -15px; text-align: left;\\\">\n\t\t\t<div style=\\\"position: relative;\\\">\n\t\t\t\t<img src=\\\"../img/ess-logo.svg\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\"></img>\n\t\t\t</div>\n<div class=\\\"tw-value\\\" style=\\\"font-size: `+String(fontsize)+`px; color:#ffffff !important; position: absolute; left: `+String(lmargin)+`%; width: `+String(width)+`%; height: 100%; justify-content: center; display: flex; align-items: center;\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\">\n\t\t\t\t`+title+`\n\t\t\t</div>\n\t\t</div>`;\n\nif (cols == 1){\n    text = \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 30px; color:#ffffff !important; position: relative; bottom: 55px; left: 30px;\\\" title=\\\"Designed by Emanuele Laface with PyEpics and Freeboard. Graphics by Dirk Nordt.\\\"></div></img></div>\";\n    document.getElementsByClassName('gs_w')[0].firstElementChild.firstElementChild.innerHTML = title;\n}\n\nreturn text;",
 						"height": 2
 					}
 				}
@@ -37,7 +37,7 @@
 				"1": 25,
 				"2": 15,
 				"3": 7,
-				"4": 7,
+				"4": 11,
 				"5": 7,
 				"7": 7
 			},
@@ -45,7 +45,7 @@
 				"1": 1,
 				"2": 2,
 				"3": 3,
-				"4": 2,
+				"4": 1,
 				"5": 4,
 				"7": 4
 			},
@@ -70,6 +70,15 @@
 						"animate": true
 					}
 				},
+				{
+					"type": "text_widget",
+					"settings": {
+						"title": "Actuator counter ",
+						"size": "regular",
+						"value": "datasources[\"Counter\"][\"LEBT-010:PBI-FC-001:ActuatorCount\"][\"value\"]",
+						"animate": true
+					}
+				},
 				{
 					"type": "indicator",
 					"settings": {
@@ -86,7 +95,7 @@
 						"value": "datasources[\"Water\"][\"LEBT-010:PBI-FC-001:BodyTemp-R\"][\"value\"].toFixed(1)",
 						"units": "°C",
 						"min_value": 0,
-						"max_value": "100"
+						"max_value": "50"
 					}
 				},
 				{
@@ -120,70 +129,20 @@
 				}
 			]
 		},
-		{
-			"title": "IOCs status",
-			"width": 1,
-			"row": {
-				"1": 17,
-				"2": 7,
-				"3": 7,
-				"4": 7,
-				"6": 7,
-				"7": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"4": 1,
-				"6": 3,
-				"7": 3
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "DAQ ",
-						"value": "datasources[\"IOC\"][\"PBI-FC01:SC-IOC-101:HEARTBEAT\"][\"value\"]",
-						"on_text": "DAQ on ",
-						"off_text": "DAQ off "
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "MHV",
-						"value": "datasources[\"IOC\"][\"PBI-FC01:SC-IOC-102:HEARTBEAT\"][\"value\"]",
-						"on_text": "MHV on",
-						"off_text": "MHV off "
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "EVR",
-						"value": "datasources[\"IOC\"][\"PBI-FC01:SC-IOC-103:HEARTBEAT\"][\"value\"]",
-						"on_text": "EVR on ",
-						"off_text": "EVR off "
-					}
-				}
-			]
-		},
 		{
 			"title": "MEBT FC ",
 			"width": 1,
 			"row": {
 				"2": 7,
 				"3": 7,
-				"4": 7,
+				"4": 11,
 				"6": 7,
 				"7": 7
 			},
 			"col": {
 				"2": 1,
 				"3": 1,
-				"4": 3,
+				"4": 2,
 				"6": 3,
 				"7": 3
 			},
@@ -208,6 +167,15 @@
 						"animate": true
 					}
 				},
+				{
+					"type": "text_widget",
+					"settings": {
+						"title": "Actuator counter ",
+						"size": "regular",
+						"value": "datasources[\"Counter\"][\"MEBT-010:PBI-FC-001:ActuatorCount\"][\"value\"]",
+						"animate": true
+					}
+				},
 				{
 					"type": "indicator",
 					"settings": {
@@ -224,7 +192,7 @@
 						"value": "datasources[\"Water\"][\"MEBT-010:PBI-FC-001:BodyTemp-R\"][\"value\"].toFixed(1)",
 						"units": "°C",
 						"min_value": 0,
-						"max_value": 100
+						"max_value": "50"
 					}
 				},
 				{
@@ -253,13 +221,13 @@
 			"width": 1,
 			"row": {
 				"3": 15,
-				"4": 7,
+				"4": 11,
 				"6": 7,
 				"7": 7
 			},
 			"col": {
 				"3": 2,
-				"4": 4,
+				"4": 3,
 				"6": 4,
 				"7": 4
 			},
@@ -284,6 +252,15 @@
 						"animate": true
 					}
 				},
+				{
+					"type": "text_widget",
+					"settings": {
+						"title": "Actuator counter ",
+						"size": "regular",
+						"value": "datasources[\"Counter\"][\"DTL-020:PBI-FC-001:ActuatorCount\"][\"value\"]",
+						"animate": true
+					}
+				},
 				{
 					"type": "indicator",
 					"settings": {
@@ -300,7 +277,7 @@
 						"value": "datasources[\"Water\"][\"DTL-020:PBI-FC-001:BodyTemp-R\"][\"value\"].toFixed(1)",
 						"units": "°C",
 						"min_value": 0,
-						"max_value": 100
+						"max_value": "50"
 					}
 				},
 				{
@@ -323,6 +300,151 @@
 					}
 				}
 			]
+		},
+		{
+			"title": "IBS MT IOC ",
+			"width": 1,
+			"row": {
+				"4": 7
+			},
+			"col": {
+				"4": 4
+			},
+			"col_width": 1,
+			"widgets": [
+				{
+					"type": "indicator",
+					"settings": {
+						"value": "datasources[\"IOC\"][\"PBI-IBS01:Ctrl-ECAT-100:EtherCATOk\"][\"value\"][\"index\"]",
+						"on_text": "MT ON",
+						"off_text": "MT OFF "
+					}
+				}
+			]
+		},
+		{
+			"title": "SPK IBS ",
+			"width": 1,
+			"row": {
+				"4": 11
+			},
+			"col": {
+				"4": 4
+			},
+			"col_width": 1,
+			"widgets": [
+				{
+					"type": "text_widget",
+					"settings": {
+						"title": "MAX PROTON CURRENT",
+						"size": "regular",
+						"value": "datasources[\"maxi\"][\"DTL-050:PBI-BCM-001:FlatTopCurrentR\"][\"value\"].toFixed(2)",
+						"animate": true
+					}
+				},
+				{
+					"type": "text_widget",
+					"settings": {
+						"title": "Position",
+						"size": "regular",
+						"value": "let index = datasources[\"Position\"][\"PBI-IBS01:Ctrl-ECAT-100:Position\"][\"value\"][\"index\"];\nlet selection = datasources[\"Position\"][\"PBI-IBS01:Ctrl-ECAT-100:Position\"][\"value\"][\"choices\"][index]; \nreturn selection;",
+						"animate": true
+					}
+				},
+				{
+					"type": "text_widget",
+					"settings": {
+						"title": "Actuator counter ",
+						"size": "regular",
+						"value": "datasources[\"Counter\"][\"PBI-IBS01:Ctrl-ECAT-100:ActuatorCount\"][\"value\"]",
+						"animate": true
+					}
+				},
+				{
+					"type": "indicator",
+					"settings": {
+						"title": "Water flow ",
+						"value": "datasources[\"Water\"][\"PBI-IBS01:Ctrl-ECAT-100:WaterFlowOk\"][\"value\"][\"index\"]",
+						"on_text": "OK",
+						"off_text": "NOK"
+					}
+				},
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "Water temperature body ",
+						"value": "datasources[\"Water\"][\"PBI-IBS01:Ctrl-ECAT-100:WaterTemp\"][\"value\"].toFixed(1)",
+						"units": "°C",
+						"min_value": 0,
+						"max_value": "50"
+					}
+				}
+			]
+		},
+		{
+			"title": "FC EVR ",
+			"width": 1,
+			"row": {
+				"4": 7
+			},
+			"col": {
+				"4": 3
+			},
+			"col_width": 1,
+			"widgets": [
+				{
+					"type": "indicator",
+					"settings": {
+						"title": "",
+						"value": "datasources[\"IOC\"][\"PBI-FC01:SC-IOC-103:HEARTBEAT\"][\"value\"]",
+						"on_text": "EVR ON",
+						"off_text": "EVR OFF "
+					}
+				}
+			]
+		},
+		{
+			"title": "FC DAQ IOC",
+			"width": 1,
+			"row": {
+				"4": 7
+			},
+			"col": {
+				"4": 2
+			},
+			"col_width": 1,
+			"widgets": [
+				{
+					"type": "indicator",
+					"settings": {
+						"title": "",
+						"value": "datasources[\"IOC\"][\"PBI-FC01:SC-IOC-101:HEARTBEAT\"][\"value\"]",
+						"on_text": "DAQ ON",
+						"off_text": "DAQ OFF "
+					}
+				}
+			]
+		},
+		{
+			"title": "FC MHVT IOC",
+			"width": 1,
+			"row": {
+				"4": 7
+			},
+			"col": {
+				"4": 1
+			},
+			"col_width": 1,
+			"widgets": [
+				{
+					"type": "indicator",
+					"settings": {
+						"value": "datasources[\"IOC\"][\"PBI-FC01:SC-IOC-102:HEARTBEAT\"][\"value\"]",
+						"on_text": "MHV ON",
+						"off_text": "MHV OFF "
+					}
+				}
+			]
 		}
 	],
 	"datasources": [
@@ -330,7 +452,7 @@
 			"name": "IOC",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v2/pvget/PBI-FC01:SC-IOC-101:HEARTBEAT,PBI-FC01:SC-IOC-102:HEARTBEAT,PBI-FC01:SC-IOC-103:HEARTBEAT, PBI-FC01:Ctrl-IOC-104:HEARTBEAT",
+				"url": "/data/api/v2/pvget/PBI-FC01:SC-IOC-101:HEARTBEAT,PBI-FC01:SC-IOC-102:HEARTBEAT,PBI-FC01:SC-IOC-103:HEARTBEAT, PBI-FC01:Ctrl-IOC-104:HEARTBEAT,PBI-IBS01:Ctrl-ECAT-100:EtherCATOk",
 				"use_thingproxy": true,
 				"refresh": 1,
 				"method": "GET"
@@ -340,7 +462,7 @@
 			"name": "maxi",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:STAT3-MeanValueR,MEBT-010:PBI-FC-001:STAT3-MeanValueR,DTL-020:PBI-FC-001:STAT3-MeanValueR",
+				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:STAT3-MeanValueR,MEBT-010:PBI-FC-001:STAT3-MeanValueR,DTL-020:PBI-FC-001:STAT3-MeanValueR,DTL-050:PBI-BCM-001:FlatTopCurrentR",
 				"use_thingproxy": true,
 				"refresh": 5,
 				"method": "GET"
@@ -370,17 +492,18 @@
 			"name": "Water",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:RepellerTemp-R,LEBT-010:PBI-FC-001:WtrFlowOK,MEBT-010:PBI-FC-001:WtrFlowOK,DTL-020:PBI-FC-001:WtrFlowOK,LEBT-010:PBI-FC-001:BodyTemp-R,MEBT-010:PBI-FC-001:BodyTemp-R,DTL-020:PBI-FC-001:BodyTemp-R",
+				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:RepellerTemp-R,LEBT-010:PBI-FC-001:WtrFlowOK,MEBT-010:PBI-FC-001:WtrFlowOK,DTL-020:PBI-FC-001:WtrFlowOK,PBI-IBS01:Ctrl-ECAT-100:WaterFlowOk,LEBT-010:PBI-FC-001:BodyTemp-R,MEBT-010:PBI-FC-001:BodyTemp-R,DTL-020:PBI-FC-001:BodyTemp-R,PBI-IBS01:Ctrl-ECAT-100:WaterTemp",
 				"use_thingproxy": true,
 				"refresh": 5,
-				"method": "GET"
+				"method": "GET",
+				"name": "Water"
 			}
 		},
 		{
 			"name": "Position",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:Position-R,MEBT-010:PBI-FC-001:Position-R,DTL-020:PBI-FC-001:Position-R",
+				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:Position-R,MEBT-010:PBI-FC-001:Position-R,DTL-020:PBI-FC-001:Position-R,PBI-IBS01:Ctrl-ECAT-100:Position",
 				"use_thingproxy": true,
 				"refresh": 5,
 				"method": "GET"
@@ -392,6 +515,16 @@
 			"settings": {
 				"refresh": 1
 			}
+		},
+		{
+			"name": "Counter",
+			"type": "JSON",
+			"settings": {
+				"url": "/data/api/v2/pvget/LEBT-010:PBI-FC-001:ActuatorCount,MEBT-010:PBI-FC-001:ActuatorCount,DTL-020:PBI-FC-001:ActuatorCount,PBI-IBS01:Ctrl-ECAT-100:ActuatorCount",
+				"use_thingproxy": true,
+				"refresh": 5,
+				"method": "GET"
+			}
 		}
 	],
 	"columns": 4