rsmp 0.12.0 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 957caaa3191011a85a0284ef530434184e15620b7762e4971a8547f45a955ec3
-  data.tar.gz: 8905eb13b36d26d6c50fe0e4466f40e2f742d18384e93bc2b7e67d2e77975441
+  metadata.gz: d97c24017cb23ab7159bebda96f262f50813d902365e2fa1fabeb90d4771df01
+  data.tar.gz: fde070792556ef05d68ebfe5d7757d696f81921d75e64ced80f2a1c4878d39ef
 SHA512:
-  metadata.gz: 100b1c357a27939ec7142ac0f63e9589ee36a044bfc54fcaea30303c2fb1eba277a3d0e1927f578fabe99717f9ffeaa83f5eceeb65dd7492d260458ab4d61689
-  data.tar.gz: 729b6355adef1914f9621c10c69bd88318c688b40ef2881125a0783ed83533a4f34bc1e1192e338d073f44af4e7ae6c416732693622fa7ef478a48b63c31ba7d
+  metadata.gz: 2b58d0ed3307893fdd43fcd361b5da63e541baf199ac21860fa11cca756fe4339a63b4bf3420164232c248667e3cf75fe0b467928642e9fcd99f951308fa6e67
+  data.tar.gz: 3c5cb9a04f22a56a16f51c41faff55a5d587fe51dd2774e6a018846da40b5bf066f08bbbfc7848382ec2a76c64a0b17cad372972b0357d7182359e934864b771

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.12.0)
+    rsmp (0.12.3)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -68,7 +68,7 @@ GEM
     ffi (1.15.5-x64-mingw32)
     fiber-local (1.0.0)
     hana (1.3.7)
-    json_schemer (0.2.19)
+    json_schemer (0.2.20)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -80,7 +80,7 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.2.1)
-    rsmp_schemer (0.3.2)
+    rsmp_schemer (0.4.0)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/lib/rsmp/alarm_state.rb

@@ -21,5 +21,13 @@ module RSMP
     def resume
       @suspended = false
     end
+
+    def activate
+      @active = true
+    end
+
+    def deactivate
+      @active = false
+    end
   end
 end

data/lib/rsmp/component.rb

@@ -20,31 +20,35 @@ module RSMP
     end
 
     def suspend_alarm alarm_code
-      alarm_state = get_alarm_state alarm_code
-      if alarm.suspended == false
-        log "Suspending alarm #{alarm_code}", level: :info
-        alarm.suspend
-        @node.alarm_suspended_or_resumed alarm
-      else
-        log "Alarm #{alarm_code} already suspended", level: :info
-      end
+      alarm = get_alarm_state alarm_code
+      return if alarm.suspended
+      log "Suspending alarm #{alarm_code}", level: :info
+      alarm.suspend
+      @node.alarm_changed alarm
     end
 
     def resume_alarm alarm_code
-      alarm_state = get_alarm_state alarm_code
-      if alarm.suspended
-        log "Resuming alarm #{alarm_code}", level: :info
-        alarm.resume
-        @node.alarm_suspended_or_resumed alarm
-      else
-        log "Alarm #{alarm_code} not suspended", level: :info
-      end
+      alarm = get_alarm_state alarm_code
+      return unless alarm.suspended
+      log "Resuming alarm #{alarm_code}", level: :info
+      alarm.resume
+      @node.alarm_changed alarm
     end
 
-    # send alarm
-    def send_alarm code:, status:
-      @node.alarm_changed self, alarm
+    def activate_alarm alarm_code
+      alarm = get_alarm_state alarm_code
+      return if alarm.active
+      log "Activating alarm #{alarm_code}", level: :info
+      alarm.activate
+      @node.alarm_changed alarm
     end
 
+    def deactivate_alarm alarm_code
+      alarm = get_alarm_state alarm_code
+      return unless alarm.active
+      log "Deactivating alarm #{alarm_code}", level: :info
+      alarm.deactivate
+      @node.alarm_changed alarm
+    end
   end
 end

data/lib/rsmp/site.rb

@@ -108,7 +108,7 @@ module RSMP
       )
     end
 
-    def alarm_suspended_or_resumed alarm_state
+    def alarm_changed alarm_state
       alarm = alarm_state_to_message alarm_state
       @proxies.each do |proxy|
         proxy.send_message alarm if proxy.ready?

data/lib/rsmp/site_proxy.rb

@@ -228,7 +228,6 @@ module RSMP
         @status_subscriptions[component_id][sCI][n]['uRt'] = uRt
       end
 
-      p @status_subscriptions
       component = find_component component_id
       component.allow_repeat_updates subscribe_list
 

data/lib/rsmp/tlc/traffic_controller.rb

@@ -264,10 +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'
+            activate_alarm alarm_code
           else
             log "Deactivating alarm #{alarm_code}, because input #{input} was deactivated", level: :info
-            send_alarm code:alarm_code, status:'inActive'
+            deactivate_alarm alarm_code
           end
         end
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.12.0"
+  VERSION = "0.12.3"
 end

metadata

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