ladder_drive 0.6.3 → 0.6.7

data/lib/ladder_drive/protocol/omron/omron.rb

@@ -0,0 +1,28 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2019 ITO SOFT DESIGN Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+$:.unshift File.dirname(__FILE__)
+
+require 'omron_device'
+require 'c_mode_protocol'
+require 'fins_tcp_protocol'

data/lib/ladder_drive/protocol/omron/omron_device.rb

@@ -0,0 +1,139 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2019 ITO SOFT DESIGN Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+# Supported models : CP1E
+
+module LadderDrive
+module Protocol
+module Omron
+
+  class OmronDevice < PlcDevice
+
+    attr_reader :suffix, :channel, :bit
+
+    SUFFIXES = %w(M H D T C A)
+
+    def initialize a, b = nil, c=nil
+      case a
+      when Array
+=begin
+        case a.size
+        when 4
+          @suffix = suffix_for_code(a[3])
+          @channel = ((a[2] << 8 | a[1]) << 8) | a[0]
+        end
+=end
+      else
+        if b
+          @suffix = a.upcase if a
+          @channel = b.to_i
+          @bit = c.to_i if c
+        else
+          if /^(M|H|D|T|C|A)?([0-9]+)(\.([0-9]{1,2}))?$/i =~ a
+            @suffix = $1.upcase if $1
+            @channel = $2.to_i
+            @bit = $4.to_i if $4
+          end
+        end
+      end
+      case @suffix
+      when "T", "C"
+        raise "#{self.name} is not allowed as a bit device." if @bit
+      end
+    end
+
+    def channel_device
+      return self unless bit_device?
+      self.class.new suffix, channel
+    end
+
+    def valid?
+      !!channel
+    end
+
+    def name
+      if bit
+        "#{suffix}#{channel}.#{bit.to_s.rjust(2, '0')}"
+      else
+        "#{suffix}#{channel}"
+      end
+    end
+
+    def next_device
+      self + 1
+    end
+
+    def bit_device?
+      !!bit
+    end
+
+    def suffix_for_code code
+      index = SUFFIX_CODES.index code
+      index ? SUFFIXES[index] : nil
+    end
+
+    def suffix_code
+      index = SUFFIXES.index suffix
+      index ? SUFFIX_CODES[index] : 0
+    end
+
+    def + value
+      if bit
+        v = channel * 16 + bit + value
+        c = v / 16
+        b = v % 16
+        self.class.new suffix, c, b
+      else
+        self.class.new suffix, channel + value
+      end
+    end
+
+    def - value
+      case value
+      when OmronDevice
+        d = value
+        raise "Can't subtract between different device type." if self.bit_device? ^ d.bit_device?
+        if bit
+          (channel * 16 + bit) - (d.channel * 16 + d.bit)
+        else
+          channel - d.channel
+        end
+      else
+        value = value.to_i
+        if bit
+          v = [channel * 16 + bit - value, 0].max
+          c = v / 16
+          b = v % 16
+          self.class.new suffix, c, b
+        else
+          self.class.new suffix, [channel - value, 0].max
+        end
+      end
+    end
+
+  end
+
+end
+end
+end

data/lib/ladder_drive/protocol/protocol.rb

@@ -58,20 +58,22 @@ module Protocol
       end
     end
 
+    TIMEOUT = 1.0
+
     # abstract methods
 
     def open; end
     def close; end
 
-    def get_bit_from_device device; end
+    def get_bit_from_device device; get_bits_from_device(1, device_by_name(device)).first; end
     def get_bits_from_device count, device; end
-    def set_bits_to_device bits, device; end
     def set_bit_to_device bit, device; set_bits_to_device [bit], device; end
+    def set_bits_to_device bits, device; end
 
-    def get_word_from_device device; end
-    def get_words_from_device(count, device); end
-    def set_words_to_device words, device; end
+    def get_word_from_device device; get_words_from_device(1, device_by_name(device)).first; end
+    def get_words_from_device count, device; end
     def set_word_to_device word, device; set_words_to_device [word], device; end
+    def set_words_to_device words, device; end
 
     def device_by_name name; nil; end
 
@@ -188,6 +190,14 @@ module Protocol
       end
     end
 
+    def destination_ipv4
+      Socket.gethostbyname(self.host)[3].unpack("C4").join('.')
+    end
+
+    def self_ipv4
+      Socket::getaddrinfo(Socket.gethostname,"echo",Socket::AF_INET)[0][3]
+    end
+
   end
 
 end
@@ -198,3 +208,4 @@ require 'keyence/keyence'
 # Use load instead require, because there are two emulator files.
 load File.join(dir, 'emulator/emulator.rb')
 require 'mitsubishi/mitsubishi'
+require 'omron/omron'

data/lib/ladder_drive/tasks/build.rb

@@ -112,7 +112,7 @@ namespace :service do
     # copy lddrive.serive file to /etc/systemd/system
     fname = "lddrive.service"
     s = File.read(File.join(template_dir, fname))
-    s.gsub!("<%= exec_start %>", "/home/pi/project/lddrive")
+    s.gsub!("<%= exec_start %>", "#{Dir.pwd}/lddrive")
     File.write File.join("/etc", "systemd", "system", fname), s
 
     # reload services

data/lib/ladder_drive/version.rb

@@ -22,5 +22,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module LadderDrive
-  VERSION = "0.6.3"
+  VERSION = "0.6.7"
 end

