rsmp 0.9.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4eb81e9be58fe5645d41ffe88fad923aac8ba5db14382ce0532d17721b18b0c
-  data.tar.gz: 806810e243027d1349631b1b0153c452557e9b7ad01470ff51376c6a181a3810
+  metadata.gz: 41a71b0cd593d1ab4c3f9d0707929106b73d9ec6d8ce36a0f087f3efa73dccc3
+  data.tar.gz: 553a83ff465de1d07cc7e82531100059686caaf59710f7a452adbf07452f0bb0
 SHA512:
-  metadata.gz: cfa09b0e9692c42999c97866166631e5e805c16741af046b21670a5cdaad862afa9fd532d266877da1c623b0ebb42f4d23854bac9dcb1884e095dabf6027b97a
-  data.tar.gz: 493156ab24d418536dd57a5d0a68d008320b9c896e99b33e9ed6023c061f597467569865645895b106f3e13423c686f5c3c89c2177cafbd28a1707c387a5a00c
+  metadata.gz: df2053f172e30f6fd57fe6794b99636729a0909ae1e382b12171ec5927fa744b3ec9ba689ebdde117fb8744c2b2182bff1d91c97e8936aeb1dafff53fb663fd5
+  data.tar.gz: 5eefd3e4c7ebe6c9eeeaf5e9c29f7681b52f69dc42e122afeda559b81698644ceb64b8321e4785df8c485f9fc8c235751ac5676e0a3d0e9289a0857847bedd2d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.3)
+    rsmp (0.9.6)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)

data/lib/rsmp/collect/alarm_collector.rb

@@ -1,8 +1,8 @@
 module RSMP
   # Class for waiting for specific command responses
   class AlarmCollector < Collector
-    def initialize proxy, want, options={}
-      @want = want
+    def initialize proxy,options={}
+      @query = options[:query] || {}
       super proxy, options.merge(
         type: 'Alarm',
         title:'alarm'
@@ -11,8 +11,23 @@ module RSMP
 
     def type_match? message
       return false if super(message) == false
-      [:aCId, :aSp, :ack, :aS, :sS, :cat, :pri].each do |key|
-        return false if @want[key] && @want[key] != message.attribute(key.to_s)
+
+      # match fixed attributes
+      %w{aCId aSp ack aS sS cat pri}.each do |key|
+        return false if @query[key] && @query[key] != message.attribute(key)
+      end
+
+      # match rvs items
+      if @query['rvs']
+        query_rvs = @query['rvs']
+        message_rvs = message.attributes['rvs']
+        return false unless message_rvs
+        return false unless query_rvs.all? do |query_item|
+          return false unless message_rvs.any? do |message_item|
+            next message_item['n'] == query_item['n'] && message_item['v'] == query_item['v']
+          end
+          next true
+        end
       end
       true
     end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -268,14 +268,16 @@ module RSMP
       def handle_m0006 arg
         @node.verify_security_code 2, arg['securityCode']
         input = arg['input'].to_i
+        unless input>0 && input<=@num_inputs
+          raise MessageRejected.new("Input #{idx} is invalid, must be in the range 1-#{@num_inputs}")
+        end
         idx = input - 1
-        return unless idx>=0 && input<@num_inputs # TODO should NotAck
         @input_activations[idx] = bool_string_to_digit arg['status']
         recompute_input idx
-        if @input_activations[idx]
-          log "Activating input #{idx+1}", level: :info
+        if @input_activations[idx] == '1'
+          log "Activating input #{input}", level: :info
         else
-          log "Deactivating input #{idx+1}", level: :info
+          log "Deactivating input #{input}", level: :info
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.3"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.6
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async