libmodbus4r 0.3.0 → 2.0.0

data/README

@@ -1,46 +1,29 @@
-== About project
+== About
 
-libmodbus4r –a wrapper for library libmodbus wrote in Ruby. libmodbus – a free implementation of protocol ModBus TCP\RTU for Linux and OSX operation systems. It's very fast and stable library wrote in C. Goal of project is ability writing application in Ruby that use ModBus protocol for communication with devices.
+Binding use *libmodbus* (free implementation of modbus for Linux\MacOS) for Ruby.
 
-== Features
+== Futures
 
-* Use only Ruby-1.9.x and Ruby-1.8.7
-* Include C library *libmodbus*;
-* ModBus TCP and RTU master(client);
-* ModBus TCP and RTU slave(server);
+* Use C library *libmodbus*;
+* ModBus TCP master(client);
 * Support functions: 
-  * read coil status (0x01)
-  * read input status (0x02)
-  * read holding registers (0x03)
-  * read input registers (0x04)
-  * force single coil (0x05)
-  * preset single register (0x06)
-  * force multiple coils (0x0F)
-  * preset multiple registers (0x10)
-
-== Installation
-
-Importan! libmodbus4 work only in Linux и OSX
-
-    Simplest installation is use rubygems
-    $ sudo gem install libmodbus4r
-    or  installation from source with command:
-    $ sudo rake install
-
-== Authors
-
+* * read coil status (0x01)
+* * read input status (0x02)
+* * read holding registers (0x03)
+* * read input registers (0x04)
+* * force single coil (0x05)
+* * preset single register (0x06)
+* * force multiple coils (0x0F)
+* * preset multiple registers (0x10)
+
+== Install
+
+1. Install last release ruby 1.9.1 from http://ruby-lang.org
+2. Install libmodbus-2.0.3 from https://launchpad.net/libmodbus
+3. Install libmodbus4r 
+   *$ sudo rake install*
+   or
+   *$ gem install flipback-libmodbus4r --source http://gems.github.com
+
+== AUTHORS
 Aleksey Timin <atimin@gmail.com> 
-
-== References 
-
-Home page projects : http://flipback.github.com/libmodbus4r/
-
-Hosting on RubyForge : http://rubyforge.org/projects/libmodbus4r
-
-Hosting on GitHub : http://github.com/flipback/libmodbus4r/tree/master
-
-Ruby site : http://ruby-lang.org
-
-libmobus on Launchpad : https://launchpad.net/libmodbus
-
-ModBus community: http://www.modbus-ida.org

data/examples/use_tcp_master.rb

@@ -5,36 +5,42 @@ end
 
 require 'modbus4r'
 
-mstr = ModBus::TCPMaster.new('127.0.0.1', #ip -address
-                                1502,     #port  
-                                1)        #slave id
+mstr = ModBus::TCPMaster.new('127.0.0.1', 1502)
 mstr.connect
 # Reads the coils status in the slave
