rsmp 0.9.5 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774c3a61fac3a93f87f5d8512da860cbf28cbfb47ff568d2035006d08ac98cf1
-  data.tar.gz: 238b160b9786c76e78639f9c470abcb196aa24476466a1e2ca53cbca8f41eb03
+  metadata.gz: 34b503622433b88389b62af2deca5e8c296fb305701ed1a8ed92b9b32dfe8893
+  data.tar.gz: b76db428241ac087692925b5b259f55e40145a13f0436e56be4eb698688b6edb
 SHA512:
-  metadata.gz: c8573e91e6d88cc6be7806d81098e4894d3b220f50997867fca64b8c1161f5f6019fed0383a70c7ee48d61182cdd0a38feb9be3509d2c624224235147839831c
-  data.tar.gz: 487cc05ad5fdb48ad7efbc5415640f2d1aeac49bebb7c2989b97e251a6d1d34e2bce6c6b03596190083c4eeb9b48eaaf33023d8ce382961c25f09a2c17c9db8b
+  metadata.gz: bb0a905c3129dfa6960178fe427490950d10f4d04dd58ece46cea4ccfb318abffd18835b6a7b4cbefeb80103542be68c1a258687b97f632bbaa574cff409f73c
+  data.tar.gz: 87e9b41facacfd9170874c1a19f5a3738261d55b8cd4eeecc53c51c5a540c0c6503e3756f8bdaa59dbf5eb7393c66ae5d61e93f77a58ad0bbe634a1886076061

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.5)
+    rsmp (0.9.8)
       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/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
@@ -268,14 +276,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 +451,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.5"
+  VERSION = "0.9.8"
 end

metadata

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