diff --git a/ESS/v7/_init.yaml b/ESS/v7/_init.yaml index 53522cbb..e0997d3f 100644 --- a/ESS/v7/_init.yaml +++ b/ESS/v7/_init.yaml @@ -21,6 +21,9 @@ instances: MT camera rotator motor 1, MT camera rotator motor 2 +# - sal_index: 101 -> now 111 +# - sal_index: 102 -> now 112 +# - sal_index: 103 -> now 113 - sal_index: 104 data_clients: - client_class: LabJackAccelerometerDataClient @@ -179,7 +182,7 @@ instances: config: host: camera-ess01.cp.lsst.org devices: - - name: M1M3-ESS01 + - name: Camera-ESS01 device_type: Serial serial_port: /dev/serial1 sensor_type: HX85A @@ -188,9 +191,9 @@ instances: data_clients: - client_class: ControllerDataClient config: - host: m2-ess01.cp.lsst.org + host: m2-ess02.cp.lsst.org devices: - - name: MTDome-ESS02 + - name: M2-ESS02 device_type: Serial serial_port: /dev/serial1 sensor_type: HX85A @@ -201,7 +204,7 @@ instances: config: host: m1m3-ess01.cp.lsst.org devices: - - name: MTDome-ESS03 + - name: M1M3-ESS03 device_type: Serial serial_port: /dev/serial1 sensor_type: HX85BA @@ -330,7 +333,7 @@ instances: location: AT Dome # 1 sample per second so for 1 minute that is 60 samples. num_samples: 60 -# - sal_index: 205 This used to be used for the Gill anemometer which is now 110. +# - sal_index: 205 -> now 110 - sal_index: 301 data_clients: @@ -357,3 +360,13 @@ instances: scale_offset_wind_speed: [0.0834, 0] scale_rain_rate: 0.25 location: "Weather tower" + - sal_index: 302 + data_clients: + - client_class: EarthquakeDataClient + config: + host: 139.229.178.22 + port: 6330 + serial_id: 01000018753C8C49 + max_read_timeouts: 5 + sensor_name: Q330 + location: Inside pier 5th floor diff --git a/Jenkinsfile b/Jenkinsfile index adeb4099..3440844d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,7 @@ DevelopPipeline( extra_packages: [ // Dependencies "lsst-ts/ts_ess_common", + "lsst-ts/ts_ess_earthquake", "lsst-ts/ts_ess_labjack", "lsst-ts/ts_simactuators", "lsst-ts/ts_tcpip", diff --git a/Watcher/v6/_summit.yaml b/Watcher/v6/_summit.yaml index 91a14593..e7d106df 100644 --- a/Watcher/v6/_summit.yaml +++ b/Watcher/v6/_summit.yaml @@ -34,6 +34,7 @@ rules: - name: ESS:203 - name: ESS:204 - name: ESS:301 + - name: ESS:302 - name: Electrometer:101 - name: Electrometer:102 - name: Electrometer:201 @@ -110,6 +111,7 @@ rules: - name: ESS:203 - name: ESS:204 - name: ESS:301 + - name: ESS:302 - name: Electrometer:101 - name: Electrometer:102 - name: Electrometer:201 diff --git a/ups/ts_config_ocs.table b/ups/ts_config_ocs.table index 32443df2..359e6f4d 100644 --- a/ups/ts_config_ocs.table +++ b/ups/ts_config_ocs.table @@ -6,6 +6,7 @@ setupOptional(ts_electrometer) setupOptional(ts_epm) setupOptional(ts_ess_common) setupOptional(ts_ess_csc) +setupOptional(ts_ess_earthquake) setupOptional(ts_ess_labjack) setupOptional(ts_fiberspectrograph) setupOptional(ts_genericcamera)