rsmp 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf205a7a04823c34cc07dc8b0f67ede5a6ef23526ddad4786babc2d79f1d4869
-  data.tar.gz: f63deaeaace582207b320895d7b93cdb5f8772bb9fa8891b5f47616eae9b200d
+  metadata.gz: 86e6971159c3de6157fdb7fd34884adc1a62aff9fee429798d7841b8c66be7cb
+  data.tar.gz: 2860409f7063b95317fb7bac60a12fdd50d0a48ae48cb97d888b452157ee9444
 SHA512:
-  metadata.gz: '06580d98b22a7e1570821362bd770f06715637b57abb5c172dc3ceed1be4a887289081382787e2df2661beb20c8487e3be051c3cc66ffebd491766423c160c6d'
-  data.tar.gz: 732432f40ab180bf37aa39c2f54f8c296678a9c7c673c694eae7334d041be10c80fff84f47625f153f0f3389cabb40b31cdae5168014c306b6a44ba5ca41f8f9
+  metadata.gz: ab3400ead4fe96f24ff033f48bf8c47a5eb1b7497ffff876232b5797a6b99ab73907469b2699d2159ad15d9a7c06b3c189c936e16dc1d693f31c513ccd91b984
+  data.tar.gz: 51b681148cad227590653ac1d7834e5d4375374c6d89228bdaa019896cb882560ca3b71c225d0db473bde05a8b34f7788078f02ab48c9a50d94f47cc6791df23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.22.0)
+    rsmp (0.23.0)
       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 = {}
@@ -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)
@@ -661,9 +670,17 @@ module RSMP
       def handle_s0006 status_code, status_name=nil, options={}
         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.0"
 end

metadata

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