rsmp 0.9.4 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49bbf353b5a4adb3d680a56cdba0a116f1b401e8f536b4a2dcc8063c355e547
-  data.tar.gz: b06a26d960020160286b64a45f670783967f2ebb214261ce821ee92126b2fab4
+  metadata.gz: 9634c9a0b4e843d2f9d53f85023a51584a4686bea45aeb4cc74dbca7d63a117b
+  data.tar.gz: 598c15d07dc9dd22bda5e4901e2537b902b675af9a88281c2dae9b494d41a52f
 SHA512:
-  metadata.gz: c91fa2fd2ed113c3ebb095e7189c1c32c54d547532c76addb1ae2ec38a13804e06e7e2c45371ea366d45a26ab10a4fe5a02d60e7529620023e8f5aae3f35361d
-  data.tar.gz: c32531fe57674815cbef9ff124c6cb0e575891e6de836fe9013e26f391efffe8b671c86b62c2da14d8472752af2b8d023e6175e4cd6eaa2cee92cdd023d52b11
+  metadata.gz: 990b18990bc24622bdceb84c9f19a247fb3c6e6cca82fb0a4019e1aa1da7f33503f182ebd4d7789ab890c4d9d51c83062f7f6ff8ab96681bc8cd98cc626418e8
+  data.tar.gz: 20d4a23d38c6cce0ce46fe7def72d90a822627f51800a82d90c06f433e7104d3336a1c300ba6462038c641d08378980ceb794dc0ec54a91d36a17b21d1bf589a

data/Gemfile.lock

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

data/config/tlc.yaml

@@ -31,6 +31,11 @@ signal_plans:
       A2: 'NNNNBN'
       B1: 'BBNNNN'
       B2: 'BNNNNN'
+inputs:
+  total: 8
+  programming:
+    8:
+      raise: A0301
 startup_sequence: 'efg'
 intervals:
   timer: 0.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/error.rb

@@ -64,4 +64,7 @@ module RSMP
 
 	class RepeatedStatusError < Error
 	end
+
+	class TimestampError < Error
+	end
 end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -10,14 +10,15 @@ module RSMP
         :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
       def initialize node:, id:, cycle_time: 10, signal_plans:,
-          startup_sequence:, live_output:nil
+          startup_sequence:, live_output:nil, inputs:
         super node: node, id: id, grouped: true
         @signal_groups = []
         @detector_logics = []
         @plans = signal_plans
         @cycle_time = cycle_time
         @num_traffic_situations = 1
-        @num_inputs = 8
+        @num_inputs = inputs['total']
+        @input_programming = inputs['programming']
         @startup_sequence = startup_sequence
         @live_output = live_output
         reset
@@ -268,14 +269,29 @@ 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] == '1'
-          log "Activating input #{idx+1}", level: :info
+        activate = @input_activations[idx] == '1'
+        if activate
+          log "Activating input #{input}", level: :info
         else
-          log "Deactivating input #{idx+1}", level: :info
+          log "Deactivating input #{input}", level: :info
+        end
+
+        if @input_programming
+          actions = @input_programming[input]
+          if actions && actions['raise']
+            alarm_code = actions['raise']
+            if activate
+              log "Activating alarm #{alarm_code}, due to input #{input} programming", level: :info
+            else
+              log "Deactivating alarm #{alarm_code}, due to input #{input} programming", level: :info
+            end
+          end
         end
       end
 
@@ -428,7 +444,7 @@ module RSMP
         if reverting
           log "Reverting to functional position #{mode} after timeout", level: :info
         elsif timeout && timeout > 0
-          log "Switching to functional position #{mode} with timeout #{timeout}min", level: :info
+          log "Switching to functional position #{mode} with timeout #{(timeout/60).round(1)}min", level: :info
           @previous_functional_position = @function_position
           now = clock.now
           @functional_position_timeout = now + timeout

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -56,7 +56,8 @@ module RSMP
             cycle_time: settings['cycle_time'],
             startup_sequence: @startup_sequence,
             signal_plans: @signal_plans,
-            live_output: @site_settings['live_output']
+            live_output: @site_settings['live_output'],
+            inputs: @site_settings['inputs']
         when 'signal_group'
           group = SignalGroup.new node: self, id: id
           @main.add_signal_group group

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.4"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.7
 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