rsmp 0.32.8 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 948bcd04c071a6d84f6b156e86a9ac04c6cec4c46e2b03447c2538c0a01d5bf1
-  data.tar.gz: 73fd677331b124bd37ed022b1cb0000cce4c6438c7cbd21dee811979926d54cc
+  metadata.gz: '064718260ddb212e6b01bc248c0da4f1d21c1a4a129702f8fca91c44d5f9ed25'
+  data.tar.gz: 6f3d151dc6ae03c5b4b018414226b6aac563f2467878149dd2840aae0135b6d1
 SHA512:
-  metadata.gz: 423858aed9200ffbc547bc019e681ca8c9312c5761184a84fa07098709a2fcd2bf1ef4835a1865eee3ee6305d96a3f7e53fee3a9052f52e43886b3b2bba900cf
-  data.tar.gz: 2aba496cef018ee97fbcc759413337c93635bb8b06756100710a357eb254838714f27a7833f8f39d0a82f8b287fc30a31dc18263f13d97e1fb5420205cd40572
+  metadata.gz: c9cfc58828cbefe79b7d9fb1d3225f03c26a60429d1dd71c9743a08fde84415b98f8e225ac78acbe2c7b94984c1aea77977102b35dd8b1f10521bb9cb0bc0483
+  data.tar.gz: aa89cc36fcb8c2b94df8d567f84dacca307b3dc2163b06ffb4d0f1d0f277804e85c638ea1272a614e1cd16fb0fb24ac95df922bf823a13b410cebc0ba7f18f62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.32.8)
+    rsmp (0.33.0)
       async (~> 2.16)
       async-io (~> 1.43)
       colorize (~> 1.1)

data/config/tlc.yaml

@@ -7,7 +7,6 @@ sxl_version: '1.2.1'
 components:
   main:
     TC:
-      cycle_time: 6
       ntsOId: KK+AG9998=001TC000
   signal_group:
     A1:
@@ -19,15 +18,17 @@ components:
     DL2:
 signal_plans:
   1:
-    dynamic_bands:
-      1: 0
-      2: 5
+    cycle_time: 6
     states:
       A1: '111NBB'
       A2: '11NBBB'
       B1: 'BBB11N'
       B2: 'BBB1NB'
+    dynamic_bands:
+      1: 0
+      2: 5
   2:
+    cycle_time: 6
     states:
       A1: 'NNNNBB'
       A2: 'NNNNBN'

data/lib/rsmp/tlc/signal_group.rb

@@ -30,7 +30,8 @@ module RSMP
         states = plan.states[c_id]
         return default unless states
 
-        state = states[cycle_counter]
+        counter = [cycle_counter, states.length-1].min
+        state = states[counter]
         return default unless state =~ /[a-hA-G0-9N-P]/  # valid signal group states
         state
       end

data/lib/rsmp/tlc/signal_plan.rb

@@ -4,11 +4,12 @@ module RSMP
     # A signal plan is a description of how all signal groups should change
     # state over time.
     class SignalPlan
-      attr_reader :nr, :states, :dynamic_bands
-      def initialize nr:, states:, dynamic_bands:
+      attr_reader :nr, :states, :dynamic_bands, :cycle_time
+      def initialize nr:, cycle_time:, states:, dynamic_bands:
         @nr = nr
         @states = states
         @dynamic_bands = dynamic_bands || {}
+        @cycle_time = cycle_time
       end
 
       def dynamic_bands_string
@@ -24,6 +25,11 @@ module RSMP
       def get_band band
         @dynamic_bands[ band.to_i ]
       end
+
+      def set_cycle_time cycle_time
+        raise ArgumentError if cycle_time < 0
+        @cycle_time = cycle_time
+      end
     end
   end
 end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -9,13 +9,12 @@ module RSMP
         :functional_position,
         :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
-      def initialize node:, id:, ntsOId: nil, xNId: nil, cycle_time: 10, signal_plans:,
+      def initialize node:, id:, ntsOId: nil, xNId: nil, signal_plans:,
           startup_sequence:, live_output:nil, inputs:{}
         super node: node, id: id, ntsOId: ntsOId, xNId: xNId, grouped: true
         @signal_groups = []
         @detector_logics = []
         @plans = signal_plans
-        @cycle_time = cycle_time || 10
         @num_traffic_situations = 1
 
         if inputs
@@ -142,7 +141,7 @@ module RSMP
       end
 
       def move_cycle_counter
-        counter = Time.now.to_i % @cycle_time
+        counter = Time.now.to_i % current_plan.cycle_time
         changed = counter != @cycle_counter
         @cycle_counter = counter
         changed
@@ -450,6 +449,13 @@ module RSMP
 
       def handle_m0018 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
+        nr = arg['plan'].to_i
+        cycle_time = arg['status'].to_i
+        plan = @plans[nr]
+        raise RSMP::MessageRejected.new "Plan '#{nr}' not found" unless plan
+        raise RSMP::MessageRejected.new "Cycle time must be greater or equal to zero" if cycle_time < 0
+        log "Set plan #{nr} cycle time to #{cycle_time}", level: :info
+        plan.set_cycle_time cycle_time
       end
 
       def string_to_bool bool_str
@@ -889,8 +895,11 @@ module RSMP
       def handle_s0028 status_code, status_name=nil, options={}
         case status_name
         when 'status'
-          TrafficControllerSite.make_status '00-00'
+          times = @plans.map {|nr,plan| "#{"%02d" % plan.nr}-#{"%02d" % plan.cycle_time}"}.join(",")
+          TrafficControllerSite.make_status times
         end
+      rescue StandardError => e
+        puts e
       end
 
       def handle_s0029 status_code, status_name=nil, options={}

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -41,10 +41,11 @@ module RSMP
         signal_plans.each_pair do |id,settings|
           states = nil
           bands = nil
+          cycle_time = settings['cycle_time']
           states = settings['states'] if settings
           dynamic_bands = settings['dynamic_bands'] if settings
 
-          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, states:states,dynamic_bands:dynamic_bands)
+          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, cycle_time: cycle_time, states: states, dynamic_bands: dynamic_bands)
         end
       end
 
@@ -59,7 +60,6 @@ module RSMP
             id: id,
             ntsOId: settings['ntsOId'],
             xNId: settings['xNId'],
-            cycle_time: settings['cycle_time'],
             startup_sequence: @startup_sequence,
             signal_plans: @signal_plans,
             live_output: @site_settings['live_output'],

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.32.8"
+  VERSION = "0.33.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.32.8
+  version: 0.33.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.