L2SS-624: Updated boot procedure in jupyter notebook test script

8c5a7b59 · Jan David Mol · 263caa9f · 8c5a7b59 · 8c5a7b59 · 8c5a7b59
Commit 8c5a7b59 authored 3 years ago by Jan David Mol
--- a/jupyter-notebooks/test_template.ipynb
+++ b/jupyter-notebooks/test_template.ipynb
@@ -119,24 +119,11 @@
   "id": "7532d05e",
   "metadata": {},
   "source": [
-    "### Hot reboot\n",
+    "### Reboot\n",
    "\n",
    "Makes sure the software and hardware are all in a known state."
   ]
  },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "c7a3effa",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Restart boot device\n",
-    "boot.off()\n",
-    "boot.initialise()\n",
-    "boot.on()"
-   ]
-  },
  {
   "cell_type": "code",
   "execution_count": 2,
@@ -145,7 +132,7 @@
   "outputs": [],
   "source": [
    "# Reboot the station\n",
-    "boot.boot()"
+    "boot.reboot()"
   ]
  },
  {

 %% Cell type:markdown id:6bdc7054 tags:
 # Test LRx.y: Test Name
 This notebook documents test output.
 Instructions:
 1. *PRESS File -> Make a Copy*,
 1. Rename the notebook to the name of the test,
 1. Update the title at the top of this section,
 1. Fill in the sections with empty blocks with code and text,
 1. Execute the provided initialisation code,
 1. Run the tests,
 1. *Rerun everything top to bottom to make sure the notebook is correct*,
 1. Fill in the results & verdict.
 1. Export the Jupyter Notebook to PDF and upload the file to the Polarion test results page.
 1. ...and you're done!
 %% Cell type:markdown id:63785004 tags:
 ## Author
 Descibe who ran this test, and who helped (if applicable):
 %% Cell type:markdown id:3c720d4b tags:
 (your name)
 %% Cell type:markdown id:ff837bcb tags:
 ## Timestamp
 This test was executed at:
 %% Cell type:code id:00418ee4 tags:
 ``` python
 # Run this code
 import datetime
 print(f"Test was executed at {datetime.datetime.isoformat(datetime.datetime.now(), ' ')}")
 ```
 %% Cell type:markdown id:0b4a59a5 tags:
 ## Purpose
 Describe the purpose and context of this notebook, possibly including any links to external references, e.g. the Polarion reference number:
 %% Cell type:markdown id:09d4d0a1 tags:
 (purpose)
 %% Cell type:markdown id:4c6489f3 tags:
 ## Methodology
 Provide a summary of how we are going to prove compliance:
 %% Cell type:markdown id:ceae21d4 tags:
 (methodology)
 %% Cell type:markdown id:9033f262 tags:
 ## Initialisation
 The following sections contain boilerplate code to get the station to a well-defined state. If this is not applicable or broken, just note that here:
 %% Cell type:markdown id:00d4e336 tags:
 %% Cell type:markdown id:7532d05e tags:
-### Hot reboot
+### Reboot
 Makes sure the software and hardware are all in a known state.
-%% Cell type:code id:c7a3effa tags:
-``` python
-# Restart boot device
-boot.off()
-boot.initialise()
-boot.on()
-```
 %% Cell type:code id:b4dd21b1 tags:
 ``` python
 # Reboot the station
-boot.boot()
+boot.reboot()
 ```
 %% Cell type:code id:78a4db84 tags:
 ``` python
 # Wait for reboot to complete
 import time
 while boot.booting_R:
    time.sleep(2)
    print(f"Initialisation at {boot.progress_R}%: {boot.status_R}")
 assert boot.progress_R == 100, f"Failed to fully initialise station: {boot.status_R}"
 if boot.uninitialised_devices_R:
    print(f"Warning! Did not initialise {boot.uninitialised_devices_R}. This might be inconsequential for this test.")
 ```
 %% Cell type:markdown id:9bc072af tags:
 ### Active versions
 List the versions currently running on the station.
 %% Cell type:code id:35b815d4 tags:
 ``` python
 def summarise(l: list) -> list:
    return [f"{idx}: {version}" for idx,version in enumerate(l) if version] or ["no versions reported"]
 versions = {
    "SC": {dev.name():dev.version_R for dev in devices},
    "SDP": {
        "FPGA firmware": summarise(sdp.FPGA_firmware_version_R),
        "FPGA hardware": summarise(sdp.FPGA_hardware_version_R),
        "SDPTR":         sdp.TR_software_version_R,
    },
    "RECV": {
        "PCB": summarise(recv.RCU_PCB_version_R),
    },
    "APSCT": {
        "PCB": apsct.APSCT_PCB_version_R,
    },
    "APSPU": {
        "PCB": apspu.APSPU_PCB_version_R,
    },
    "UNB2": {
        "PCB": summarise(unb2.UNB2_PCB_version_R),
    }
 }
 from pprint import pprint
 pprint(versions, width=120)
 ```
 %% Cell type:markdown id:e51a06b7 tags:
 ## Test setup
 Setup the hardware for the test:
 %% Cell type:code id:e72dc2df tags:
 ``` python
 # Your code to configure the station for this test
 ```
 %% Cell type:markdown id:772dff7c tags:
 ## Run test
 %% Cell type:code id:26570aea tags:
 ``` python
 # Your code that triggers the actual test (if this is an explicit step)
 ```
 %% Cell type:markdown id:6c604116 tags:
 ## Test results
 %% Cell type:code id:d290d8dd tags:
 ``` python
 # plot sst in after
 ```
 %% Cell type:markdown id:d3cdb620 tags:
 ## Discuss results
 How should the results be interpreted? Are there remaining worries and todo's based on this result?
 %% Cell type:markdown id:6e082c7c tags:
 (Explain results, and caveats)
 %% Cell type:markdown id:a95fbf48 tags:
 ## Verdict
 The test passed/did not pass:
 %% Cell type:markdown id:9a2a7a97 tags:
 (Explain whether the result is good enough, or what needs to be done to improve)

--- a/tangostationcontrol/tangostationcontrol/devices/apsct.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apsct.py
@@ -79,7 +79,30 @@ class APSCT(opcua_device):
    def read_APSCT_error_R(self):
        return ((self.proxy.APSCTTR_I2C_error_R > 0)
-               | self.alarm_val("APSCT_PCB_ID_R"))
+               | self.alarm_val("APSCT_PCB_ID_R")
+               | ~self.proxy.APSCT_INPUT_10MHz_good_R
+               | (~self.proxy.APSCT_INPUT_PPS_good_R & ~self.proxy.ASPCT_PPS_ignore_R)
+               | (~self.proxy.APSCT_PLL_160MHz_locked_R & ~self.proxy.APSCT_PLL_200MHz_locked_R)
+               | (self.proxy.APSCT_PLL_200MHz_locked_R & self.proxy.APSCT_PLL_200MHz_error_R)
+               | (self.proxy.APSCT_PLL_160MHz_locked_R & self.proxy.APSCT_PLL_160MHz_error_R)
+               )
+    APSCT_TEMP_error_R            = attribute(dtype=bool)
+    APSCT_VOUT_error_R            = attribute(dtype=bool)
+    def read_APSCT_TEMP_error_R(self):
+        return (self.alarm_val("APSCT_TEMP_R"))
+    def read_APSCT_VOUT_error_R(self):
+        return ( self.alarm_val("APSCT_PWR_PPSDIST_3V3_R")
+               | self.alarm_val("APSCT_PWR_CLKDIST1_3V3_R")
+               | self.alarm_val("APSCT_PWR_CLKDIST2_3V3_R")
+               | self.alarm_val("APSCT_PWR_CTRL_3V3_R")
+               | self.alarm_val("APSCT_PWR_INPUT_3V3_R")
+               | (self.proxy.APSCT_PWR_PLL_160MHz_on_R & self.alarm_val("APSCT_PWR_PLL_160MHz_3V3_R"))
+               | (self.proxy.APSCT_PWR_PLL_200MHz_on_R & self.alarm_val("APSCT_PWR_PLL_200MHz_3V3_R"))
+               | ~self.proxy.APSCT_PWR_on_R
+               )
    # --------
    # overloaded functions

