rsmp 0.9.7 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9634c9a0b4e843d2f9d53f85023a51584a4686bea45aeb4cc74dbca7d63a117b
-  data.tar.gz: 598c15d07dc9dd22bda5e4901e2537b902b675af9a88281c2dae9b494d41a52f
+  metadata.gz: f9afdedb545513c5574db59a28f07515866dbd34d8908767813275518ee590cd
+  data.tar.gz: e6fa96a531f450ce114601a57f91045ade415bb9317c5155a57a05054acf6481
 SHA512:
-  metadata.gz: 990b18990bc24622bdceb84c9f19a247fb3c6e6cca82fb0a4019e1aa1da7f33503f182ebd4d7789ab890c4d9d51c83062f7f6ff8ab96681bc8cd98cc626418e8
-  data.tar.gz: 20d4a23d38c6cce0ce46fe7def72d90a822627f51800a82d90c06f433e7104d3336a1c300ba6462038c641d08378980ceb794dc0ec54a91d36a17b21d1bf589a
+  metadata.gz: c3a2fbb33b4789e0cc0200156f759014eab17b51a23f78e486fd8fa67e54da1ac241bdd1c1b6c77ce0b0534d8447607b8806105433920ef7d00733183c2e67de
+  data.tar.gz: c6cf57cc0b98b54c541293283b7810de1ce218a3c22454d925db5727706b1d29793493d2cc0bff6f96e932c8dc6e9f5dffab005ebba79785617f9292c056575c

data/Gemfile.lock

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

data/lib/rsmp/site_proxy.rb

@@ -72,7 +72,7 @@ module RSMP
         else
           super message
       end
-    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError => e
+    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError, RSMP::TimestampError => e
       str = "Rejected #{message.type} message,"
       dont_acknowledge message, str, "#{e}"
       notify_error e.exception("#{str}#{e.message} #{message.json}")

data/lib/rsmp/tlc/inputs.rb

@@ -0,0 +1,134 @@
+module RSMP
+  module TLC
+    # class that maintains the state of TLC inputs
+    # indexing is 1-based since that's how the RSMP messages are specified 
+    class Inputs
+      attr_reader :size
+
+      def initialize size
+        @size = size
+        reset
+      end
+
+      def reset
+        string_size = @size+1
+        @value = '0'*string_size
+        @forced = '0'*string_size
+        @forced_value = '0'*string_size
+        @actual = '0'*string_size
+      end
+
+      def set input, value
+        check_input input
+        report_change(input) do
+          @value[input] = to_digit value
+          update_actual input
+        end
+      end
+
+      def set_forcing input, force=true, forced_value=true
+        check_input input
+        report_change(input) do
+          @forced[input] = to_digit force
+          @forced_value[input] = to_digit forced_value
+          update_actual input
+        end
+      end
+
+      def force input, forced_value=true
+        report_change(input) do
+          set_forcing input, true, forced_value
+        end
+      end
+
+      def release input
+        report_change(input) do
+          set_forcing input, false, false
+        end
+      end
+
+      def value input
+        check_input input
+        from_digit @value[input]
+      end
+
+      def forced? input
+        check_input input
+        from_digit @forced[input]
+      end
+
+      def forced_value input
+        check_input input
+        from_digit @forced_value[input]
+      end
+
+      def actual input
+        check_input input
+        from_digit @actual[input]
+      end
+
+      def report input
+        {
+          value: value(input),
+          forced: forced?(input),
+          forced_value: forced_value(input),
+          actual:actual(input)
+        }
+      end
+
+      def value_string
+        @value[1..-1]
+      end
+
+      def value_string
+        @value[1..-1]
+      end
+
+      def forced_string
+        @forced[1..-1]
+      end
+
+      def forced_value_string
+        @forced[1..-1]
+      end
+
+      def actual_string
+        @actual[1..-1]
+      end
+
+      protected
+
+      def check_input input
+        raise ArgumentError.new("Input index #{input} must be in the range 1-#{@size}") if input<1 || input>@size
+      end
+   
+      def from_digit input
+        input == '1'
+      end
+
+      def to_digit input
+        input ? '1' : '0'
+      end
+
+      def update_actual input
+        if from_digit @forced[input]
+          @actual[input] = @forced_value[input]
+        else
+          @actual[input] = @value[input]
+        end          
+      end
+
+      def report_change input, &block
+        before = @actual[input]
+        yield
+        if @actual[input] != before
+          from_digit @actual[input]
+        else
+          nil
+        end
+      end
+    end
+  end
+end
+
+

data/lib/rsmp/tlc/traffic_controller.rb

@@ -10,15 +10,22 @@ module RSMP
         :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
       def initialize node:, id:, cycle_time: 10, signal_plans:,
-          startup_sequence:, live_output:nil, inputs:
+          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 = inputs['total']
-        @input_programming = inputs['programming']
+
+        if inputs
+          num_inputs = inputs['total']
+          @input_programming = inputs['programming']
+        else
+          @input_programming = nil
+        end
+        @inputs = TLC::Inputs.new num_inputs || 8
+
         @startup_sequence = startup_sequence
         @live_output = live_output
         reset
