From: Philipp Klaus Date: Thu, 5 Sep 2019 08:51:18 +0000 (+0200) Subject: python dashboard - latest changes X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=cb288cebe478a6c7a98a0de3b59182a18c7c90fc;p=mvd_epics.git python dashboard - latest changes --- diff --git a/python_suite/dashboard/.gitignore b/python_suite/dashboard/.gitignore index d344ba6..b308819 100644 --- a/python_suite/dashboard/.gitignore +++ b/python_suite/dashboard/.gitignore @@ -1 +1,2 @@ config.json +*.log.????-??-?? diff --git a/python_suite/dashboard/dashboard.py b/python_suite/dashboard/dashboard.py index e6e09d4..5963fae 100755 --- a/python_suite/dashboard/dashboard.py +++ b/python_suite/dashboard/dashboard.py @@ -143,7 +143,7 @@ def cb_value_update(**kwargs): pv['lower_warning_limit'] = float('nan') # PREC pv['precision'] = kwargs['precision'] - #if type(kwargs['precision']) == int and ('double' in kwargs['type'] or 'float' in kwargs['type']): + #if type(kwargs['precision']) == int and kwargs['precision'] > 0 and ('double' in kwargs['type'] or 'float' in kwargs['type']): # pv['value'] = round(pv['value'], kwargs['precision']) if kwargs['enum_strs'] == (b'OFF', b'ON'): pv['classes'] += ' switch' diff --git a/python_suite/dashboard/example.config.json b/python_suite/dashboard/example.config.json index 20c8ad8..e6aa7a7 100644 --- a/python_suite/dashboard/example.config.json +++ b/python_suite/dashboard/example.config.json @@ -96,13 +96,174 @@ {"name": "CBM:MVD:PT100:VAC:15", "alias": ""}, {"name": "CBM:MVD:PT100:VAC:16", "alias": "Temperature of Coolant at PRESTO Inlet"}, {"name": "CBM:MVD:PT100:VAC:17", "alias": "Temperature of Coolant at PRESTO Outlet"}, - {"name": "CBM:MVD:PT100:VAC:CONV_RATE", "alias": "Conversion Rate of the Pt100 Measurement board"} + {"name": "CBM:MVD:PT100:VAC:CONV_RATE", "alias": "Conversion Rate of the Pt100 Measurement board"}, + + {"name": "CBM:MVD:TRB:CbController-0xd010-VoltageAnalogD.0", "alias": "Analog Voltage 0xd010.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-VoltageAnalogD.1", "alias": "Analog Voltage 0xd010.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-VoltageDigitalD.0", "alias": "Digital Voltage 0xd010.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-VoltageDigitalD.1", "alias": "Digital Voltage 0xd010.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-CurrentAnalogD.0", "alias": "Analog Current 0xd010.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-CurrentAnalogD.1", "alias": "Analog Current 0xd010.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-CurrentDigitalD.0", "alias": "Digital Current 0xd010.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-CurrentDigitalD.1", "alias": "Digital Current 0xd010.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-VoltageAnalogD.0", "alias": "Analog Voltage 0xd011.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-VoltageAnalogD.1", "alias": "Analog Voltage 0xd011.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-VoltageDigitalD.0", "alias": "Digital Voltage 0xd011.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-VoltageDigitalD.1", "alias": "Digital Voltage 0xd011.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-CurrentAnalogD.0", "alias": "Analog Current 0xd011.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-CurrentAnalogD.1", "alias": "Analog Current 0xd011.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-CurrentDigitalD.0", "alias": "Digital Current 0xd011.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd011-CurrentDigitalD.1", "alias": "Digital Current 0xd011.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-VoltageAnalogD.0", "alias": "Analog Voltage 0xd012.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-VoltageAnalogD.1", "alias": "Analog Voltage 0xd012.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-VoltageDigitalD.0", "alias": "Digital Voltage 0xd012.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-VoltageDigitalD.1", "alias": "Digital Voltage 0xd012.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-CurrentAnalogD.0", "alias": "Analog Current 0xd012.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-CurrentAnalogD.1", "alias": "Analog Current 0xd012.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-CurrentDigitalD.0", "alias": "Digital Current 0xd012.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd012-CurrentDigitalD.1", "alias": "Digital Current 0xd012.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-VoltageAnalogD.0", "alias": "Analog Voltage 0xd013.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-VoltageAnalogD.1", "alias": "Analog Voltage 0xd013.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-VoltageDigitalD.0", "alias": "Digital Voltage 0xd013.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-VoltageDigitalD.1", "alias": "Digital Voltage 0xd013.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-CurrentAnalogD.0", "alias": "Analog Current 0xd013.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-CurrentAnalogD.1", "alias": "Analog Current 0xd013.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-CurrentDigitalD.0", "alias": "Digital Current 0xd013.0"}, + {"name": "CBM:MVD:TRB:CbController-0xd013-CurrentDigitalD.1", "alias": "Digital Current 0xd013.1"}, + {"name": "CBM:MVD:TRB:CbController-0xd010-EnaA.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd010-EnaA.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd010-EnaD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd010-EnaD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd010-SensorTempD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd010-SensorTempD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd011-EnaA.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd011-EnaA.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd011-EnaD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd011-EnaD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd011-SensorTempD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd011-SensorTempD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd012-EnaA.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd012-EnaA.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd012-EnaD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd012-EnaD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd012-SensorTempD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd012-SensorTempD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd013-EnaA.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd013-EnaA.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd013-EnaD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd013-EnaD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd013-SensorTempD.0", "alias": ""}, + {"name": "CBM:MVD:TRB:CbController-0xd013-SensorTempD.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-ClockActive.0", "alias": "Clock Active 0xd010.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-ClockActive.1", "alias": "Clock Active 0xd010.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-DataValid.0", "alias": "Data Valid 0xd010.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-DataValid.1", "alias": "Data Valid 0xd010.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-RawData0.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-RawData0.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-RawData1.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-RawData1.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-CurrDataLength.0", "alias": "Current Data Length 0xd010.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-CurrDataLength.1", "alias": "Current Data Length 0xd010.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-DataCheckerState.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-DataCheckerState.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-FrameBufferStatus.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-FrameBufferStatus.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-FrameBufferAge.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-FrameBufferAge.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-FrameData.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-FrameData.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-HeadersDetected.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd010-HeadersDetected.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-ClockActive.0", "alias": "Clock Active 0xd011.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-ClockActive.1", "alias": "Clock Active 0xd011.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-DataValid.0", "alias": "Data Valid 0xd011.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-DataValid.1", "alias": "Data Valid 0xd011.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-RawData0.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-RawData0.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-RawData1.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-RawData1.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-CurrDataLength.0", "alias": "Current Data Length 0xd011.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-CurrDataLength.1", "alias": "Current Data Length 0xd011.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-DataCheckerState.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-DataCheckerState.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-FrameBufferStatus.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-FrameBufferStatus.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-FrameBufferAge.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-FrameBufferAge.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-FrameData.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-FrameData.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-HeadersDetected.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd011-HeadersDetected.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-ClockActive.0", "alias": "Clock Active 0xd012.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-ClockActive.1", "alias": "Clock Active 0xd012.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-DataValid.0", "alias": "Data Valid 0xd012.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-DataValid.1", "alias": "Data Valid 0xd012.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-RawData0.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-RawData0.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-RawData1.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-RawData1.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-CurrDataLength.0", "alias": "Current Data Length 0xd012.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-CurrDataLength.1", "alias": "Current Data Length 0xd012.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-DataCheckerState.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-DataCheckerState.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-FrameBufferStatus.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-FrameBufferStatus.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-FrameBufferAge.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-FrameBufferAge.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-FrameData.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-FrameData.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-HeadersDetected.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd012-HeadersDetected.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-ClockActive.0", "alias": "Clock Active 0xd013.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-ClockActive.1", "alias": "Clock Active 0xd013.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-DataValid.0", "alias": "Data Valid 0xd013.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-DataValid.1", "alias": "Data Valid 0xd013.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-RawData0.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-RawData0.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-RawData1.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-RawData1.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-CurrDataLength.0", "alias": "Current Data Length 0xd013.0"}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-CurrDataLength.1", "alias": "Current Data Length 0xd013.1"}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-DataCheckerState.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-DataCheckerState.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-FrameBufferStatus.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-FrameBufferStatus.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-FrameBufferAge.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-FrameBufferAge.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-FrameData.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-FrameData.1", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-HeadersDetected.0", "alias": ""}, + {"name": "CBM:MVD:TRB:Mvd-0xd013-HeadersDetected.1", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd010-ErrorsReadId", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd010-ErrorsWrite", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd010-JtagLastWriteError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd010-JtagLastReadError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd010-JtagLastSuccessful", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd010-NumchipsConfigured", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd011-ErrorsReadId", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd011-ErrorsWrite", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd011-JtagLastWriteError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd011-JtagLastReadError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd011-JtagLastSuccessful", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd011-NumchipsConfigured", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd012-ErrorsReadId", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd012-ErrorsWrite", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd012-JtagLastWriteError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd012-JtagLastReadError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd012-JtagLastSuccessful", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd012-NumchipsConfigured", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd013-ErrorsReadId", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd013-ErrorsWrite", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd013-JtagLastWriteError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd013-JtagLastReadError", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd013-JtagLastSuccessful", "alias": ""}, + {"name": "CBM:MVD:TRB:JtagController-0xd013-NumchipsConfigured", "alias": ""} ], "page_hierarchy": { "top": ["top_list"], "top_gview": ["cooling_schematic", "presto_pictorial"], "top_list": ["general_overview"], - "general_overview": ["cooling_system", "low_voltage_system", "pressure", "environment", "temperature"] + "general_overview": ["cooling_system", "low_voltage_system", "pressure", "environment", "temperature", "readout"] }, "pages": { "general_overview": { @@ -136,6 +297,12 @@ "pressure" ] }, + "readout": { + "name": "Details TrbNet Readout System", + "groups": [ + "readout_extended" + ] + }, "environment": { "name": "Details Laboratory Environment", "groups": [ @@ -174,6 +341,67 @@ "CBM:MVD:COOLING:CC405:FLOW:OUT:Total" ] }, + "readout_extended": { + "name": "TrbNet based Readout", + "PVs": [ + "CBM:MVD:TRB:CbController-0xd010-VoltageAnalogD.0", + "CBM:MVD:TRB:CbController-0xd010-VoltageAnalogD.1", + "CBM:MVD:TRB:CbController-0xd011-VoltageAnalogD.0", + "CBM:MVD:TRB:CbController-0xd011-VoltageAnalogD.1", + "CBM:MVD:TRB:CbController-0xd012-VoltageAnalogD.0", + "CBM:MVD:TRB:CbController-0xd012-VoltageAnalogD.1", + "CBM:MVD:TRB:CbController-0xd013-VoltageAnalogD.0", + "CBM:MVD:TRB:CbController-0xd013-VoltageAnalogD.1", + "CBM:MVD:TRB:CbController-0xd010-VoltageDigitalD.0", + "CBM:MVD:TRB:CbController-0xd010-VoltageDigitalD.1", + "CBM:MVD:TRB:CbController-0xd011-VoltageDigitalD.0", + "CBM:MVD:TRB:CbController-0xd011-VoltageDigitalD.1", + "CBM:MVD:TRB:CbController-0xd012-VoltageDigitalD.0", + "CBM:MVD:TRB:CbController-0xd012-VoltageDigitalD.1", + "CBM:MVD:TRB:CbController-0xd013-VoltageDigitalD.0", + "CBM:MVD:TRB:CbController-0xd013-VoltageDigitalD.1", + "CBM:MVD:TRB:CbController-0xd010-CurrentAnalogD.0", + "CBM:MVD:TRB:CbController-0xd010-CurrentAnalogD.1", + "CBM:MVD:TRB:CbController-0xd011-CurrentAnalogD.0", + "CBM:MVD:TRB:CbController-0xd011-CurrentAnalogD.1", + "CBM:MVD:TRB:CbController-0xd012-CurrentAnalogD.0", + "CBM:MVD:TRB:CbController-0xd012-CurrentAnalogD.1", + "CBM:MVD:TRB:CbController-0xd013-CurrentAnalogD.0", + "CBM:MVD:TRB:CbController-0xd013-CurrentAnalogD.1", + "CBM:MVD:TRB:CbController-0xd010-CurrentDigitalD.0", + "CBM:MVD:TRB:CbController-0xd010-CurrentDigitalD.1", + "CBM:MVD:TRB:CbController-0xd011-CurrentDigitalD.0", + "CBM:MVD:TRB:CbController-0xd011-CurrentDigitalD.1", + "CBM:MVD:TRB:CbController-0xd012-CurrentDigitalD.0", + "CBM:MVD:TRB:CbController-0xd012-CurrentDigitalD.1", + "CBM:MVD:TRB:CbController-0xd013-CurrentDigitalD.0", + "CBM:MVD:TRB:CbController-0xd013-CurrentDigitalD.1", + "CBM:MVD:TRB:Mvd-0xd010-CurrDataLength.0", + "CBM:MVD:TRB:Mvd-0xd010-CurrDataLength.1", + "CBM:MVD:TRB:Mvd-0xd011-CurrDataLength.0", + "CBM:MVD:TRB:Mvd-0xd011-CurrDataLength.1", + "CBM:MVD:TRB:Mvd-0xd012-CurrDataLength.0", + "CBM:MVD:TRB:Mvd-0xd012-CurrDataLength.1", + "CBM:MVD:TRB:Mvd-0xd013-CurrDataLength.0", + "CBM:MVD:TRB:Mvd-0xd013-CurrDataLength.1", + "CBM:MVD:TRB:Mvd-0xd010-ClockActive.0", + "CBM:MVD:TRB:Mvd-0xd010-ClockActive.1", + "CBM:MVD:TRB:Mvd-0xd011-ClockActive.0", + "CBM:MVD:TRB:Mvd-0xd011-ClockActive.1", + "CBM:MVD:TRB:Mvd-0xd012-ClockActive.0", + "CBM:MVD:TRB:Mvd-0xd012-ClockActive.1", + "CBM:MVD:TRB:Mvd-0xd013-ClockActive.0", + "CBM:MVD:TRB:Mvd-0xd013-ClockActive.1", + "CBM:MVD:TRB:Mvd-0xd010-DataValid.0", + "CBM:MVD:TRB:Mvd-0xd010-DataValid.1", + "CBM:MVD:TRB:Mvd-0xd011-DataValid.0", + "CBM:MVD:TRB:Mvd-0xd011-DataValid.1", + "CBM:MVD:TRB:Mvd-0xd012-DataValid.0", + "CBM:MVD:TRB:Mvd-0xd012-DataValid.1", + "CBM:MVD:TRB:Mvd-0xd013-DataValid.0", + "CBM:MVD:TRB:Mvd-0xd013-DataValid.1" + ] + }, "cooling_extended": { "name": "Cooling (extended)", "PVs": [ diff --git a/python_suite/dashboard/static/js/script.js b/python_suite/dashboard/static/js/script.js index 32758f4..1ced8e6 100644 --- a/python_suite/dashboard/static/js/script.js +++ b/python_suite/dashboard/static/js/script.js @@ -8,7 +8,7 @@ function updateSparklines(width, height) { [].forEach.call(sparklineItems, function (el) { var el_id = el.id; var pvName = el_id.substring(el_id.indexOf("-")+1, el_id.length); - var pvName = pvName.replace(/-/g, ':'); + var pvName = pvName.replace(/-COLON-/g, ':').replace(/-DOT-/g, '.'); var sparklineChart = sparkline() .width(width) diff --git a/python_suite/dashboard/views/pv_overview_bootstrap.jinja2 b/python_suite/dashboard/views/pv_overview_bootstrap.jinja2 index 3ab57a6..8e0bfc8 100644 --- a/python_suite/dashboard/views/pv_overview_bootstrap.jinja2 +++ b/python_suite/dashboard/views/pv_overview_bootstrap.jinja2 @@ -48,7 +48,7 @@ {{ PV.unit }} -
+
{% if (loop.index0 % 3 == 2) or loop.last %}