data/lib/ladder_drive.rb

@@ -24,5 +24,8 @@
 dir = File.expand_path(File.dirname(__FILE__))
 $:.unshift dir unless $:.include? dir
 
+require 'dotenv'
+Dotenv.load
+
 require "plc/plc"
 require "ladder_drive/ladder_drive"

data/lib/plc/emulator/emu_plc_server.rb

@@ -52,9 +52,11 @@ module Emulator
       Thread.new do
         server = TCPServer.open @port
         puts "launching emulator ... "
+        launched = false
         loop do
           Thread.start(server.accept) do |socket|
-            puts "done launching"
+            puts "done launching" unless launched
+            launched ||= true
             while line = socket.gets
               begin
                 r = @plc.execute_console_commands line

data/lib/plc/emulator/plc_plugins.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 ITO SOFT DESIGN Inc.
+# Copyright (c) 201 ITO SOFT DESIGN Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,8 @@ $:.unshift dir unless $:.include? dir
 
 require 'active_support'
 require 'active_support/core_ext'
+require 'erb'
+require 'plugin_trigger_state'
 
 module PlcPlugins
 
@@ -110,6 +112,8 @@ class Plugin
   def initialize plc
     @config = load_config
     @plc = plc
+    @device_states = {}
+    @trigger_states = {}
   end
 
   def name
@@ -124,31 +128,34 @@ class Plugin
     return false unless self.plc == plc
   end
 
+  def triggered? trigger_config
+    state = trigger_state_for trigger_config
+    state.reset
+    state.update
+    state.triggered?
+  end
+
+  def trigger_state_for trigger_config
+    @trigger_states[trigger_config.object_id] ||= PluginTriggerState.new(plc, trigger_config)
+  end
+
+
   private
 
     def load_config
       h = {}
       path = File.join("config", "plugins", "#{name}.yml")
       if File.exist?(path)
-        h = YAML.load(File.read(path))
+        erb = ERB.new File.read(path)
+        h = YAML.load(erb.result(binding))
         h = JSON.parse(h.to_json, symbolize_names: true)
       end
       h
     end
 
-end
 
 end
-end
 
 
-# @deprecated use LadderDrive::Emulator::Plugin class instead of this.
-def load_plugin_config name
-  h = {}
-  path = File.join("config", "plugins", "#{name}.yml")
-  if File.exist?(path)
-    h = YAML.load(File.read(path))
-    h = JSON.parse(h.to_json, symbolize_names: true)
-  end
-  h
+end
 end

data/lib/plc/emulator/plugin_trigger_state.rb

@@ -0,0 +1,152 @@
+#
+# Copyright (c) 2018 ITO SOFT DESIGN Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+dir = Dir.pwd
+$:.unshift dir unless $:.include? dir
+
+require 'active_support'
+require 'active_support/core_ext'
+require 'erb'
+
+
+module LadderDrive
+module Emulator
+
+
+class PluginTriggerState
+  attr_reader :plc
+  attr_reader :config
+  attr_reader :device
+  attr_reader :value_type
+  attr_reader :value
+
+  def initialize plc, config
+    @plc = plc
+    @config = config
+    @value_type = config[:value_type]
+    @devices = {}
+    @next_trigger_times = {}
+  end
+
+  def key
+    object_id
+  end
+
+  def value
+    @value
+  end
+
+  def value= value
+    if @changed.nil?
+      @changed = @value != value
+      @raised = @changed && !!value
+      @fallen = @changed && !value
+      @value = value
+    end
+  end
+
+  def changed?
+    !!@changed
+  end
+
+  def raised?
+    !!@raised
+  end
+
+  def fallen?
+    !!@fallen
+  end
+
+  def triggered?
+    !!@triggered
+  end
+
+  def device
+    device_with_trigger(config[:triggers]&.first || config[:trigger])
+  end
+
+  def update
+    return unless @triggered.nil?
+
+    triggers = config[:triggers]
+    triggers ||= [config[:trigger]]
+
+    @triggered = false
+
+    triggers.each do |trigger|
+      case trigger[:type]
+      when "changed", "raise", "fall", "raise_and_fall"
+        device = device_with_trigger(trigger)
+        value = device.send(@value_type || :value)
+
+        # update flags
+        @changed = @value != value
+        case value
+        when true, false, nil
+          @raised = @changed && !!value
+          @fallen = @changed && !value
+        else
+          @fallen = @changed && value == 0
+          @raised = @changed && !@fallen
+        end
+        @value = value
+
+        # judgement triggered
+        case trigger[:type]
+        when "raise"
+          @triggered = true if @raised
+        when "fall"
+          @triggered = true if @fallen
+        else
+          @triggered = true if @changed
+        end
+
+      when "interval"
+        now = Time.now
+        t = @next_trigger_times[trigger.object_id] || now
+        while now >= t
+          @triggered ||= true
+          t += trigger[:interval]
+        end
+        @next_trigger_times[trigger.object_id] = t
+      else
+        @triggered = false
+      end
+    end
+    @triggered
+  end
+
+  def reset
+    @changed = nil
+    @raised = nil
+    @fallen = nil
+    @triggered = nil
+  end
+
+  def device_with_trigger trigger
+    @devices[trigger.object_id] ||= @plc.device_by_name(trigger[:device])
+  end
+
+end
+
+end
+end