rsmp 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13ff840a61dbc75246df268480d7951f4ca33df2428029a57447e6fb22ea8f9
-  data.tar.gz: a1aa8675badf8c95bc50dba84a214a06a15192fb8fb6ff8b4b6bc0e023cc1277
+  metadata.gz: 83dbe8238263a30a4bc752d457cf3983bf2e330ed3dcf7d3268816d0cc90004d
+  data.tar.gz: 8af75efe50283c758bf86daa86748734a0383f380810da295b4db9fa7dfa259f
 SHA512:
-  metadata.gz: de8156a19d3d090deb7c44bdd915141a615dd405ad82e0c0ac5612097bffaf89f0986d379a83787b0ed2bb9c3bae67ff98108c4b42879ed7d5edac0e067294af
-  data.tar.gz: 9c41f6118a666513e778fe549cd44b7ac22b94dc98dfe4ae9ae64a5b2583aa505b7addf65cd18afa5290449005c3ef9558f54a09bd7565b7faf51364d43812ef
+  metadata.gz: a90d43cfd4dc1ef13470d49c069275db44b27525f5a6479482faa485ed2b73303be8eac51f8ca7f392faa8db527d18282554ca76fb10f59126f745551af4d41f
+  data.tar.gz: 260b864955ed33d5991149957286108e2260017ff9b434aeb68321dd265cc52bad8e5b902d707941e666cb0d4bbef54455478dddab7cd0e9a0c88c609154b383

data/Gemfile.lock

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

data/lib/rsmp/collect/alarm_collector.rb

@@ -14,7 +14,7 @@ module RSMP
       return false if super(message) == false
 
       # match fixed attributes
-      %w{aCId aSp ack aS sS cat pri}.each do |key|
+      %w{cId aCId aSp ack aS sS cat pri}.each do |key|
         want = @query[key]
         got = message.attribute(key)
         case want

data/lib/rsmp/tlc/traffic_controller.rb

@@ -298,16 +298,21 @@ module RSMP
 
       def input_logic input, change
         return unless @input_programming && change != nil
-        actions = @input_programming[input]
-        return unless actions
-        if actions['raise']
-          alarm_code = actions['raise']
+        action = @input_programming[input]
+        return unless action
+        if action['raise_alarm']
+          if action['component']
+            component = node.find_component action['component']
+          else
+            component = node.main
+          end
+          alarm_code = action['raise_alarm']
           if change
-            log "Activating input #{input} is programmed to activate alarm #{alarm_code}", level: :info
-            activate_alarm alarm_code
+            log "Activating input #{input} is programmed to raise alarm #{alarm_code} on #{component.c_id}", level: :info
+            component.activate_alarm alarm_code
           else
-            log "Deactivating input #{input} is programmed to deactivate alarm #{alarm_code}", level: :info
-            deactivate_alarm alarm_code
+            log "Deactivating input #{input} is programmed to clear alarm #{alarm_code} on #{component.c_id}", level: :info
+            component.deactivate_alarm alarm_code
           end
         end
       end

data/lib/rsmp/version.rb

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

metadata

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