rsmp 0.17.4 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17b5f6f4b2a3b5c9280497906b2111d7739956f2fdb08b1052b919b77e9d093f
-  data.tar.gz: bab9a1e34d857fb60a15c8c1849dd0e6e24483753d9e5a3052f1ba9f162a0e96
+  metadata.gz: c13ff840a61dbc75246df268480d7951f4ca33df2428029a57447e6fb22ea8f9
+  data.tar.gz: a1aa8675badf8c95bc50dba84a214a06a15192fb8fb6ff8b4b6bc0e023cc1277
 SHA512:
-  metadata.gz: ba268e1647b9de5b401a285b462d4f83108266a14eab597bd3203f37a36118ee7952e6eb3ce6edf7bcdac61472337032efaf4073da3b7c7059284b5cd18b3fa8
-  data.tar.gz: 5ad8ba86f07b8159c33a47420875d29fecdd02684b16e7ea5c6bb7329f64b4a8b44928347438cef32dc51f2462ece94197ad95c5802d0118b2273d82d633bb86
+  metadata.gz: de8156a19d3d090deb7c44bdd915141a615dd405ad82e0c0ac5612097bffaf89f0986d379a83787b0ed2bb9c3bae67ff98108c4b42879ed7d5edac0e067294af
+  data.tar.gz: 9c41f6118a666513e778fe549cd44b7ac22b94dc98dfe4ae9ae64a5b2583aa505b7addf65cd18afa5290449005c3ef9558f54a09bd7565b7faf51364d43812ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.17.4)
+    rsmp (0.18.1)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)

data/lib/rsmp/alarm_state.rb

@@ -30,6 +30,13 @@ module RSMP
         'rvs' => rvs
       }
     end
+
+    def acknowledge
+      change, @acknowledged = !@acknowledged, true
+      update_timestamp if change
+      change
+    end
+
     def suspend
       change, @suspended = !@suspended, true
       update_timestamp if change
@@ -42,8 +49,11 @@ module RSMP
       change
     end
 
+    # according to the rsmp core spec, the only time an alarm changes to unanknowledged,
+    # is when it's activated. See:
+    # https://rsmp-nordic.org/rsmp_specifications/core/3.2/applicability/basic_structure.html#alarm-status
     def activate
-      change, @active = !@active, true
+      change, @active, @acknowledged = !@active, true, false
       update_timestamp if change
       change
     end

data/lib/rsmp/component.rb

@@ -13,6 +13,16 @@ module RSMP
       raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented by #{self.class}"
     end
 
+    def acknowledge_alarm alarm_code
+      alarm = get_alarm_state alarm_code
+      if alarm.acknowledge
+        log "Acknowledging alarm #{alarm_code}", level: :info
+        @node.alarm_acknowledged alarm
+      else
+        log "Alarm #{alarm_code} already acknowledged", level: :info
+      end
+    end
+
     def suspend_alarm alarm_code
       alarm = get_alarm_state alarm_code
       if alarm.suspend

data/lib/rsmp/site.rb

@@ -96,6 +96,11 @@ module RSMP
       end
     end
 
+    def alarm_acknowledged alarm_state
+      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
+      send_alarm alarm
+    end
+
     def alarm_suspended_or_resumed alarm_state
       alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Suspend') )
       send_alarm alarm

data/lib/rsmp/supervisor_proxy.rb

@@ -210,6 +210,16 @@ module RSMP
       end
     end
 
+    # handle incoming alarm acknowledge
+    def handle_alarm_acknowledge message
+      component_id = message.attributes["cId"]
+      component = @site.find_component component_id
+      alarm_code = message.attribute("aCId")
+      log "Received #{message.type} #{alarm_code} acknowledgement", message: message, level: :log
+      acknowledge message
+      component.acknowledge_alarm alarm_code
+    end
+
     # handle incoming alarm suspend
     def handle_alarm_suspend message
       component_id = message.attributes["cId"]

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.17.4"
+  VERSION = "0.18.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.18.1
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async