--- a/tangostationcontrol/tangostationcontrol/devices/apspu.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apspu.py
@@ -72,6 +72,28 @@ class APSPU(opcua_device):
               | self.alarm_val("APSPU_FAN2_RPM_R") 
               | self.alarm_val("APSPU_FAN3_RPM_R"))
+    APSPU_IOUT_error_R          = attribute(dtype=bool)
+    APSPU_TEMP_error_R          = attribute(dtype=bool)
+    APSPU_VOUT_error_R          = attribute(dtype=bool)
+    def read_APSPU_IOUT_error_R(self):
+        return ( self.alarm_val("APSPU_LBA_IOUT_R")
+               | self.alarm_val("APSPU_RCU2A_IOUT_R")
+               | self.alarm_val("APSPU_RCU2D_IOUT_R")
+               )
+    def read_APSPU_TEMP_error_R(self):
+        return ( self.alarm_val("APSPU_LBA_TEMP_R")
+               | self.alarm_val("APSPU_RCU2A_TEMP_R")
+               | self.alarm_val("APSPU_RCU2D_TEMP_R")
+               )
+    def read_APSPU_VOUT_error_R(self):
+        return ( self.alarm_val("APSPU_LBA_VOUT_R")
+               | self.alarm_val("APSPU_RCU2A_VOUT_R")
+               | self.alarm_val("APSPU_RCU2D_VOUT_R")
+               )
    # --------
    # overloaded functions
    # --------

