ladder_drive 0.6.3 → 0.6.4

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

@@ -63,15 +63,15 @@ module Protocol
     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 +188,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 +206,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.4"
 end

data/plugins/ambient_plugin.rb

@@ -0,0 +1,187 @@
+#
+# 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.
+
+<<-DOC
+Here is a sample configuration.
+Puts your configuration to config/plugins/ambient.yml
+
+channels:
+  - channel_id: 12345
+    write_key: your_write_key
+    trigger:
+      device: M100
+      type: raise_and_fall
+      value_type: bool
+    devices:
+      d1:
+        device: D30
+        value_type: value
+      d2:
+        device: D17
+        value_type: value
+      d3:
+        device: D11
+        value_type: value
+      d4:
+        device: D22
+        value_type: value
+      d5:
+        device: D25
+        value_type: value
+  - channel_id: 12345
+    write_key: your_write_key
+      type: interval
+      interval: 60
+    devices:
+      d1:
+        device: D30
+        value_type: value
+      d2:
+        device: D17
+        value_type: value
+      d3:
+        device: D11
+        value_type: value
+      d4:
+        device: D22
+        value_type: value
+      d5:
+        device: D25
+        value_type: value
+DOC
+
+require 'ambient_iot'
+
+
+module LadderDrive
+module Emulator
+
+class AmbientPlugin < Plugin
+
+  def initialize plc
+    super #plc
+    return if disabled?
+
+    @values = {}
+    @times = {}
+    @worker_queue = Queue.new
+
+    setup
+  end
+
+  def run_cycle plc
+    return if disabled?
+    return unless config[:channels]
+
+    config[:channels].each do |channel|
+      channel = channel
+      next unless channel[:channel_id]
+      next unless channel[:write_key]
+      begin
+
+        interval_triggered = false
+        now = Time.now
+        triggered = false
+        v = nil
+        case channel[:trigger][:type]
+        when "interval"
+          t = @times[channel.object_id] || now
+          triggered = t <= now
+          if triggered
+            interval_triggered = true
+            t += channel[:trigger][:interval] || 300
+            @times[channel.object_id] = t
+          end
+        else
+          device = plc.device_by_name channel[:trigger][:device]
+          v = device.send channel[:trigger][:value_type]
+          unless @values[device.name] == v
+            @values[device.name] = v
+            case channel[:trigger][:type]
+            when "raise"
+              triggered = !!v
+            when "fall"
+              triggered = !v
+            else
+              triggered = true
+            end
+          end
+        end
+
+        next unless triggered || interval_triggered
+
+        # gether values
+        values = channel[:devices].inject({}) do |h, pair|
+          d = plc.device_by_name pair.last[:device]
+          v = d.send pair.last[:value_type], pair.last[:text_length] || 8
+          h[pair.first] = v
+          h
+        end
+
+        @worker_queue.push channel:channel, values:values
+      rescue => e
+        p e
+      end
+    end
+  end
+
+  private
+
+    def setup
+      Thread.start {
+        thread_proc
+      }
+    end
+
+    def thread_proc
+      @uploaded_at = nil
+
+      while arg = @worker_queue.pop
+        begin
+          now = Time.now
+          # ignore a request if it's requested in a 5 sec from previous request.
+          next unless @uploaded_at.nil? || (now - @uploaded_at >= 5)
+
+          channel = arg[:channel]
+          client = AmbientIot::Client.new channel[:channel_id], write_key:channel[:write_key]
+          client << arg[:values]
+          client.sync
+          @uploaded_at = now
+        rescue => e
+          p e
+        end
+      end
+    end
+
+end
+
+end
+end
+
+
+def plugin_ambient_init plc
+  @ambient_plugin = LadderDrive::Emulator::AmbientPlugin.new plc
+end
+
+def plugin_ambient_exec plc
+  @ambient_plugin.run_cycle plc
+end

data/plugins/plc_mapper_plugin.rb

@@ -63,18 +63,19 @@ class PlcMapperPlugin < Plugin
 
   def run_cycle plc
     return if disabled?
-    return false unless super
+    #return false unless super
     @lock.synchronize {
       # set values from plcs to ladder drive.
-      values_for_reading.each do |d, v|
+      self.values_for_reading.each do |d, v|
         plc.device_by_name(d).value = v
       end
-      values_for_reading.clear
+      self.values_for_reading.clear
 
       # set values from ladder drive to values_for_writing.
       # then set it to plc at #sync_with_plc
-      values_for_writing.each do |d, v|
-        values_for_writing[d] = plc.device_by_name(d).value
+      self.values_for_writing.each do |d, v|
+        dev = plc.device_by_name(d)
+        self.values_for_writing[d] = dev.bit_device? ? dev.bool : dev.value
       end
     }
   end
@@ -110,7 +111,7 @@ class PlcMapperPlugin < Plugin
           d1 = devs.first
           d2 = devs.last
           a << k
-          a << [d1, [d2.number - d1.number + 1, 1].max]
+          a << [d1, [d2 - d1 + 1, 1].max]
         end
         Hash[*a]
       end
@@ -137,11 +138,14 @@ class PlcMapperPlugin < Plugin
             sync_with_plc protocol, read_mappings, write_mappings
             next_time += interval
           end
-          sleep next_time - Time.now
+          sleep [next_time - Time.now, 0].max
           alerted = false
-        rescue
-          puts "#{config[:description]} is not reachable." unless alerted
+        rescue => e
+          puts "#{config[:description]} is not reachable. #{e}" unless alerted
+puts $!
+puts $@
           alerted = true
+          protocol.close
         end
       end
     end
@@ -160,7 +164,7 @@ class PlcMapperPlugin < Plugin
         }
       end
 
-      # set values form ladder drive (values_for_writing) to plc
+      # set values from ladder drive (values_for_writing) to plc
       # values_for_writing was set at run_cycle
       # but for the first time, it's not known what device it should take.
       # after running below, devices for need is listed to values_for_writing.
@@ -169,10 +173,12 @@ class PlcMapperPlugin < Plugin
         src_d = plc.device_by_name mapping[:ld].first.name
         values = []
         lock.synchronize {
-          # It may not get the value for the first time, set zero instead of it.
-          values_for_writing[src_d.name] ||= 0
-          values << values_for_writing[src_d.name]
-          src_d = src_d.next_device
+          c.times do
+            # It may not get the value for the first time, set zero instead of it.
+            self.values_for_writing[src_d.name] ||= (src_d.bit_device? ? false : 0)
+            values << self.values_for_writing[src_d.name]
+            src_d = src_d.next_device
+          end
         }
         protocol[dst_d.name, c] = values
       end
@@ -189,5 +195,11 @@ def plugin_plc_mapper_init plc
 end
 
 def plugin_plc_mapper_exec plc
-  @plugin_plc_mapper.run_cycle plc
+  begin
+    @plugin_plc_mapper.run_cycle plc
+  rescue
+puts $!
+puts $@
+    plc.close
+  end
 end