rsmp 0.22.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf205a7a04823c34cc07dc8b0f67ede5a6ef23526ddad4786babc2d79f1d4869
-  data.tar.gz: f63deaeaace582207b320895d7b93cdb5f8772bb9fa8891b5f47616eae9b200d
+  metadata.gz: f707eb609c41c8b27092931f6fe104d4fe9ac81d293060a9052dc28e1bf05296
+  data.tar.gz: ceedb0e9e1d64b8cfc0b5fa9f7a70f9cdfb59a22987922d1789a263cee11cdff
 SHA512:
-  metadata.gz: '06580d98b22a7e1570821362bd770f06715637b57abb5c172dc3ceed1be4a887289081382787e2df2661beb20c8487e3be051c3cc66ffebd491766423c160c6d'
-  data.tar.gz: 732432f40ab180bf37aa39c2f54f8c296678a9c7c673c694eae7334d041be10c80fff84f47625f153f0f3389cabb40b31cdae5168014c306b6a44ba5ca41f8f9
+  metadata.gz: 4ef42389d35c20d7827fc835d4d4be24790f666fd5655cfae40936379124e8baa28283b384f8c25d4a24e29fa471e0175402163b991d14e00a55fe7de9dafeb2
+  data.tar.gz: 4ec0c7c86c540379dbdc7a2a61934ee4eb38a6a8c5dabd652b2d0088c710e1890c85ecb977d15ded17d5cc04a8dfb139e1910afdff3b27e420ef4514f6af8eef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.22.0)
+    rsmp (0.23.1)
       async (~> 2.6.4)
       async-io (~> 1.36.0)
       colorize (~> 0.8.1)
@@ -106,6 +106,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x64-mingw-ucrt
   x64-mingw32
   x86_64-darwin-19

data/config/tlc.yaml

@@ -2,9 +2,9 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-core_versions: '3.2'
+core_versions: '3.2.1'
 sxl: tlc
-sxl_version: '1.1'
+sxl_version: '1.2'
 components:
   main:
     TC:

data/lib/rsmp/supervisor_proxy.rb

@@ -302,7 +302,7 @@ module RSMP
     end
 
     def rsmpify_value v
-      return v if v.is_a? Array
+      return v if v.is_a?(Array) || v.is_a?(Set)
       v.to_s
     end
 

data/lib/rsmp/tlc/traffic_controller.rb

@@ -58,8 +58,8 @@ module RSMP
         @plan_source = 'startup'
         @intersection = 0
         @intersection_source = 'startup'
-        @emergency_route = false
-        @emergency_route_number = 0
+        @emergency_routes = Set.new
+        @last_emergency_route = nil
         @traffic_situation = 0
         @traffic_situation_source = 'startup'
         @day_time_table = {}
@@ -260,7 +260,7 @@ module RSMP
       def handle_m0002 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         if TrafficControllerSite.from_rsmp_bool(arg['status'])
-          switch_plan arg['timeplan'], source: 'force'
+          switch_plan arg['timeplan'], source: 'forced'
         else
           switch_plan 0, source: 'startup'     # TODO use clock/calender
         end
@@ -286,13 +286,22 @@ module RSMP
 
       def handle_m0005 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
-        @emergency_route = (arg['status'] == 'True')
-        @emergency_route_number = arg['emergencyroute'].to_i
+        route = arg['emergencyroute'].to_i
+        enable = (arg['status'] == 'True')
+        @last_emergency_route = route
 
-        if @emergency_route
-          log "Switching to emergency route #{@emergency_route_number}", level: :info
+        if enable
+          if @emergency_routes.add? route
+            log "Enabling emergency route #{route}", level: :info
+          else
+            log "Emergency route #{route} already enabled", level: :info
+          end
         else
-          log "Switching off emergency route", level: :info
+          if @emergency_routes.delete? route
+            log "Disabling emergency route #{route}", level: :info
+          else
+            log "Emergency route #{route} already disabled", level: :info
+          end
         end
       end
 
@@ -604,7 +613,7 @@ module RSMP
              'S0008', 'S0009', 'S0010', 'S0011', 'S0012', 'S0013', 'S0014',
              'S0015', 'S0016', 'S0017', 'S0018', 'S0019', 'S0020', 'S0021',
              'S0022', 'S0023', 'S0024', 'S0026', 'S0027', 'S0028',
-             'S0029', 'S0030', 'S0031', 'S0032', 'S0033',
+             'S0029', 'S0030', 'S0031', 'S0032', 'S0033', 'S0035',
              'S0091', 'S0092', 'S0095', 'S0096', 'S0097',
              'S0205', 'S0206', 'S0207', 'S0208'
           return send("handle_#{code.downcase}", code, name, options)
@@ -659,11 +668,22 @@ module RSMP
       end
 
       def handle_s0006 status_code, status_name=nil, options={}
+        if Proxy.version_meets_requirement? options[:sxl_version], '>=1.2'
+          log "S0006 is depreciated, use S0035 instead.", level: :warning
+        end
         case status_name
         when 'status'
-          TrafficControllerSite.make_status @emergency_route
+          TrafficControllerSite.make_status @emergency_routes.include?(@last_emergency_route)
         when 'emergencystage'
-          TrafficControllerSite.make_status @emergency_route_number
+          TrafficControllerSite.make_status @last_emergency_route || 0
+        end
+      end
+
+      def handle_s0035 status_code, status_name=nil, options={}
+        case status_name
+        when 'emergencyroutes'
+          list = @emergency_routes.sort.map {|route| {'id'=>route.to_s}}
+          TrafficControllerSite.make_status list
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.22.0"
+  VERSION = "0.23.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async