rsmp 0.13.4 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c410efb6d18e7bc28184467c2e53f583d8a613126a620b62bfc623c84b3fb580
-  data.tar.gz: 8076d7f576d0f12e8c4e9279b81fb2df5bde8673ecc46b9f622332bec8896604
+  metadata.gz: 5e7dfc4d62630bc941181c506e6fe777e817a91270ff2797ecbfc5d0069e7d68
+  data.tar.gz: bacbfe1c630fdbae4eebf0604339820b00352b3cf7c312683f9e48751bef77a9
 SHA512:
-  metadata.gz: aadb087f7b0340cae4efa3749171edca95c666366a523880748f47f4a7623a23f8dc69eb20092eded8d82333293deec6099620245e685723fa88fb07cc917f0c
-  data.tar.gz: a26c65aa7ba36d031f4f61f62c35a92e38517f4a627db47056dd7901d027975bac9baae1db0a08b963faffaf213986447f4874ecef9a4c9908f7429c119e7457
+  metadata.gz: c9ddb8ba148e22c1919f7ba04cb727138db1e4d56750eac87a0ab03e63431990a31950c0a1ee83d45ca09e105adb478709061e7e59cfebf5d0e794a841152341
+  data.tar.gz: 1bd48de932a481cec40499c0f82cf34daab58620bb3795ca3789098424baa32e47a014373c51e0e3631229d079e3facf7a703b7cbc02f0f14cab7e032ff6e75a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.4)
+    rsmp (0.13.7)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -79,9 +79,9 @@ GEM
     multi_test (0.1.2)
     nio4r (2.5.8)
     rake (13.0.6)
-    regexp_parser (2.4.0)
-    rsmp_schemer (0.4.0)
-      json_schemer (~> 0.2.18)
+    regexp_parser (2.5.0)
+    rsmp_schemer (0.4.1)
+      json_schemer (~> 0.2.21)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)

data/config/tlc.yaml

@@ -8,6 +8,7 @@ components:
   main:
     TC:
       cycle_time: 6
+      ntsOId: KK+AG9998=001TC000
   signal_group:
     A1:
     A2:

data/lib/rsmp/alarm_state.rb

@@ -17,6 +17,19 @@ module RSMP
       @rvs = []
     end
 
+    def to_hash
+      {
+        'cId' => component_id,
+        'aCId' => code,
+        'aTs' => Clock.to_s(timestamp),
+        'ack' => (acknowledged ? 'Acknowledged' : 'notAcknowledged'),
+        'sS' => (suspended ? 'suspended' : 'notSuspended'),
+        'aS' => (active ? 'Active' : 'inActive'),
+        'cat' => category,
+        'pri' => priority.to_s,
+        'rvs' => rvs
+      }
+    end
     def suspend
       change, @suspended = !@suspended, true
       update_timestamp if change
@@ -89,6 +102,5 @@ module RSMP
       @priority = message.attribute('pri').to_i
       @rvs = message.attribute('rvs')
     end
-
   end
 end

data/lib/rsmp/components.rb

@@ -50,8 +50,8 @@ module RSMP
         component = inferred.new node: self, id: component_id
         @components[ component_id] = component
         class_name = component.class.name.split('::').last
-        class_name << " compoent" unless class_name == 'Component'
-        log "Inferred #{class_name} #{component_id}", level: :debug
+        class_name << " component" unless (class_name == 'Component' || class_name == 'ComponentProxy')
+        log "Adding component #{component_id} with the inferred type #{class_name}", level: :debug
         component
       else
         raise UnknownComponent.new("Component #{component_id} not found") unless component

data/lib/rsmp/site.rb

@@ -15,7 +15,6 @@ module RSMP
       @proxies = []
       @sleep_condition = Async::Notification.new
       @proxies_condition = Async::Notification.new
-
       build_proxies
     end
 
@@ -93,27 +92,13 @@ module RSMP
       end
     end
 
-    def alarm_state_to_hash alarm_state
-      {
-        'cId' => alarm_state.component_id,
-        'aCId' => alarm_state.code,
-        'aTs' => Clock.to_s(alarm_state.timestamp),
-        'ack' => (alarm_state.acknowledged ? 'Acknowledged' : 'notAcknowledged'),
-        'sS' => (alarm_state.suspended ? 'suspended' : 'notSuspended'),
-        'aS' => (alarm_state.active ? 'Active' : 'inActive'),
-        'cat' => alarm_state.category,
-        'pri' => alarm_state.priority.to_s,
-        'rvs' => alarm_state.rvs
-      }
-    end
-
     def alarm_suspended_or_resumed alarm_state
-      alarm = AlarmIssue.new( alarm_state_to_hash(alarm_state).merge('aSp' => 'Suspend') )
+      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Suspend') )
       send_alarm alarm
     end
 
     def alarm_activated_or_deactivated alarm_state
-      alarm = AlarmIssue.new( alarm_state_to_hash(alarm_state).merge('aSp' => 'Issue') )
+      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
       send_alarm alarm
     end
 

data/lib/rsmp/site_proxy.rb

@@ -375,6 +375,7 @@ module RSMP
     end
 
     def build_component id:, type:, settings:{}
+      settings ||= {}
       if type == 'main'
         ComponentProxy.new id:id, node: self, grouped: true,
           ntsOId: settings['ntsOId'], xNId: settings['xNId']
@@ -383,5 +384,8 @@ module RSMP
       end
     end
 
+    def infer_component_type component_id
+      ComponentProxy
+    end
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -85,7 +85,10 @@ module RSMP
       sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
       log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
-      send_all_aggregated_status if @site_settings['send_after_connect']
+      if @site_settings['send_after_connect']
+        send_all_aggregated_status
+        send_active_alarms
+      end
       super
     end
 
@@ -116,9 +119,6 @@ module RSMP
     end
 
     def acknowledged_first_ingoing message
-      # TODO
-      # aggregateds status should only be send for later version of rsmp
-      # to handle verison differences, we probably need inherited classes
       case message.type
       when "Watchdog"
         handshake_complete
@@ -133,6 +133,17 @@ module RSMP
       end
     end
 
+    def send_active_alarms
+      @site.components.each_pair do |c_id,component|
+        component.alarms.each_pair do |alarm_code, alarm_state|
+          if alarm_state.active
+            alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
+            send_message alarm
+          end
+        end
+      end
+    end
+
     def reconnect_delay
       return false if @site_settings['intervals']['reconnect'] == :no
       interval = @site_settings['intervals']['reconnect']

data/lib/rsmp/tlc/traffic_controller.rb

@@ -263,10 +263,10 @@ module RSMP
         if actions['raise']
           alarm_code = actions['raise']
           if change
-            log "Activating alarm #{alarm_code}, because input #{input} was activated", level: :info
+            log "Activating input #{input} is programmed to activate alarm #{alarm_code}", level: :info
             activate_alarm alarm_code
           else
-            log "Deactivating alarm #{alarm_code}, because input #{input} was deactivated", level: :info
+            log "Deactivating input #{input} is programmed to deactivate alarm #{alarm_code}", level: :info
             deactivate_alarm alarm_code
           end
         end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.13.4"
+  VERSION = "0.13.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.7
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async