rsmp 0.9.6 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a71b0cd593d1ab4c3f9d0707929106b73d9ec6d8ce36a0f087f3efa73dccc3
-  data.tar.gz: 553a83ff465de1d07cc7e82531100059686caaf59710f7a452adbf07452f0bb0
+  metadata.gz: 71af49e549129bf32f9137a2799c91b43ba19e5e7adb15f777a181919c19dbd0
+  data.tar.gz: 15c8f8c96ed3838f0b0b948b5d0e9be895ec965a9f651a529a44b214426242ec
 SHA512:
-  metadata.gz: df2053f172e30f6fd57fe6794b99636729a0909ae1e382b12171ec5927fa744b3ec9ba689ebdde117fb8744c2b2182bff1d91c97e8936aeb1dafff53fb663fd5
-  data.tar.gz: 5eefd3e4c7ebe6c9eeeaf5e9c29f7681b52f69dc42e122afeda559b81698644ceb64b8321e4785df8c485f9fc8c235751ac5676e0a3d0e9289a0857847bedd2d
+  metadata.gz: 33206373986495e8c8d9871c83d465d2961db86c2713e0056eb1e5a0fb6f153dc506c05f549bc52f6963f7aeb7e1b7f78f387b479893babe8f0d77cd0efbffe3
+  data.tar.gz: 125e125b49bb0a5d99234d8aa4bac4a3107de077fb7adc55a1e70cbf0544c0b163355cfac4a94eeae1e412b8951e4f5fab8d2846187e2d7479c626e0adf81530

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.6)
+    rsmp (0.9.9)
       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/error.rb

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

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/traffic_controller.rb

@@ -10,14 +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
+          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
+
+        if inputs
+          @num_inputs = inputs['total'] || 8
+          @input_programming = inputs['programming']
+        else
+          @num_inputs = 8
+          @input_programming = nil
+        end
+
         @startup_sequence = startup_sequence
         @live_output = live_output
         reset
@@ -274,11 +282,24 @@ module RSMP
         idx = input - 1
         @input_activations[idx] = bool_string_to_digit arg['status']
         recompute_input idx
-        if @input_activations[idx] == '1'
+        activate = @input_activations[idx] == '1'
+        if activate
           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
       end
 
       def handle_m0007 arg
@@ -359,9 +380,8 @@ module RSMP
         @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
+        unless input>0 && input<=@num_inputs
+          raise MessageRejected.new("Can't force input #{input}, only have #{@num_inputs} inputs")
         end
         @input_forced[idx] = bool_string_to_digit arg['status']
         if @input_forced[idx]
@@ -369,9 +389,9 @@ module RSMP
         end
         recompute_input idx
         if @input_forced[idx]
-          log "Forcing input #{idx+1} to #{@input_forced_values[idx]}, #{@input_results}", level: :info
+          log "Forcing input #{input} to #{@input_forced_values[idx]}", level: :info
         else
-          log "Releasing input #{idx+1}", level: :info
+          log "Releasing input #{input}", level: :info
         end
       end
 
@@ -430,7 +450,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.6"
+  VERSION = "0.9.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.9
 platform: ruby
 authors:
 - Emil Tin