--- a/tangostationcontrol/tangostationcontrol/devices/lofar_device.py
+++ b/tangostationcontrol/tangostationcontrol/devices/lofar_device.py
@@ -266,7 +266,7 @@ class lofar_device(Device, metaclass=DeviceMeta):
        # This is just the command version of _initialise_hardware().
        self._initialise_hardware()
-    def _boot_device(self, initialise_hardware=True):
+    def _boot(self, initialise_hardware=True):
        # setup connections
        self.Initialise()

--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -186,6 +186,32 @@ class RECV(opcua_device):
                 ~self.proxy.RCU_ADC_locked_R
               )
+    RECV_IOUT_error_R          = attribute(dtype=(bool,), max_dim_x=32)
+    RECV_TEMP_error_R          = attribute(dtype=(bool,), max_dim_x=32)
+    RECV_VOUT_error_R          = attribute(dtype=(bool,), max_dim_x=32)
+    def read_RECV_IOUT_error_R(self):
+        return self.proxy.ANT_mask_RW & (
+                 self.alarm_val("RCU_PWR_ANT_IOUT_R")
+               ).any(axis=1)
+    def read_RECV_TEMP_error_R(self):
+        return self.proxy.RCU_mask_RW & (
+                 self.alarm_val("RCU_TEMP_R")
+               )
+    def read_RECV_VOUT_error_R(self):
+        return (self.proxy.ANT_mask_RW & (
+                 self.alarm_val("RCU_PWR_ANT_VIN_R")
+               | self.alarm_val("RCU_PWR_ANT_VOUT_R")
+               ).any(axis=1) | (self.proxy.RCU_mask_RW & (
+                 self.alarm_val("RCU_PWR_1V8_R")
+               | self.alarm_val("RCU_PWR_2V5_R")
+               | self.alarm_val("RCU_PWR_3V3_R")
+               | ~self.proxy.RCU_PWR_DIGITAL_on_R
+               | ~self.proxy.RCU_PWR_good_R
+               )))
    # --------
    # overloaded functions
    # --------

--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
@@ -214,6 +214,7 @@ class SDP(opcua_device):
    def read_FPGA_error_R(self):
        return self.proxy.TR_fpga_mask_RW & (
                 self.proxy.TR_fpga_communication_error_R
+               | self.alarm_val(self.proxy.FPGA_jesd204b_csr_dev_syncn_R).any(axis=1)
               )
    def read_FPGA_processing_error_R(self):

--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
@@ -104,6 +104,16 @@ class SST(Statistics):
    # whether the subband data was calibrated by the SDP (that is, were subband weights applied)
    subbands_calibrated_R   = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "subbands_calibrated"}, dims=(SSTCollector.MAX_INPUTS,), datatype=numpy.bool_)
+    # ----------
+    # Summarising Attributes
+    # ----------
+    FPGA_processing_error_R      = attribute(dtype=(bool,), max_dim_x=16)
+    def read_FPGA_processing_error_R(self):
+        return self.sdp_proxy.TR_fpga_mask_RW & (
+                 ~self.proxy.FPGA_sst_offload_enable_R
+               )
    # --------
    # Overloaded functions
    # --------

--- a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
@@ -13,6 +13,7 @@
 # PyTango imports
 from tango.server import device_property
+from tango import DeviceProxy
 # Additional import
 import asyncio
@@ -123,6 +124,9 @@ class Statistics(opcua_device):
        future = asyncio.run_coroutine_threadsafe(self._connect_statistics(), self.statistics_client.event_loop)
        _ = future.result()
+        # proxy the SDP device in case we need the FPGA mask
+        self.sdp_proxy = DeviceProxy("STAT/SDP/1")
    async def _connect_statistics(self):
        # map an access helper class
        for i in self.attr_list():

--- a/tangostationcontrol/tangostationcontrol/devices/sdp/xst.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/xst.py
@@ -144,6 +144,16 @@ class XST(Statistics):
    def read_xst_phase_R(self):
        return numpy.angle(self.statistics_client.collector.xst_values())
+    # ----------
+    # Summarising Attributes
+    # ----------
+    FPGA_processing_error_R      = attribute(dtype=(bool,), max_dim_x=16)
+    def read_FPGA_processing_error_R(self):
+        return self.sdp_proxy.TR_fpga_mask_RW & (
+                 ~self.proxy.FPGA_xst_offload_enable_R
+               )
    # --------
    # Overloaded functions
    # --------

