diff --git a/dashboard/templates/clasp.html b/dashboard/templates/clasp.html
index 24fd0c2..ada58e2 100644
--- a/dashboard/templates/clasp.html
+++ b/dashboard/templates/clasp.html
@@ -72,7 +72,7 @@
State |
- |
+ |
|
diff --git a/dashboard/templates/superwasp.html b/dashboard/templates/superwasp.html
index fef86c8..d25c345 100644
--- a/dashboard/templates/superwasp.html
+++ b/dashboard/templates/superwasp.html
@@ -74,10 +74,10 @@
State |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
Exposure |
diff --git a/static/rockit-dashboard.js b/static/rockit-dashboard.js
index 2bf204c..ac113a7 100644
--- a/static/rockit-dashboard.js
+++ b/static/rockit-dashboard.js
@@ -387,6 +387,7 @@ function focusState(row, cell, data) {
function qhyState(row, cell, data) {
const cam_state = getData(data, row.data('cam-index'));
+ const vm_active = getData(data, row.data('camvirt-index'));
const powered = getData(data, row.data('power-index'));
const state = [
@@ -403,6 +404,9 @@ function qhyState(row, cell, data) {
if (cam_state === undefined || powered === undefined) {
label = 'ERROR';
style = 'text-danger';
+ } else if (vm_active === false) {
+ label = 'VM OFFLINE';
+ style = 'text-danger';
} else if (powered === 0) {
label = 'POWER OFF';
style = 'text-danger';
diff --git a/update-dashboard-data b/update-dashboard-data
index ff1d4ac..4f08e54 100644
--- a/update-dashboard-data
+++ b/update-dashboard-data
@@ -328,10 +328,10 @@ generate_json(BASE_OUTPUT_DIR + '/superwasp-private.json', [
(daemons.superwasp_telescope, 'superwasp_telescope', lambda d: d.report_status()),
(daemons.superwasp_dome, 'superwasp_dome', lambda d: d.status()),
(daemons.superwasp_pipeline, 'superwasp_pipeline', lambda d: d.report_status()),
- (daemons.superwasp_cam1, 'superwasp_cam_1', lambda d: d.report_status()),
- (daemons.superwasp_cam2, 'superwasp_cam_2', lambda d: d.report_status()),
- (daemons.superwasp_cam3, 'superwasp_cam_3', lambda d: d.report_status()),
- (daemons.superwasp_cam4, 'superwasp_cam_4', lambda d: d.report_status()),
+ (daemons.superwasp_camvirt_das1, 'superwasp_cam_1', lambda d: d.report_camera_status('cam1')),
+ (daemons.superwasp_camvirt_das1, 'superwasp_cam_2', lambda d: d.report_camera_status('cam2')),
+ (daemons.superwasp_camvirt_das2, 'superwasp_cam_3', lambda d: d.report_camera_status('cam3')),
+ (daemons.superwasp_camvirt_das2, 'superwasp_cam_4', lambda d: d.report_camera_status('cam4')),
(daemons.superwasp_lensheater, 'superwasp_lensheater', lambda d: d.report_status())
])
@@ -344,7 +344,7 @@ generate_json(BASE_OUTPUT_DIR + '/clasp-private.json', [
(daemons.clasp_focus, 'clasp_focus', lambda d: d.report_status()),
(daemons.clasp_dome, 'clasp_dome', lambda d: d.status()),
(daemons.clasp_pipeline, 'clasp_pipeline', lambda d: d.report_status()),
- (daemons.clasp_camera_1, 'clasp_cam1', lambda d: d.report_status()),
+ (daemons.clasp_camvirt_1, 'clasp_cam1', lambda d: d.report_camera_status('cam1')),
(daemons.clasp_camera_2, 'clasp_cam2', lambda d: d.report_status()),
])