-puts mstr.read_coil_status(0,   #start address
+puts mstr.read_coil_status(1,   #slave id
+                           0,   #start address
                            10)  #number
 # Reads the input status in the slave
-puts mstr.read_input_status(0,  #start address
+puts mstr.read_input_status(1,  #slave id
+                            0,  #start address
                             10) #number
 # Reads the holding registers in the slave
-puts mstr.read_holding_registers(0,  #start address
+puts mstr.read_holding_registers(1, #slave id
+                            0,  #start address
                             5)   #number
 # Reads the input registers in the slave
-puts mstr.read_input_registers(0,  #start address
+puts mstr.read_input_registers(1, #slave id
+                            0,  #start address
                             5)  #number
 # Turns a single coil in the slave
-mstr.force_single_coil(0, #coil address
+mstr.force_single_coil(1, #slave id
+                        0, #coil address
                         true) #state
 
 # Sets a value in one holding register in the slave
-mstr.preset_single_register(0, #reg address
+mstr.preset_single_register(1, #slave id
+                        0, #reg address
                         0xa0a0) #value
 
 # Sets\reset the coils in the slave
-mstr.force_multiple_coils(0, #start address
+mstr.force_multiple_coils(1, #slave id
+                        0, #start address
                         [true, false, true]) #data
 
 #Copies the values in th slave
-mstr.preset_multiple_registers(0, #start address
+mstr.preset_multiple_registers(1, #slave id
+                        0, #start address
                         [1, 0xdf, 2]) #data
 
 mstr.close

data/ext/extconf.rb

@@ -1,9 +1,4 @@
 require 'mkmf'
 
-printf "checking for ruby version... "
-STDOUT.flush
-ruby_ver = RUBY_VERSION
-puts ruby_ver
-$CFLAGS += " -DRUBY_1_8" if ruby_ver.to_f == 1.8
-
-create_makefile '_modbus4r'
+have_library 'modbus'
+create_makefile 'modbus4r'

data/spec/tcp_master_spec.rb

@@ -1,23 +1,15 @@
 require 'modbus4r'
+require 'socket'
 
 describe ModBus::TCPMaster do
 
   before(:all) do
-    @sl = ModBus::TCPSlave.new('127.0.0.1', 1502, 1)
-    @sl.coil_status = [false, false, false, false, 
-                        false, false, false, false]
-    @sl.input_status = [false, false, false, false,
-                        false, false, false, false]
-    @sl.holding_registers = [0, 0, 0, 0, 0, 0, 0, 0, 0]
-    @sl.input_registers = [0, 0, 0, 0, 0, 0, 0, 0, 0]
-    @sl.start
-
-    @mstr = ModBus::TCPMaster.new('127.0.0.1', 1502, 1)
+    @mstr = ModBus::TCPMaster.new('127.0.0.1', 1502)
     @mstr.connect
   end
 
   it "should raise exception if have'n connected with slave" do
-    mstr = ModBus::TCPMaster.new('127.0.0.1', 1503, 1)
+    mstr = ModBus::TCPMaster.new('127.0.0.1', 1503)
     mstr.closed?.should == true
     lambda { mstr.connect }.should raise_error(ModBus::Errors::ModBusError, "Connection refused")
   end
@@ -28,102 +20,101 @@ describe ModBus::TCPMaster do
 
   # Read coil status
   it "should read coil status" do
-    @mstr.read_coil_status(0, 4).should == [false, false, false, false]
+    @mstr.read_coil_status(0x11, 0, 4).should == [false, false, false, false]
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.read_coil_status(0, 501) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.read_coil_status(0x11, 0, 501) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
 
   it "should raise exception if too many data" do
-   lambda { @mstr.read_coil_status(0, 0x07D1) }.should raise_error(ModBus::Errors::ModBusError, "Invalid data (-16)")
+   lambda { @mstr.read_coil_status(0x11, 0, 0x07D1) }.should raise_error(ModBus::Errors::ModBusError, "Too many data (-15)")
   end
 
   # Read input status
   it "should read discrete inputs" do
-    @mstr.read_input_status(0, 4).should == [false, false, false, false]
+    @mstr.read_input_status(0x11, 0, 4).should == [false, false, false, false]
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.read_input_status(0, 501) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.read_input_status(0x11, 0, 501) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
 
   it "should raise exception if too many data" do
-   lambda { @mstr.read_input_status(0, 0x07D1) }.should raise_error(ModBus::Errors::ModBusError, "Invalid data (-16)")
+   lambda { @mstr.read_input_status(0x11, 0, 0x07D1) }.should raise_error(ModBus::Errors::ModBusError, "Too many data (-15)")
   end
 
   # Read holding registers
   it "should read discrete inputs" do
-    @mstr.read_holding_registers(0, 4).should == [0, 0, 0, 0]
+    @mstr.read_holding_registers(0x11, 0, 4).should == [0, 0, 0, 0]
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.read_holding_registers(402, 99) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.read_holding_registers(0x11, 402, 99) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
 
   it "should raise exception if too many data" do
-   lambda { @mstr.read_holding_registers(0, 0x007E) }.should raise_error(ModBus::Errors::ModBusError, "Invalid data (-16)")
+   lambda { @mstr.read_holding_registers(0x11, 0, 0x007E) }.should raise_error(ModBus::Errors::ModBusError, "Too many data (-15)")
   end
 
   # Read input registers
   it "should read discrete inputs" do
-    @mstr.read_input_registers(0, 4).should == [0, 0, 0, 0]
+    @mstr.read_input_registers(0x11, 0, 4).should == [0, 0, 0, 0]
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.read_input_registers(402, 99) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.read_input_registers(0x11, 402, 99) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
   it "should raise exception if too many data" do
-   lambda { @mstr.read_input_registers(0, 0x007E) }.should raise_error(ModBus::Errors::ModBusError, "Invalid data (-16)")
+   lambda { @mstr.read_input_registers(0x11, 0, 0x007E) }.should raise_error(ModBus::Errors::ModBusError, "Too many data (-15)")
   end
 
   # Force single coil
   it "should force single coil" do
-    @mstr.force_single_coil(4, true).should == @mstr
-    @mstr.read_coil_status(4, 4).should == [true, false, false, false] 
+    @mstr.force_single_coil(0x11, 4, true).should == @mstr
+    @mstr.read_coil_status(0x11, 4, 4).should == [true, false, false, false] 
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.force_single_coil(501, true) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.force_single_coil(0x11, 501, true) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
   # Preset single register
   it "should preset single register" do
-    @mstr.preset_single_register(4, 0x0AA0).should == @mstr
-    @mstr.read_holding_registers(4, 1).should == [0x0AA0] 
+    @mstr.preset_single_register(0x11, 4, 0x0AA0).should == @mstr
+    @mstr.read_holding_registers(0x11, 4, 1).should == [0x0AA0] 
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.preset_single_register(501, 0x0AA0) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.preset_single_register(0x11, 501, 0x0AA0) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
   # Force multiple coils
   it "should force multiple coils" do
-    @mstr.force_multiple_coils(4, [false, true, false, true]).should == @mstr
-    @mstr.read_coil_status(3, 5).should == [false, false, true, false, true] 
+    @mstr.force_multiple_coils(0x11, 14, [false, true, false, true]).should == @mstr
+    @mstr.read_coil_status(0x11, 13, 5).should == [false, false, true, false, true] 
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.force_multiple_coils(501, [true, false]) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.force_multiple_coils(0x11, 501, [true, false]) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
   # Preset multiple registers
   it "should preset multiple registers" do
-    @mstr.preset_multiple_registers(4, [1, 2, 3, 0xAACC]).should == @mstr
-    @mstr.read_holding_registers(3, 5).should == [0, 1, 2, 3, 0xAACC] 
+    @mstr.preset_multiple_registers(0x11, 14, [1, 2, 3, 0xAACC]).should == @mstr
+    @mstr.read_holding_registers(0x11, 13, 5).should == [0, 1, 2, 3, 0xAACC] 
   end
 
   it "should raise exception if illegal data address" do
-   lambda { @mstr.preset_multiple_registers(501, [1, 2]) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
+   lambda { @mstr.preset_multiple_registers(0x11, 501, [1, 2]) }.should raise_error(ModBus::Errors::IllegalDataAddress, "Illegal data address (-2)")
   end
 
   after(:all) do
     @mstr.close unless @mstr.closed?
-    @sl.stop unless @sl.stoped?
   end
 
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: libmodbus4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 2.0.0
 platform: ruby
 authors: 
-- Aleksey Timin
+- A.Timin
 autorequire: libmodbus4r
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 +06:00
+date: 2009-07-30 00:00:00 +06:00
 default_executable: 
 dependencies: []
 
 description: 
-email: atimin@gmail.com
+email: 
 executables: []
 
 extensions: 
@@ -22,39 +22,12 @@ extensions:
 extra_rdoc_files: 
 - README
 - LICENSE
-- NEWS
 files: 
-- lib/modbus4r.rb
-- examples/use_rtu_slave.rb
-- examples/use_tcp_slave.rb
-- examples/use_rtu_master.rb
+- lib/modbus4r.so
 - examples/use_tcp_master.rb
-- spec/rtu_master_spec.rb
 - spec/tcp_master_spec.rb
-- spec/rtu_slave_spec.rb
-- spec/tcp_slave_spec.rb
-- ext/errors.h
-- ext/slave.c
-- ext/modbus.h
-- ext/master.h
-- ext/modbus4r.h
-- ext/rtu_master.c
-- ext/extconf.rb
-- ext/slave.h
-- ext/rtu_master.h
-- ext/errors.c
-- ext/master.c
-- ext/rtu_slave.c
-- ext/rtu_slave.h
-- ext/tcp_master.h
-- ext/tcp_slave.c
-- ext/tcp_slave.h
-- ext/modbus.c
-- ext/tcp_master.c
-- ext/modbus4r.c
 - README
 - LICENSE
-- NEWS
 has_rdoc: true
 homepage: 
 licenses: []
@@ -83,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Binding use *libmodbus* (free implementation of modbus for Linux\MacOS) for Ruby.

data/NEWS

@@ -1,18 +0,0 @@
-libmodbus4r 0.3.0 (2009-09-21)
-===========================
-- Added support slave for TCP and RTU protocol
-- Migrated on libmodbus 0.2.2
-- Added source of libmodbus in project
-- Compatibility with ruby-1.8.7
-
-libmodbus4r 0.2.2 (2009-08-16)
-===========================
-- Fixed bug in Master::read_input_registers
-
-libmodbus4r 0.2.1 (2009-08-10)
-===========================
-- Fixed bug in Master::read_input_coils
-
-libmodbus4r 0.2.0 (2009-07-30)
-===========================
-- First public release

data/examples/use_rtu_master.rb

@@ -1,43 +0,0 @@
-begin 
-  require 'rubygems'
-rescue
-end
-
-require 'modbus4r'
-
-mstr = ModBus::RTUMaster.new('/dev/ttyS0', # device
-                             9600,         # baud: 9600, 19200, etc
-                             "none",       # parity: "even", "odd", "none"
-                             8,            # data bits: 5, 6, 7, 8
-                             1,            # stop bits: 1, 2
-                             1)            # slave id
-mstr.connect
-# Reads the coils status in the slave
-puts mstr.read_coil_status(0,   #start address
-                           10)  #number
-# Reads the input status in the slave
-puts mstr.read_input_status(0,  #start address
-                            10) #number
-# Reads the holding registers in the slave
-puts mstr.read_holding_registers(0,  #start address
-                            5)   #number
-# Reads the input registers in the slave
-puts mstr.read_input_registers(0,  #start address
-                            5)  #number
-# Turns a single coil in the slave
-mstr.force_single_coil(0, #coil address
-                        true) #state
-
-# Sets a value in one holding register in the slave
-mstr.preset_single_register(0, #reg address
-                        0xa0a0) #value
-
-# Sets\reset the coils in the slave
-mstr.force_multiple_coils(0, #start address
-                        [true, false, true]) #data
-
-#Copies the values in th slave
-mstr.preset_multiple_registers(0, #start address
-                        [1, 0xdf, 2]) #data
-
-mstr.close

data/examples/use_rtu_slave.rb

@@ -1,24 +0,0 @@
-begin 
-  require 'rubygems'
-rescue
-end
-
-require 'modbus4r'
-
-sl = ModBus::RTUSlave.new('/dev/ttyS0', # device
-                             9600,         # baud: 9600, 19200, etc
-                             "none",       # parity: "even", "odd", "none"
-                             8,            # data bits: 5, 6, 7, 8
-                             1,            # stop bits: 1, 2
-                             1)            # slave id
-
-sl.coil_status = [false, false, false, false, false] 
-sl.input_status = [false, false, false, false, false]
-sl.holding_registers = [0, 0, 0, 0, 0, 0, 0, 0]
-sl.input_registers = [0, 0, 0, 0, 0, 0, 0, 0]
-
-sl.start 
-
-sl.join
-
-sl.stop