@@ -41,25 +48,18 @@ module RSMP
 
       def reset
         reset_modes
-
         @cycle_counter = 0
         @plan = 1
         @intersection = 0
         @emergency_route = false
         @emergency_route_number = 0
         @traffic_situation = 0
-
-        @inputs = '0'*@num_inputs
-        @input_activations = '0'*@num_inputs
-        @input_forced = '0'*@num_inputs
-        @input_forced_values = '0'*@num_inputs
-        @input_results = '0'*@num_inputs
-
         @day_time_table = {}
         @startup_sequence_active = false
         @startup_sequence_initiated_at = nil
         @startup_sequence_pos = 0
         @time_int = nil
+        @inputs.reset
       end
 
       def dark?
@@ -256,43 +256,34 @@ module RSMP
         end
       end
 
-      def recompute_input idx
-        if @input_forced[idx] == '1'
-          @input_results[idx] = @input_forced_values[idx]
-        elsif @input_activations[idx]=='1'
-          @input_results[idx] = '1'
-        else
-          @input_results[idx] = bool_to_digit( @inputs[idx]=='1' )
+      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']
+          if change
+            log "Activating alarm #{alarm_code}, because input #{input} was activated", level: :info
+          else
+            log "Deactivating alarm #{alarm_code}, because input #{input} was deactivated", level: :info
+          end
         end
       end
 
       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
-        @input_activations[idx] = bool_string_to_digit arg['status']
-        recompute_input idx
-        activate = @input_activations[idx] == '1'
-        if activate
+        status = string_to_bool arg['status']
+        unless input>=1 && input<=@inputs.size
+          raise MessageRejected.new("Input must be in the range 1-#{@inputs.size}")
+        end
+        if status
           log "Activating input #{input}", level: :info
         else
           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
+        change = @inputs.set input, status
+        input_logic input, change if change != nil
       end
 
       def handle_m0007 arg
@@ -354,6 +345,17 @@ module RSMP
         @node.verify_security_code 2, arg['securityCode']
       end
 
+      def string_to_bool bool_str
+        case bool_str
+          when 'True'
+            true
+          when 'False'
+            false
+          else
+            raise RSMP::MessageRejected.new "Invalid boolean '#{bool}', must be 'True' or 'False'"
+        end
+      end
+
       def bool_string_to_digit bool
         case bool
           when 'True'
@@ -372,21 +374,18 @@ module RSMP
       def handle_m0019 arg
         @node.verify_security_code 2, arg['securityCode']
         input = arg['input'].to_i
-        idx = input - 1
-        unless idx>=0 && input<@num_inputs # TODO should NotAck
-          log "Can't force input #{idx+1}, only have #{@num_inputs} inputs", level: :warning
-          return
-        end
-        @input_forced[idx] = bool_string_to_digit arg['status']
-        if @input_forced[idx]
-          @input_forced_values[idx] = bool_string_to_digit arg['inputValue']
-        end
-        recompute_input idx
-        if @input_forced[idx]
-          log "Forcing input #{idx+1} to #{@input_forced_values[idx]}, #{@input_results}", level: :info
+        force = string_to_bool arg['status']
+        forced_value = string_to_bool arg['inputValue']
+        unless input>=1 && input<=@inputs.size
+          raise MessageRejected.new("Input must be in the range 1-#{@inputs.size}")
+        end
+        if force
+          log "Forcing input #{input} to #{forced_value}", level: :info
         else
-          log "Releasing input #{idx+1}", level: :info
+          log "Releasing input #{input}", level: :info
         end
+        change = @inputs.set_forcing input, force, forced_value
+        input_logic input, change if change != nil
       end
 
       def handle_m0020 arg
@@ -496,7 +495,7 @@ module RSMP
       def handle_s0003 status_code, status_name=nil
         case status_name
         when 'inputstatus'
-          TrafficControllerSite.make_status @input_results
+          TrafficControllerSite.make_status @inputs.actual_string
         when 'extendedinputstatus'
           TrafficControllerSite.make_status 0.to_s
         end
@@ -698,7 +697,7 @@ module RSMP
       def handle_s0029 status_code, status_name=nil
         case status_name
         when 'status'
-          TrafficControllerSite.make_status @input_forced
+          TrafficControllerSite.make_status @inputs.forced_string
         end
       end
 

data/lib/rsmp/version.rb

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

data/lib/rsmp.rb

@@ -44,6 +44,7 @@ require 'rsmp/tlc/traffic_controller'
 require 'rsmp/tlc/detector_logic'
 require 'rsmp/tlc/signal_group'
 require 'rsmp/tlc/signal_plan'
+require 'rsmp/tlc/inputs'
 
 require 'rsmp/convert/import/yaml'
 require 'rsmp/convert/export/json_schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.10
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -243,6 +243,7 @@ files:
 - lib/rsmp/supervisor_proxy.rb
 - lib/rsmp/task.rb
 - lib/rsmp/tlc/detector_logic.rb
+- lib/rsmp/tlc/inputs.rb
 - lib/rsmp/tlc/signal_group.rb
 - lib/rsmp/tlc/signal_plan.rb
 - lib/rsmp/tlc/traffic_controller.rb