ffi-snap7 0.1.3 → 0.2.0

data/lib/ffi-snap7.rb

@@ -12,3 +12,4 @@ end
 require 'ffi-snap7/version'
 require 'ffi-snap7/client/client'
 require 'ffi-snap7/server/server'
+require 'ffi-snap7/data_structures/data_structures'

data/lib/ffi-snap7/client/client.rb

@@ -5,17 +5,25 @@ module Snap7
   class Client
 
     def initialize
-      @cli = Snap7.cli_create
+      @cli       = Snap7.cli_create
+      @connected = false
     end
 
 
     def connect(address, rack, slot)
       check_rc Snap7.cli_connect_to(@cli, address, rack, slot)
+      @connected = true
     end
 
 
     def disconnect
       Snap7.cli_disconnect @cli
+      @connected = false
+    end
+
+
+    def connected?
+      @connected
     end
 
 

data/lib/ffi-snap7/data_structures/data_block.rb

@@ -0,0 +1,37 @@
+module Snap7
+
+  class DataBlock
+    attr_reader :number, :variables
+
+    def initialize(db_addr)
+      @number    = db_addr.scan(/\d+/).first.to_i
+      @variables = []
+    end
+
+
+    def add_variable(var)
+      var.db = self
+      @variables << var
+    end
+
+
+    def size
+      last_var = @variables.sort { |a,b| a.byte <=> b.byte }.last
+      last_var.byte + last_var.byte_size
+    end
+
+
+    def decode(data)
+      @variables.map do |var|
+        {
+          :ident   => var.ident,
+          :address => var.address,
+          :value   => var.decode(data)
+        }
+      end
+    end
+
+  end
+
+end
+

data/lib/ffi-snap7/data_structures/data_block_registry.rb

@@ -0,0 +1,44 @@
+module Snap7
+
+  class DataBlockRegistry
+    attr_reader :dbs
+
+    def initialize
+      @dbs = {}
+    end
+
+
+    def add_variable(ident, address, data_type)
+      db_addr, _, var_addr = address.partition('.')
+      var = Snap7::Variable.new ident, var_addr, data_type
+      db(db_addr).add_variable var
+    end
+
+
+    def find_variable(ident)
+      each do |db|
+        found_variable = db.variables.find { |var| var.ident == ident }
+        return found_variable if found_variable
+      end
+
+      return nil
+    end
+
+
+    def db(db_addr)
+      @dbs[db_addr] ||= Snap7::DataBlock.new(db_addr)
+    end
+
+
+    def each(&block)
+      sorted_dbs.each &block
+    end
+
+
+    def sorted_dbs
+      @dbs.values.sort { |a,b| a.number <=> b.number }
+    end
+
+  end
+
+end

data/lib/ffi-snap7/data_structures/data_structures.rb

@@ -0,0 +1,3 @@
+require 'ffi-snap7/data_structures/variable'
+require 'ffi-snap7/data_structures/data_block'
+require 'ffi-snap7/data_structures/data_block_registry'

data/lib/ffi-snap7/data_structures/variable.rb

@@ -0,0 +1,104 @@
+module Snap7
+
+  class Variable
+    attr_reader :ident, :byte, :bit, :type
+    attr_accessor :db
+
+
+    def initialize(ident, address, type)
+      addr_parts = address.scan(/\d+/)
+
+      if address =~ /^DBX/
+        fail "Invalid bit address '#{address}'" unless addr_parts.size == 2
+      end
+
+      @ident   = ident
+      @address = address
+      @byte    = addr_parts.first.to_i
+      @bit     = addr_parts.last.to_i if addr_parts.size == 2
+      @type    = type
+    end
+
+
+    def bit_size
+      case @address
+      when /^DBD/ # double (32 bit)
+        32
+      when /^DBW/ # word   (16 bit)
+        16
+      when /^DBB/ # byte   (8 bit)
+        8
+      when /^DBX/ # bit    (1 bit)
+        1
+      else
+        fail "Invalid address '#{@address}' of variable #{@ident}. Cannot determine size."
+      end
+    end
+
+
+    def byte_size
+      @byte_size ||= (bit_size / 8.0).ceil
+    end
+
+
+    def address
+      ["DB#{db.number}", @address].compact.join('.')
+    end
+
+
+    def decode(data)
+      var_data = data[byte, byte_size]
+
+      case @type
+      when :bool
+        var_data.first[@bit] > 0
+
+      when :int8
+        var_data.pack('C1').unpack('c').first
+
+      when :uint8
+        var_data.pack('C1').unpack('C').first
+
+      when :int16
+        var_data.reverse.pack('C2').unpack('s').first
+
+      when :uint16
+        var_data.reverse.pack('C2').unpack('S').first
+
+      when :int32
+        var_data.reverse.pack('C4').unpack('l').first
+
+      when :uint32
+        var_data.reverse.pack('C4').unpack('L').first
+
+      when :float32
+        var_data.reverse.pack('C4').unpack('f').first
+
+      else
+        fail "Invalid type '#{@type}' of variable #{@ident}. Cannot decode data."
+      end
+    end
+
+
+    def encode(value)
+      case @type
+      when :int8, :uint8
+        [value]
+
+      when :int16, :uint16
+        [value].pack('s').unpack('C2').reverse
+
+      when :int32, :uint32
+        [value].pack('l').unpack('C4').reverse
+
+      when :float32
+        [value].pack('f').unpack('C4').reverse
+
+      else
+        fail "Invalid type '#{@type}' of variable #{@ident}. Cannot encode data."
+      end
+    end
+
+  end
+
+end

data/lib/ffi-snap7/version.rb

@@ -1,3 +1,3 @@
 module Snap7
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-snap7
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andy Rohr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-05-11 00:00:00 Z
+date: 2016-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -81,6 +81,10 @@ files:
 - lib/ffi-snap7.rb
 - lib/ffi-snap7/client/client.rb
 - lib/ffi-snap7/client/wrapper.rb
+- lib/ffi-snap7/data_structures/data_block.rb
+- lib/ffi-snap7/data_structures/data_block_registry.rb
+- lib/ffi-snap7/data_structures/data_structures.rb
+- lib/ffi-snap7/data_structures/variable.rb
 - lib/ffi-snap7/server/server.rb
 - lib/ffi-snap7/server/wrapper.rb
 - lib/ffi-snap7/version.rb