rsmp 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13ff840a61dbc75246df268480d7951f4ca33df2428029a57447e6fb22ea8f9
-  data.tar.gz: a1aa8675badf8c95bc50dba84a214a06a15192fb8fb6ff8b4b6bc0e023cc1277
+  metadata.gz: 701cfd78320191f3eac511d2354805e3c6ae09fde33f8d4655f84a8c16bb1572
+  data.tar.gz: 42d496b37c21f574fe773000c8108895211995e2b1a116d9ef207cf15ae3fef8
 SHA512:
-  metadata.gz: de8156a19d3d090deb7c44bdd915141a615dd405ad82e0c0ac5612097bffaf89f0986d379a83787b0ed2bb9c3bae67ff98108c4b42879ed7d5edac0e067294af
-  data.tar.gz: 9c41f6118a666513e778fe549cd44b7ac22b94dc98dfe4ae9ae64a5b2583aa505b7addf65cd18afa5290449005c3ef9558f54a09bd7565b7faf51364d43812ef
+  metadata.gz: 70dfea6c8e226230e15e9d0465287e79131787a62ad7f5f43441e65fd9df1b440f3c9a9ac86a8162df43a141530533eb8f166ac73e49966841d881467d68c2ef
+  data.tar.gz: 8247714df9cf91560df02b13a8d0e108d2769f94eed345f87e7244eb9ac46120761c4603068c3a1478a7800d7bfd22a86cbc665f2aba2bba94378891daba4b8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.18.1)
+    rsmp (0.19.0)
       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/proxy.rb

@@ -299,13 +299,9 @@ module RSMP
       latest = @latest_watchdog_received + timeout
       left = latest - now
       if left < 0
-        str = "No Watchdog within #{timeout} seconds"
-        log str, level: :error
-          begin
-            close                                   # this will stop the current task (ourself)
-          ensure
-            notify_error MissingWatchdog.new(str)   # but ensure block will still be reached
-          end
+        str = "No Watchdog received within #{timeout} seconds"
+        log str, level: :warning
+        notify MissingWatchdog.new(str)
       end
     end
 

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.19.0"
 end

metadata

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