Add rain sensor alarm and count to safety group

sdss · Jun 25, 2024 · 111e060 · 111e060
1 parent dc0e2a3
commit 111e060
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/python/lvmecp/etc/lvmecp.yml b/python/lvmecp/etc/lvmecp.yml
@@ -150,6 +150,14 @@ modbus:
       address: 601
       mode: coil
       group: safety
+    rain_sensor_alarm:
+      address: 699
+      mode: coil
+      group: safety
+    rain_sensor_count:
+      address: 699
+      mode: holding_register
+      group: safety
 
 safety:
   override_local_mode: False

diff --git a/python/lvmecp/maskbits.py b/python/lvmecp/maskbits.py
@@ -53,6 +53,7 @@ class SafetyStatus(Maskbit):
     O2_SENSOR_UR_FAULT = 0x200
     O2_SENSOR_SR_ALARM = 0x400  # Spec room
     O2_SENSOR_SR_FAULT = 0x800
+    RAIN_SENSOR_ALARM = 0x1000
     UNKNOWN = 0x100000
 
 

diff --git a/python/lvmecp/safety.py b/python/lvmecp/safety.py
@@ -61,6 +61,10 @@ async def _update_internal(self, use_cache: bool = True):
         if safety_status.oxygen_mode_spectrograph_room == 8:
             new_status |= self.flag.O2_SENSOR_SR_FAULT
 
+        # Rain sensor
+        if safety_status.rain_sensor_alarm:
+            new_status |= self.flag.RAIN_SENSOR_ALARM
+
         if new_status.value == 0:
             new_status = self.flag.__unknown__