rsmp 0.9.10 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9afdedb545513c5574db59a28f07515866dbd34d8908767813275518ee590cd
-  data.tar.gz: e6fa96a531f450ce114601a57f91045ade415bb9317c5155a57a05054acf6481
+  metadata.gz: e1710b4aeba40d7f888921f76e2b09ffe5b7372f34d6e4360ccab5b7786b39ab
+  data.tar.gz: 275ab0407885ed7b0b6aa1e3b12d257914ee09b6c1de65591189a88f07e40e93
 SHA512:
-  metadata.gz: c3a2fbb33b4789e0cc0200156f759014eab17b51a23f78e486fd8fa67e54da1ac241bdd1c1b6c77ce0b0534d8447607b8806105433920ef7d00733183c2e67de
-  data.tar.gz: c6cf57cc0b98b54c541293283b7810de1ce218a3c22454d925db5727706b1d29793493d2cc0bff6f96e932c8dc6e9f5dffab005ebba79785617f9292c056575c
+  metadata.gz: 171a4a1da3fe6a4b88a8efc48f51dbb78456261b41df943d77d1fbfb5df71568dd22978a0966d099e6e62bd870ad2ce252138df56790352d8647ab98039535f7
+  data.tar.gz: 8829abe372e8dedeb8e81a79380ae62398e31814e96cd3e5e3f086db2d25d5dcd6127e628034bb04117e460d33600f7a5139380aebefb55289fadcb76555d73c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.10)
+    rsmp (0.11.0)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)

data/config/tlc.yaml

@@ -15,6 +15,7 @@ components:
     B2:
   detector_logic:
     DL1:
+    DL2:
 signal_plans:
   1:
     dynamic_bands:

data/lib/rsmp/collect/alarm_collector.rb

@@ -14,7 +14,14 @@ module RSMP
 
       # match fixed attributes
       %w{aCId aSp ack aS sS cat pri}.each do |key|
-        return false if @query[key] && @query[key] != message.attribute(key)
+        want = @query[key]
+        got = message.attribute(key)
+        case want
+        when Regexp
+          return false if got !~ want
+        when String
+          return false if got != want
+        end
       end
 
       # match rvs items

data/lib/rsmp/component.rb

@@ -77,6 +77,7 @@ module RSMP
       raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented by #{self.class}"
     end
 
+    # handle incoming alarm
     def handle_alarm message
       code = message.attribute('aCId')
       previous = @alarms[code]
@@ -92,6 +93,27 @@ module RSMP
       @alarms[code] = message
     end
 
+    # set alarm
+    def send_alarm code:, status:
+      # TODO
+      # we need to manage the state of alarms internally (an ALarm class probably),
+      # and handle request from the supervisor to suspend and resume alarms etc.
+      # when this state changes, we then send an alarm message
+      alarm = Alarm.new(
+        'cId' => c_id,
+        'aTs' => @node.clock.to_s,
+        'aCId' => code,
+        'aSp' => 'Issue',
+        'ack' => 'Acknowledged',
+        'sS' => 'notSuspended',
+        'aS' => status,
+        'cat' => 'D',
+        'pri' => '2',
+        'rvs' => []
+      )
+      @node.alarm_changed self, alarm
+    end
+
     # Handle an incoming status respone, by storing the values
     def handle_status_response message
       store_status message, check_repeated: false

data/lib/rsmp/site.rb

@@ -93,6 +93,12 @@ module RSMP
       end
     end
 
+    def alarm_changed component, alarm
+      @proxies.each do |proxy|
+        proxy.send_alarm component, alarm if proxy.ready?
+      end
+    end
+
     def connect_to_supervisor task, supervisor_settings
       proxy = build_proxy({
         site: self,

data/lib/rsmp/supervisor_proxy.rb

@@ -172,6 +172,12 @@ module RSMP
       end
     end
 
+    def send_alarm component, alarm, options={}
+      send_and_optionally_collect alarm, options do |collect_options|
+        Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')
+      end
+    end
+
     def process_aggregated_status message
       se = message.attribute("se")
       validate_aggregated_status(message,se) == false

data/lib/rsmp/tlc/traffic_controller.rb

@@ -264,8 +264,10 @@ module RSMP
           alarm_code = actions['raise']
           if change
             log "Activating alarm #{alarm_code}, because input #{input} was activated", level: :info
+            send_alarm code:alarm_code, status:'Active'
           else
             log "Deactivating alarm #{alarm_code}, because input #{input} was deactivated", level: :info
+            send_alarm code:alarm_code, status:'inActive'
           end
         end
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.10"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.11.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async