Query QHY state via camvirt daemons.

warwick-one-metre · Mar 19, 2024 · 330ebdd · 330ebdd
1 parent 3f0f428
commit 330ebdd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/dashboard/templates/clasp.html b/dashboard/templates/clasp.html
@@ -72,7 +72,7 @@
                     </tr>
                     <tr>
                         <td>State</td>
-                        <td data-cam-index='["clasp_cam1","state"]' data-power-index='["clasp_power", "cam1"]' data-generator="qhyState"></td>
+                        <td data-cam-index='["clasp_cam1","state"]' data-camvirt-index='["clasp_cam1", "vm_active"]' data-power-index='["clasp_power", "cam1"]' data-generator="qhyState"></td>
                         <td data-cam-index='["clasp_cam2","state"]' data-power-index='["clasp_power", "cam2"]' data-generator="swirState"></td>
                     </tr>
                     <tr>

diff --git a/dashboard/templates/superwasp.html b/dashboard/templates/superwasp.html
@@ -74,10 +74,10 @@
                   </tr>
                   <tr>
                     <td>State</td>
-                    <td data-cam-index='["superwasp_cam_1","state"]' data-power-index='["superwasp_power", "cam1"]' data-generator="qhyState"></td>
-                    <td data-cam-index='["superwasp_cam_2","state"]' data-power-index='["superwasp_power", "cam2"]' data-generator="qhyState"></td>
-                    <td data-cam-index='["superwasp_cam_3","state"]' data-power-index='["superwasp_power", "cam3"]' data-generator="qhyState"></td>
-                    <td data-cam-index='["superwasp_cam_4","state"]' data-power-index='["superwasp_power", "cam4"]' data-generator="qhyState"></td>
+                    <td data-cam-index='["superwasp_cam_1", "state"]' data-camvirt-index='["superwasp_cam_1", "vm_active"]' data-power-index='["superwasp_power", "cam1"]' data-generator="qhyState"></td>
+                    <td data-cam-index='["superwasp_cam_2", "state"]' data-camvirt-index='["superwasp_cam_2", "vm_active"]' data-power-index='["superwasp_power", "cam2"]' data-generator="qhyState"></td>
+                    <td data-cam-index='["superwasp_cam_3", "state"]' data-camvirt-index='["superwasp_cam_3", "vm_active"]' data-power-index='["superwasp_power", "cam3"]' data-generator="qhyState"></td>
+                    <td data-cam-index='["superwasp_cam_4", "state"]' data-camvirt-index='["superwasp_cam_4", "vm_active"]' data-power-index='["superwasp_power", "cam4"]' data-generator="qhyState"></td>
                   </tr>
                   <tr>
                     <td>Exposure</td>

diff --git 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
@@ -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()),
 ])