Fixes

PythonServer/screens/mcu.py

@@ -89,7 +89,7 @@ class mcuScreen(Thread):
                                         (timestamp, round(value, 3))
                                     )
                                 if len(json_dict[pv]["live"]) > 100:
-                                    json_dict[pv]["live"].pop(100)
+                                    json_dict[pv]["live"].pop(0)
                     else:
                         json_dict[pv] = {}
                         if epics_dict[pv].connected:

WebSites/mcu/dashboard.json

@@ -30,40 +30,6 @@
 				}
 			]
 		},
-		{
-			"title": "Motor Temperature",
-			"width": 1,
-			"row": {
-				"1": 21,
-				"2": 21,
-				"3": 21,
-				"4": 21,
-				"5": 1,
-				"11": 21
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 1,
-				"5": 5,
-				"11": 10
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 4,
-						"value": "var series = document.getElementById(\"time-series\").value;\ndata = [\n {label: 'Temperature', data: datasources[\"MCU\"][\"LabS-VIP:Chop-Drv-0101:MtrTmp_Stat\"][series]},\n];\nfreeboard.showLoadingIndicator(false);\nreturn data;",
-						"x_timestamp": true,
-						"zoom": ""
-					}
-				}
-			]
-		},
 		{
 			"title": "Time Selector",
 			"width": 1,
@@ -108,6 +74,7 @@
 				"4": 11,
 				"5": 1,
 				"7": 1,
+				"8": 1,
 				"9": 1,
 				"10": 1
 			},
@@ -118,6 +85,7 @@
 				"4": 1,
 				"5": 5,
 				"7": 5,
+				"8": 5,
 				"9": 5,
 				"10": 5
 			},
@@ -137,6 +105,42 @@
 				}
 			]
 		},
+		{
+			"title": "Motor Temperature",
+			"width": 1,
+			"row": {
+				"1": 21,
+				"2": 21,
+				"3": 21,
+				"4": 21,
+				"5": 1,
+				"10": 21,
+				"11": 21
+			},
+			"col": {
+				"1": 1,
+				"2": 1,
+				"3": 1,
+				"4": 1,
+				"5": 5,
+				"10": 10,
+				"11": 10
+			},
+			"col_width": 3,
+			"widgets": [
+				{
+					"type": "flot_extended_plugin",
+					"settings": {
+						"plot_type": "line",
+						"legend": true,
+						"height": 4,
+						"value": "var series = document.getElementById(\"time-series\").value;\ndata = [\n {label: 'Temperature', data: datasources[\"MCU\"][\"LabS-VIP:Chop-Drv-0101:MtrTmp_Stat\"][series]},\n];\nfreeboard.showLoadingIndicator(false);\nreturn data;",
+						"x_timestamp": true,
+						"zoom": ""
+					}
+				}
+			]
+		},
 		{
 			"title": "Warning and Alarms",
 			"width": 1,
@@ -220,7 +224,7 @@
 					"settings": {
 						"title": "Actual Speed",
 						"size": "regular",
-						"value": "datasources[\"MCU\"][\"LabS-VIP:Chop-Drv-0101:Spd_Stat\"][\"value\"]",
+						"value": "(datasources[\"MCU\"][\"LabS-VIP:Chop-Drv-0101:Spd_Stat\"][\"value\"]).toString()",
 						"animate": true,
 						"units": ""
 					}
@@ -230,7 +234,7 @@
 					"settings": {
 						"title": "Set Point",
 						"size": "regular",
-						"value": "datasources[\"MCU\"][\"LabS-VIP:Chop-Drv-0101:Spd_SP\"][\"value\"]",
+						"value": "(datasources[\"MCU\"][\"LabS-VIP:Chop-Drv-0101:Spd_SP\"][\"value\"]).toString()",
 						"animate": true,
 						"units": ""
 					}