rsmp 0.20.7 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77314f562ebf956079f50f9cabd90be180010d39d55ecc2b96aceeab7b6da553
-  data.tar.gz: 2c67e8fcca60ecdefec7edb539f56b7625046f3ef7e8d7a0801640c05f8f0535
+  metadata.gz: 3d74ffd79480198d71bde613b754e2ab6195e7e793ed7294f192752df001c528
+  data.tar.gz: 417ff3b2692fae04709d688225b12b26fe1e69c189206855545a26b8e993f1c2
 SHA512:
-  metadata.gz: 68a66a9531bff5c01cd743ae61a2b159bae2ce0dc6cfd393b5fa9deddda3838d771cfd1025a25ec8231a5d099d5e1976bbbc9418738ee0ba528875e3d8e63327
-  data.tar.gz: bac2a033fa66291905fa0ba5a66d79a9bb114900ff7d62f4ec696b7ba5271b8454793c1866f9607f0de0638c9950a09822640935541e9663ee01f74295469834
+  metadata.gz: 661ccaa898f510a89c039f5c678e2fa796ac8efb152c6c6d0945a89afcfb111013744fa0fd8bd341d7103e47ddc9da94f55e9211b2cda16a2ee94456b72e5e8a
+  data.tar.gz: 2d2586aeec689c66fdb19d3548f1cf2f06131fadadab8a919cd894f9ca178d822b6522c7de72d235ecd35b919236ae42cf9b42c22287713bdd2a9dfd109eaf36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.20.7)
+    rsmp (0.21.0)
       async (~> 2.6.2)
       async-io (~> 1.35.0)
       colorize (~> 0.8.1)

data/lib/rsmp/node.rb

@@ -44,19 +44,19 @@ module RSMP
       @error_queue.enqueue e
     end
 
-    def defer item
-      @deferred << item
+    def defer key, item=nil
+      @deferred << [key, item]
     end
 
     def process_deferred
       cloned = @deferred.clone    # clone in case do_deferred restarts the current task
       @deferred.clear
-      cloned.each do |item|
-        do_deferred item
+      cloned.each do |pair|
+        do_deferred pair.first, pair.last
       end
     end
 
-    def do_deferred item
+    def do_deferred key,item=nil
     end
 
     def clear_deferred

data/lib/rsmp/tlc/traffic_controller.rb

@@ -344,6 +344,45 @@ module RSMP
 
       def handle_m0013 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
+        set, clear = [], []
+        arg['status'].split(';').map do |part|
+          offset, set_bits, clear_bits = part.split(',').map { |i| i.to_i }
+          set_bits.to_s(2).reverse.each_char.with_index do |bit,i|
+            set << i + offset if bit == '1'
+          end
+          clear_bits.to_s(2).reverse.each_char.with_index do |bit,i|
+            clear << i + offset if bit == '1'
+          end
+        end
+
+        set = set.uniq.sort
+        clear = clear.uniq.sort
+
+        # if input is both activated and deacticvated, there is no need to acticate first
+        set -= (set & clear)
+
+        [set,clear].each do |inputs|
+          inputs.each do |input|
+            if input<1
+            raise MessageRejected.new("Cannot acticate inputs #{set} and deactive inputs #{clear}: input #{input} is invalid (must be 1 or higher)"
+              ) if input<1
+            end
+            if input>@inputs.size
+              raise MessageRejected.new("Cannot acticate inputs #{set} and deactive inputs #{clear}: input #{input} is invalid (only #{@inputs.size} inputs present)")
+            end
+          end
+        end
+
+        log "Activating inputs #{set} and deactivating inputs #{clear}", level: :info
+
+        set.each do |input|
+          change = @inputs.set input, true
+          input_logic input, change if change != nil
+        end
+        clear.each do |input|
+          change = @inputs.set input, false
+          input_logic input, change if change != nil
+        end
       end
 
       def find_plan plan_nr
@@ -432,6 +471,7 @@ module RSMP
           log "Releasing input #{input}", level: :info
         end
         change = @inputs.set_forcing input, force, forced_value
+
         input_logic input, change if change != nil
       end
 

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -149,8 +149,8 @@ module RSMP
         end
       end
 
-      def do_deferred item
-        case item
+      def do_deferred key, item=nil
+        case key
         when :restart
           log "Restarting TLC", level: :info
           restart

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.20.7"
+  VERSION = "0.21.0"
 end

metadata

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