ladder_drive 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248f3ac5ff9b3eefd59641efd96088ad33f1aec8
-  data.tar.gz: 31b342a5fb099082eece265f137739862fc6eff4
+  metadata.gz: 11f39560e094ef9fc61411b71fc952aebbca6051
+  data.tar.gz: 3bedd76a016c2f5bd8848bbf1ff8610a569c13be
 SHA512:
-  metadata.gz: c28787587a2a95656a5ab1b7887b551dd5fec15f2cd21aaaeb5c7b1b2979a8ebee73dee7948f92f931a14378929b724bd4e67ba97ec6f2cd5f89597b18914913
-  data.tar.gz: 12722c48c7c1d2d197233fa438ee28d59b38650eed9e8d1ce1f671b3b96c0836f3f9f47e46c2d2ad9cdc446e811b3cb526e6ae747de989522938080a715f0b41
+  metadata.gz: ff72c950069f9b7bd6606547b4769b1956738b4c1f450782d3e0dc8f7b98c40769e8517c8cec93fead79ae65ae2e130ef795bb409efd05e1435c8d58124a5268
+  data.tar.gz: c498bcbc93242716a1fb697d0ee5ec5f6b2d46943b3e870a046312c720248003217dd557aebe3fdbb500ec2b99e8186c3ab78bbb98b98c4d3e705ab37712097d

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ladder_drive (0.3.1)
-      activesupport (>= 4.2.7)
-      thor
+    ladder_drive (0.4.0)
+      activesupport (~> 4.2, >= 4.2.7)
+      thor (~> 0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -180,6 +180,27 @@ OUT M1
 <!-- [![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs) -->
 
 
+# Accessing a device values
+
+You can use LadderDrive as a accessing tool for the PLC device.
+
+You can read/write device like this.
+
+```
+require 'ladder_drive'
+
+plc = LadderDrive::Protocol::Mitsubishi::McProtocol.new host:"192.168.0.10"
+
+plc["M0"] = true
+plc["M0"]         # => true
+plc["M0", 10]     # => [true, false, ..., false]
+
+plc["D0"] = 123
+plc["D0"]       # => 123
+plc["D0", 10] = [0, 1, 2, ..., 9]
+plc["D0".."D9"]   => [0, 1, 2, ..., 9]
+```
+
 # Information related ladder_drive
 
 - [My japanese diary [ladder_drive]](http://diary.itosoft.com/?category=ladder_drive)

data/README_jp.md

@@ -183,6 +183,26 @@ OUT M1
 
 <!-- [![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs) -->
 
+## PLCデバイスへのアクセスツールとしての利用
+
+LadderDriveはPLCデバイスの読み書きツールとしての利用もできます。
+下の様にとても簡単に読み書きできます。
+
+```
+require 'ladder_drive'
+
+plc = LadderDrive::Protocol::Mitsubishi::McProtocol.new host:"192.168.0.10"
+
+plc["M0"] = true
+plc["M0"]         # => true
+plc["M0", 10]     # => [true, false, ..., false]
+
+plc["D0"] = 123
+plc["D0"]       # => 123
+plc["D0", 10] = [0, 1, 2, ..., 9]
+plc["D0".."D9"]   => [0, 1, 2, ..., 9]
+```
+
 ## エスカレーターに関する情報
 
 - [一往確認日記 [ladder_drive]](http://diary.itosoft.com/?category=ladder_drive)

data/ladder_drive.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ito-soft-design/ladder_drive"
   spec.license       = "MIT"
 
-  spec.add_dependency "thor"
-  spec.add_runtime_dependency "activesupport", ">=4.2.7"
+  spec.add_runtime_dependency 'thor', '~> 0'
+  spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.7'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

data/lib/ladder_drive/plc_device.rb

@@ -104,7 +104,7 @@ module LadderDrive
     end
 
     def bit_device?
-      SUFFIXES_FOR_BIT.include? @suffix
+      suffixes_for_bit.include? @suffix
     end
 
     def + value

data/lib/ladder_drive/protocol/keyence/kv_protocol.rb

@@ -59,7 +59,7 @@ module Keyence
       values = values.map{|v| v == 0 ? false : true}
       values.each do |v|
         device.bool = v
-        device = device_by_name (device+1).name
+        device += 1
       end
       values
     end
@@ -80,7 +80,7 @@ module Keyence
         @socket.puts(packet)
         res = receive
         raise res unless /OK/i =~ res
-        device = device_by_name (device+1).name
+        device += 1
       end
     end
     alias :set_bit_to_device :set_bits_to_device
@@ -144,6 +144,46 @@ module Keyence
       packet.dup.chomp
     end
 
+    def available_bits_range suffix=nil
+      case suffix
+      when "TM"
+        1..512
+      when "TM"
+        1..12
+      when "T", "TC", "TS", "C", "CC", "CS"
+        1..120
+      when "CTH"
+        1..2
+      when "CTC"
+        1..4
+      when "AT"
+        1..8
+      else
+        1..1000
+      end
+    end
+
+    def available_words_range suffix=nil
+      case suffix
+      when "TM"
+        1..256
+      when "TM"
+        1..12
+      when "T", "TC", "TS", "C", "CC", "CS"
+        1..120
+        1..120
+      when "CTH"
+        1..2
+      when "CTC"
+        1..4
+      when "AT"
+        1..8
+      else
+        1..500
+      end
+    end
+
+
     private
 
       def device_class

data/lib/ladder_drive/protocol/mitsubishi/mc_protocol.rb

@@ -55,13 +55,24 @@ module Mitsubishi
     end
 
     def get_bits_from_device count, device
+      raise ArgumentError.new("A count #{count} must be between #{available_bits_range.first} and #{available_bits_range.last} for #{__method__}") unless available_bits_range.include? count
+
       device = device_by_name device
       packet = make_packet(body_for_get_bits_from_deivce(count, device))
       @logger.debug("> #{dump_packet packet}")
       open
-      @socket.write(packet.pack("c*"))
+      @socket.write(packet.pack("C*"))
       @socket.flush
       res = receive
+
+      # error checking
+      end_code = res[9,2].pack("C*").unpack("v").first
+      unless end_code == 0
+        error = res[11,2].pack("C*").unpack("v").first
+        raise "return end code 0x#{end_code.to_s(16)} error code 0x#{error.to_s(16)} for get_bits_from_device(#{count}, #{device.name})"
+      end
+
+      # get results
       bits = []
       count.times do |i|
         v = res[11 + i / 2]
@@ -76,14 +87,23 @@ module Mitsubishi
     end
 
     def set_bits_to_device bits, device
+      raise ArgumentError.new("A count #{count} must be between #{available_bits_range.first} and #{available_bits_range.last} for #{__method__}") unless available_bits_range.include? bits.size
+
       device = device_by_name device
       packet = make_packet(body_for_set_bits_to_device(bits, device))
       @logger.debug("> #{dump_packet packet}")
       open
-      @socket.write(packet.pack("c*"))
+      @socket.write(packet.pack("C*"))
       @socket.flush
       res = receive
       @logger.debug("set #{bits} to:#{device.name}")
+
+      # error checking
+      end_code = res[9,2].pack("C*").unpack("v").first
+      unless end_code == 0
+        error = res[11,2].pack("C*").unpack("v").first
+        raise "return end code 0x#{end_code.to_s(16)} error code 0x#{error.to_s(16)} for set_bits_to_device(#{bits}, #{device.name})"
+      end
     end
 
 
@@ -93,30 +113,50 @@ module Mitsubishi
     end
 
     def get_words_from_device(count, device)
+      raise ArgumentError.new("A count #{count} must be between #{available_words_range.first} and #{available_words_range.last} for #{__method__}") unless available_bits_range.include? count
+
       device = device_by_name device
       packet = make_packet(body_for_get_words_from_deivce(count, device))
       @logger.debug("> #{dump_packet packet}")
       open
-      @socket.write(packet.pack("c*"))
+      @socket.write(packet.pack("C*"))
       @socket.flush
       res = receive
+
+      # error checking
+      end_code = res[9,2].pack("C*").unpack("v").first
+      unless end_code == 0
+        error = res[11,2].pack("C*").unpack("v").first
+        raise "return end code 0x#{end_code.to_s(16)} error code 0x#{error.to_s(16)} for get_words_from_device(#{count}, #{device.name})"
+      end
+
+      # get result
       words = []
       res[11, 2 * count].each_slice(2) do |pair|
-        words << pair.pack("c*").unpack("v").first
+        words << pair.pack("C*").unpack("v").first
       end
       @logger.debug("get from: #{device.name} => #{words}")
       words
     end
 
     def set_words_to_device words, device
+      raise ArgumentError.new("A count #{count} must be between #{available_words_range.first} and #{available_words_range.last} for #{__method__}") unless available_bits_range.include? words.size
+
       device = device_by_name device
       packet = make_packet(body_for_set_words_to_device(words, device))
       @logger.debug("> #{dump_packet packet}")
       open
-      @socket.write(packet.pack("c*"))
+      @socket.write(packet.pack("C*"))
       @socket.flush
       res = receive
       @logger.debug("set #{words} to: #{device.name}")
+
+      # error checking
+      end_code = res[9,2].pack("C*").unpack("v").first
+      unless end_code == 0
+        error = res[11,2].pack("C*").unpack("v").first
+        raise "return end code 0x#{end_code.to_s(16)} error code 0x#{error.to_s(16)} for set_words_to_device(#{words}, #{device.name})"
+      end
     end
 
 
@@ -143,7 +183,7 @@ module Mitsubishi
             next if c.nil? || c == ""
 
             res << c.bytes.first
-            len = res[7,2].pack("c*").unpack("v*").first if res.length >= 9
+            len = res[7,2].pack("C*").unpack("v*").first if res.length >= 9
             break if (len + 9 == res.length)
           end
         end
@@ -154,6 +194,14 @@ module Mitsubishi
       res
     end
 
+    def available_bits_range device=nil
+      1..(960 * 16)
+    end
+
+    def available_words_range device=nil
+      1..960
+    end
+
   private
 
     def make_packet body
@@ -214,11 +262,11 @@ module Mitsubishi
     end
 
     def data_for_short value
-      [value].pack("v").unpack("c*")
+      [value].pack("v").unpack("C*")
     end
 
     def data_for_int value
-      [value].pack("V").unpack("c*")
+      [value].pack("V").unpack("C*")
     end
 
     def dump_packet packet

data/lib/ladder_drive/protocol/mitsubishi/qdevice.rb

@@ -46,14 +46,14 @@ module Mitsubishi
           @number = b
         else
           if a.length == 12
-            @suffix = [a[0,2].to_i(16), a[2,2].to_i(16)].pack "c*"
+            @suffix = [a[0,2].to_i(16), a[2,2].to_i(16)].pack "C*"
             @suffix.strip!
             @number = a[4,8].to_i(16)
           elsif /(X|Y)(.+)/i =~ a
             @suffix = $1.upcase
             @number = $2.to_i(p_adic_number)
           else
-            /(M|L|S|B|F|T|C|D|W|R)(.+)/i =~ a
+            /(M|L|S|B|F|T|C|D|W|R|ZR)(.+)/i =~ a
             @suffix = $1.upcase
             @number = $2.to_i(p_adic_number)
           end
@@ -63,7 +63,7 @@ module Mitsubishi
 
     def p_adic_number
       case @suffix
-      when "X", "Y", "B", "W", "SB", "SW", "DX", "DY", "ZR"
+      when "X", "Y", "B", "W", "SB", "SW", "DX", "DY"
         16
       else
         10

data/lib/ladder_drive/protocol/protocol.rb

@@ -24,11 +24,6 @@
 dir = File.expand_path(File.dirname(__FILE__))
 $:.unshift dir unless $:.include? dir
 
-module LadderDrive
-module Protocol
-end
-end
-
 module LadderDrive
 module Protocol
 
@@ -67,12 +62,12 @@ module Protocol
     def get_bit_from_device device; 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_bit_to_device bit, device; set_bits_to_device [bit], 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 set_word_to_device word, device; set_words_to_device word, device; end
+    def set_word_to_device word, device; set_words_to_device [word], device; end
 
     def device_by_name name; nil; end
 
@@ -96,6 +91,99 @@ module Protocol
       end
     end
 
+    def available_bits_range device=nil
+      -Float::INFINITY..Float::INFINITY
+    end
+
+    def available_words_range device=nil
+      -Float::INFINITY..Float::INFINITY
+    end
+
+    def [] *args
+      case args.size
+      when 1
+        # protocol["DM0"]
+        # protocol["DM0".."DM9"]
+        case args[0]
+        when String
+          self[args[0], 1].first
+        when Range
+          self[args[0].first, args[0].count]
+        else
+          raise ArgumentError.new("#{args[0]} must be String or Range.")
+        end
+      when 2
+        # protocol["DM0", 10]
+        d = device_by_name args[0]
+        c = args[1]
+        if d.bit_device?
+          a = []
+          b = available_bits_range(d).last
+          until c == 0
+            n_c = [b, c].min
+            a += get_bits_from_device(n_c, d)
+            d += n_c
+            c -= n_c
+          end
+          a
+        else
+          a = []
+          b = available_words_range(d).last
+          until c == 0
+            n_c = [b, c].min
+            a += get_words_from_device(n_c, d)
+            d += n_c
+            c -= n_c
+          end
+          a
+        end
+      else
+        raise ArgumentError.new("wrong number of arguments (given #{args.size}, expected 1 or 2)")
+      end
+    end
+
+    def []= *args
+      case args.size
+      when 2
+        # protocol["DM0"] = 0
+        # protocol["DM0".."DM9"] = [0, 1, .., 9]
+        v = args[1]
+        v = [v] unless v.is_a? Array
+        case args[0]
+        when String
+          self[args[0], 1] = v
+        when Range
+          self[args[0].first, args[0].count] = v
+        else
+          raise ArgumentError.new("#{args[1]} must be String or Array.")
+        end
+      when 3
+        # protocol["DM0", 10] = [0, 1, .., 9]
+        d = device_by_name args[0]
+        c = args[1]
+        values = args[2]
+        values = [values] unless values.is_a? Array
+        raise ArgumentError.new("Count #{c} is not match #{args[2].size}.") unless c == values.size
+        if d.bit_device?
+          a = []
+          values.each_slice(available_bits_range(d).last) do |sv|
+            set_bits_to_device(values, d)
+            d += sv.size
+          end
+          a
+        else
+          a = []
+          values.each_slice(available_words_range(d).last) do |sv|
+            set_words_to_device(values, d)
+            d += sv.size
+          end
+          a
+        end
+      else
+        raise ArgumentError.new("wrong number of arguments (given #{args.size}, expected 2 or 3)")
+      end
+    end
+
   end
 
 end

data/lib/ladder_drive/uploader.rb

@@ -55,7 +55,7 @@ module LadderDrive
     def word_data
       data.each_slice(2).map do |pair|
         pair << 0 if pair.size == 1
-        pair.pack("c*").unpack("n*")
+        pair.pack("C*").unpack("n*")
       end.flatten
     end
 

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.3.1"
+  VERSION = "0.4.0"
 end

data/lib/plc/emulator/emu_plc.rb

@@ -152,7 +152,7 @@ module Emulator
           case d.suffix
           when "PRG"
             c.times do
-              r << program_data[d.number * 2, 2].pack("c*").unpack("n").first
+              r << program_data[d.number * 2, 2].pack("C*").unpack("n").first
               d = device_by_name (d+1).name
             end
           else
@@ -169,7 +169,7 @@ module Emulator
         case d.suffix
         when "PRG"
           a[3, c].each do |v|
-            program_data[d.number * 2, 2] = [v.to_i].pack("n").unpack("c*")
+            program_data[d.number * 2, 2] = [v.to_i].pack("n").unpack("C*")
             d = device_by_name (d+1).name
           end
         else

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ladder_drive
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.7
@@ -35,6 +38,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.7