--- a/tangostationcontrol/tangostationcontrol/devices/unb2.py
+++ b/tangostationcontrol/tangostationcontrol/devices/unb2.py
@@ -123,24 +123,66 @@ class UNB2(opcua_device):
    # Summarising Attributes
    # ----------
    UNB2_error_R                  = attribute(dtype=(bool,), max_dim_x=2)
-    UNB2_FPGA_error_R             = attribute(dtype=((bool,),), max_dim_x=4, max_dim_y=2)
-    UNB2_QSFP_error_R             = attribute(dtype=((bool,),), max_dim_x=24, max_dim_y=2)
    def read_UNB2_error_R(self):
        return self.proxy.UNB2_mask_RW & (
                 (self.proxy.UNB2TR_I2C_bus_error_R > 0)
               | self.alarm_val("UNB2_PCB_ID_R")
+               | (self.proxy.UNB2TR_I2C_bus_DDR4_error_R > 0).any(axis=1)
+               | (self.proxy.UNB2TR_I2C_bus_FPGA_PS_error_R > 0).any(axis=1)
+               | (self.proxy.UNB2TR_I2C_bus_QSFP_error_R > 0).any(axis=1)
               )
-    def read_UNB2_FPGA_error_R(self):
+    UNB2_IOUT_error_R          = attribute(dtype=(bool,), max_dim_x=2)
+    UNB2_TEMP_error_R          = attribute(dtype=(bool,), max_dim_x=2)
+    UNB2_VOUT_error_R          = attribute(dtype=(bool,), max_dim_x=2)
+    def read_UNB2_IOUT_error_R(self):
+        return self.proxy.UNB2_mask_RW & (
+                 self.alarm_val("UNB2_DC_DC_48V_12V_IOUT_R")
+               | self.alarm_val("UNB2_FPGA_POL_CORE_IOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_ERAM_IOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_HGXB_IOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_PGM_IOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_RXGXB_IOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_TXGXB_IOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_POL_CLOCK_IOUT_R")
+               | self.alarm_val("UNB2_POL_QSFP_N01_IOUT_R")
+               | self.alarm_val("UNB2_POL_QSFP_N23_IOUT_R")
+               | self.alarm_val("UNB2_POL_SWITCH_1V2_IOUT_R")
+               | self.alarm_val("UNB2_POL_SWITCH_PHY_IOUT_R")
+               )
+    def read_UNB2_TEMP_error_R(self):
        return self.proxy.UNB2_mask_RW & (
-                 (self.proxy.UNB2TR_I2C_bus_DDR4_error_R > 0)
+                 self.alarm_val("UNB2_DC_DC_48V_12V_TEMP_R")
-               | (self.proxy.UNB2TR_I2C_bus_FPGA_PS_error_R > 0)
+               | self.alarm_val("UNB2_FPGA_POL_CORE_TEMP_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_ERAM_TEMP_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_HGXB_TEMP_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_PGM_TEMP_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_RXGXB_TEMP_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_TXGXB_TEMP_R").any(axis=1)
+               | self.alarm_val("UNB2_POL_CLOCK_TEMP_R")
+               | self.alarm_val("UNB2_POL_QSFP_N01_TEMP_R")
+               | self.alarm_val("UNB2_POL_QSFP_N23_TEMP_R")
+               | self.alarm_val("UNB2_POL_SWITCH_1V2_TEMP_R")
+               | self.alarm_val("UNB2_POL_SWITCH_PHY_TEMP_R")
               )
-    def read_UNB2_QSFP_error_R(self):
+    def read_UNB2_VOUT_error_R(self):
        return self.proxy.UNB2_mask_RW & (
-                 (self.proxy.UNB2TR_I2C_bus_QSFP_error_R > 0)
+                 self.alarm_val("UNB2_DC_DC_48V_12V_VOUT_R")
+               | self.alarm_val("UNB2_FPGA_POL_CORE_VOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_ERAM_VOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_HGXB_VOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_PGM_VOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_RXGXB_VOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_FPGA_POL_TXGXB_VOUT_R").any(axis=1)
+               | self.alarm_val("UNB2_POL_CLOCK_VOUT_R")
+               | self.alarm_val("UNB2_POL_QSFP_N01_VOUT_R")
+               | self.alarm_val("UNB2_POL_QSFP_N23_VOUT_R")
+               | self.alarm_val("UNB2_POL_SWITCH_1V2_VOUT_R")
+               | self.alarm_val("UNB2_POL_SWITCH_PHY_VOUT_R")
               )
    # --------