Merge branch 'master' into 'master'

wrong PV to show the RF system status

See merge request !14

WebSites/fbis/dashboard.json

@@ -182,7 +182,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "RF Systems",
-						"value": "var r  = datasources[\"Interlocks\"][\"FBIS::RF_RBI_ok\"][\"value\"][\"index\"];\nvar g =  datasources[\"Interlocks\"][\"FBIS::RFLPSAllSystemStatus\"][\"value\"][\"index\"];\n\nif (g == 1) {\n    return 0;\n} else if (r == 0){\n    return 2;\n}else {\n    return 1;\n}",
+						"value": "var r  = datasources[\"Interlocks\"][\"FBIS::RF_RBI_ok\"][\"value\"][\"index\"];\nvar g =  datasources[\"Interlocks\"][\"FBIS::RF_ok\"][\"value\"][\"index\"];\n\nif (g == 1) {\n    return 0;\n} else if (r == 0){\n    return 2;\n}else {\n    return 1;\n}",
 						"green_text": "OK",
 						"amber_text": "Inhibit",
 						"red_text": "Interlock"
@@ -453,7 +453,7 @@
 			"name": "Interlocks",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v2/pvget/FBIS::beam_state_ok,FBIS-DLN01::status,FBIS-DLN02::status,FBIS-SCU01::status,FBIS-SCU02::status,FBIS-SCU03::status,FBIS-SCU04::status,FBIS::beam_permit_ok,FBIS::HW_ok,FBIS::beam_destination,FBIS::beam_mode,FBIS::BI_ok,FBIS::RBI_ok,FBIS::EBI_ok,FBIS::PSS_ok,FBIS::MPSMag_ok,FBIS::MPSID_ok,FBIS::MPSVac_ok,FBIS::IS_PLC_ok,FBIS::RFLPSAllSystemStatus,FBIS::MEBT_Ch_PLC_ok,FBIS::LEBT_Ch_Fault_ok,FBIS::BCM_ok,FBIS::BPM_ok,FBIS::SIS_ok,FBIS::IS_PLC_RBI_ok,FBIS::PSS_RBI_ok,FBIS::IS_PLC_RBI_ok,FBIS::RF_RBI_ok,FBIS::MPSVac_RBI_ok,FBIS::MPSID_RBI_ok,FBIS::MPSMag_RBI_ok,FBIS::MEBT_Ch_PLC_RBI_ok,FBIS::LEBT_Ch_Fault_RBI_ok,FBIS::BCM_RBI_ok,FBIS::BPM_RBI_ok,FBIS::SIS_RBI_ok,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_rbi_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_rbi_A",
+				"url": "/data/api/v2/pvget/FBIS::beam_state_ok,FBIS-DLN01::status,FBIS-DLN02::status,FBIS-SCU01::status,FBIS-SCU02::status,FBIS-SCU03::status,FBIS-SCU04::status,FBIS::beam_permit_ok,FBIS::HW_ok,FBIS::beam_destination,FBIS::beam_mode,FBIS::BI_ok,FBIS::RBI_ok,FBIS::EBI_ok,FBIS::PSS_ok,FBIS::MPSMag_ok,FBIS::MPSID_ok,FBIS::MPSVac_ok,FBIS::IS_PLC_ok,FBIS::RF_ok,FBIS::MEBT_Ch_PLC_ok,FBIS::LEBT_Ch_Fault_ok,FBIS::BCM_ok,FBIS::BPM_ok,FBIS::SIS_ok,FBIS::IS_PLC_RBI_ok,FBIS::PSS_RBI_ok,FBIS::IS_PLC_RBI_ok,FBIS::RF_RBI_ok,FBIS::MPSVac_RBI_ok,FBIS::MPSID_RBI_ok,FBIS::MPSMag_RBI_ok,FBIS::MEBT_Ch_PLC_RBI_ok,FBIS::LEBT_Ch_Fault_RBI_ok,FBIS::BCM_RBI_ok,FBIS::BPM_RBI_ok,FBIS::SIS_RBI_ok,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_rbi_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_rbi_A",
 				"use_thingproxy": false,
 				"refresh": 5,
 				"method": "GET"