libmodbus4r 0.3.0 → 2.0.0

data/ext/slave.h

@@ -1,44 +0,0 @@
-/* libmodbus4r - binding use libmodbus for Ruby.
-Copyright (C) 2009  Timin Aleksey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details. */
-
-#ifndef SLAVE_H
-#define SLAVE_H
-
-typedef struct {
-    pthread_t tid;
-    int listen_sock;
-    modbus_param_t *mb_param;
-    modbus_mapping_t *mb_map;
-    VALUE coil_status;
-    VALUE input_status;
-    VALUE holding_registers;
-    VALUE input_registers;
-} modbus_slave_t;
-
-extern void mb_push_coil_status(modbus_slave_t *mb_slave);
-extern void mb_pull_coil_status(modbus_slave_t *mb_slave);
-extern void mb_push_input_status(modbus_slave_t *mb_slave);
-extern void mb_push_holding_registers(modbus_slave_t *mb_slave);
-extern void mb_pull_holding_registers(modbus_slave_t *mb_slave);
-extern void mb_push_input_registers(modbus_slave_t *mb_slave);
-extern VALUE mb_sl_is_stoped(VALUE self);
-extern VALUE mb_sl_get_coil_status(VALUE self);
-extern VALUE mb_sl_set_coil_status(VALUE self, VALUE value);
-extern VALUE mb_sl_get_input_status(VALUE self);
-extern VALUE mb_sl_set_input_status(VALUE self, VALUE value);
-extern VALUE mb_sl_get_holding_registers(VALUE self);
-extern VALUE mb_sl_set_holding_registers(VALUE self, VALUE value);
-extern VALUE mb_sl_get_input_registers(VALUE self);
-extern VALUE mb_sl_set_input_registers(VALUE self, VALUE value);
-extern VALUE mb_sl_join(VALUE self);
-#endif

data/ext/tcp_master.c

@@ -1,29 +0,0 @@
-/* libmodbus4r - binding use libmodbus for Ruby.
-Copyright (C) 2009  Timin Aleksey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details. */
-
-#include "modbus4r.h"
-#include "master.h"
-
-VALUE mb_tcp_mstr_new(VALUE self, VALUE ip_address, VALUE port, VALUE slave)
-{
-    modbus_param_t *mb_param;
-
-    mb_param = malloc(sizeof(modbus_param_t));
-    ip_address = rb_funcall(ip_address, rb_intern("to_s"), 0);
-    port = rb_funcall(port, rb_intern("to_i"), 0);
-    slave = rb_funcall(slave, rb_intern("to_i"), 0);
-
-    modbus_init_tcp(mb_param, RSTRING_PTR(ip_address), FIX2INT(port), FIX2INT(slave));
-
-    return Data_Wrap_Struct(self, 0, mb_mstr_free, mb_param);
-}

data/ext/tcp_master.h

@@ -1,20 +0,0 @@
-/* libmodbus4r - binding use libmodbus for Ruby.
-Copyright (C) 2009  Timin Aleksey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details. */
-
-#ifndef TCP_MASTER_H
-#define TCP_MASTER_H
-
-extern VALUE mb_tcp_mstr_new(VALUE self, 
-                VALUE ip_address, VALUE port, VALUE slave);
-
-#endif

data/ext/tcp_slave.c

@@ -1,134 +0,0 @@
-/* libmodbus4r - binding use libmodbus for Ruby.
-Copyright (C) 2009  Timin Aleksey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details. */
-
-#include <pthread.h> 
-#include <unistd.h>
-#include "modbus4r.h"
-#include "slave.h"
-#include "errors.h"
-
-void mb_tcp_sl_free(modbus_slave_t *mb_slave)
-{
-    close(mb_slave->listen_sock);
-    pthread_cancel(mb_slave->tid);
-
-    modbus_close(mb_slave->mb_param);
-
-    modbus_mapping_free(mb_slave->mb_map);
-    
-#ifndef RUBY_1_8
-    rb_ary_free(mb_slave->coil_status); 
-    rb_ary_free(mb_slave->input_status); 
-    rb_ary_free(mb_slave->holding_registers); 
-    rb_ary_free(mb_slave->input_registers); 
-#else
-    free(RARRAY_PTR(mb_slave->coil_status)); 
-    free(RARRAY_PTR(mb_slave->input_status)); 
-    free(RARRAY_PTR(mb_slave->holding_registers)); 
-    free(RARRAY_PTR(mb_slave->input_registers)); 
-#endif
-
-    free(mb_slave);
-}
-
-void *mb_tcp_serv(void *arg)
-{
-    modbus_slave_t *mb_slave = (modbus_slave_t *)arg;
-
-    mb_slave->listen_sock = modbus_slave_listen_tcp(mb_slave->mb_param, 1);
-
-    while (1) {
-        modbus_slave_accept_tcp(mb_slave->mb_param, 
-                                &mb_slave->listen_sock);
-        uint8_t query[MAX_MESSAGE_LENGTH];
-        int query_size;
-        while(1) {
-            int ret = modbus_slave_receive(mb_slave->mb_param, -1,
-                                        query, &query_size);
-
-            if (ret == 0) {
-                mb_push_coil_status(mb_slave);
-                mb_push_input_status(mb_slave);
-                mb_push_holding_registers(mb_slave);
-                mb_push_input_registers(mb_slave);
-
-                modbus_slave_manage(mb_slave->mb_param, query, 
-                                    query_size, mb_slave->mb_map);
-
-                mb_pull_coil_status(mb_slave);
-                mb_pull_holding_registers(mb_slave);
-            } else if (ret == CONNECTION_CLOSED) {
-                modbus_close(mb_slave->mb_param);
-                break;
-            } else {
-                continue;
-            }
-        }
-    }
-}
-
-VALUE mb_tcp_sl_new(VALUE self, VALUE ip_address, VALUE port, VALUE slave)
-{
-    modbus_slave_t *mb_slave;
-    mb_slave = malloc(sizeof(modbus_slave_t));
-    mb_slave->mb_param = malloc(sizeof(modbus_param_t));
-    mb_slave->mb_map = malloc(sizeof(modbus_mapping_t));
-
-    ip_address = rb_funcall(ip_address, rb_intern("to_s"), 0);
-    port = rb_funcall(port, rb_intern("to_i"), 0);
-    slave = rb_funcall(slave, rb_intern("to_i"), 0);
-
-    modbus_init_tcp(mb_slave->mb_param, RSTRING_PTR(ip_address), FIX2INT(port), FIX2INT(slave));
-
-    int ret = modbus_mapping_new(mb_slave->mb_map, 0, 0, 0, 0);
-    if (ret < 0) {
-        rb_raise(rb_eStandardError, "Memory allocation failed");
-    }
-    
-    mb_slave->coil_status = rb_ary_new();
-    mb_slave->input_status = rb_ary_new();
-    mb_slave->holding_registers = rb_ary_new();
-    mb_slave->input_registers = rb_ary_new();
-
-    return Data_Wrap_Struct(self, 0, mb_tcp_sl_free, mb_slave);
-}
-
-VALUE mb_tcp_sl_start(VALUE self)
-{    
-    modbus_slave_t *mb_slave;
-    Data_Get_Struct(self, modbus_slave_t, mb_slave);
-
-    int ret = pthread_create(&mb_slave->tid, NULL, mb_tcp_serv, 
-                                (void *)mb_slave);
-    if (ret != 0) {
-        rb_raise(rb_eStandardError, "Slave has not started");
-    }
-    
-    return self;
-}
-
-VALUE mb_tcp_sl_stop(VALUE self)
-{
-    modbus_slave_t *mb_slave;
-    Data_Get_Struct(self, modbus_slave_t, mb_slave);
-
-    int ret = pthread_cancel(mb_slave->tid);
-    if (ret != 0) {
-        rb_raise(rb_eStandardError, "Slave has not stoped");
-    }
-    
-    close(mb_slave->listen_sock);
-    modbus_close(mb_slave->mb_param);
-
-    return self;
-}

data/ext/tcp_slave.h

@@ -1,21 +0,0 @@
-/* libmodbus4r - binding use libmodbus for Ruby.
-Copyright (C) 2009  Timin Aleksey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details. */
-
-#ifndef TCP_SLAVE_H
-#define TCP_SLAVE_H
-
-extern VALUE mb_tcp_sl_new(VALUE self, VALUE ip_address, VALUE port, VALUE id);
-extern VALUE mb_tcp_sl_start(VALUE self);
-extern VALUE mb_tcp_sl_stop(VALUE self);
-
-#endif

data/lib/modbus4r.rb

@@ -1,15 +0,0 @@
-# libmodbus4r - binding use libmodbus for Ruby.
-# Copyright (C) 2009  Timin Aleksey
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details. 
-
-require '_modbus4r'
-

data/spec/rtu_master_spec.rb

@@ -1,21 +0,0 @@
-require 'modbus4r'
-
-describe ModBus::RTUMaster do
-
-  before(:all) do
-    @mstr = ModBus::RTUMaster.new('/dev/ttyS3', 9600, 'none', 8, 1, 1)
-    @mstr.connect
-  end
-
-  it "should be connect" do
-    @mstr.closed?.should == false
-  end
-
-  after(:all) do
-    @mstr.close unless @mstr.closed?
-  end
-
-end
-    
-
-

data/spec/rtu_slave_spec.rb

@@ -1,16 +0,0 @@
-require 'modbus4r'
-
-describe ModBus::RTUSlave do
-  before(:all) do
-    @sl = ModBus::RTUSlave.new('/dev/ttyS3', 9600, 'none', 8, 1, 1)
-    @sl.start
-  end
-
-  it "should be start" do
-    @sl.stoped?.should == false
-  end
-
-  after(:all) do
-    @sl.stop unless @sl.stoped?
-  end
-end

data/spec/tcp_slave_spec.rb

@@ -1,95 +0,0 @@
-require 'modbus4r'
-
-describe ModBus::TCPSlave do
-  
-  before(:each) do
-    @sl = ModBus::TCPSlave.new('127.0.0.1', 1502, 1)
-    @sl.start
-
-    @mstr = ModBus::TCPMaster.new('127.0.0.1', 1502, 1)
-    @mstr.connect
-  end
-
-  it "should have stoped" do
-    sl = ModBus::TCPSlave.new('127.0.0.1', 1512, 1)
-    sl.start.stoped? == false
-
-
-    mstr = ModBus::TCPMaster.new('127.0.0.1', 1512, 1)
-    mstr.connect.closed?.should == false
-
-    sl.stop.stoped? == true
-    lambda { mstr.connect }.should raise_error(ModBus::Errors::ModBusError)
-    sl.start.stoped? == false
-  end
-
-  it "should have coil status" do
-    @sl.coil_status.should == []
-    @sl.coil_status = [false, true, false]
-    @sl.coil_status.should == [false, true, false]
-    
-    @mstr.read_coil_status(0, 3).should == [false, true, false]
-    @mstr.force_single_coil(2, true)
-     
-    @sl.coil_status.should == [false, true ,true]
-     
-    @mstr.force_multiple_coils(0, [true, true, true])
-
-    @sl.coil_status.should == [true, true, true]
-    @sl.coil_status[1] = false
-    @sl.coil_status.should == [true, false, true]
-
-    @mstr.read_coil_status(0, 3).should == [true, false, true]
-  end
-
-  it "should have input status" do
-    @sl.input_status.should == []
-    @sl.input_status = [false, false, false]
-    @sl.input_status.should == [false, false, false]
-
-    @mstr.read_input_status(0, 3).should == [false, false, false]
-
-    @sl.input_status[1] = true
-    @sl.input_status.should == [false, true, false]
-
-    @mstr.read_input_status(0, 3).should  == [false, true, false]
-  end
-
-  it "should have holding registers" do
-    @sl.holding_registers.should == []
-    @sl.holding_registers = [0, 0, 0]
-    @sl.holding_registers.should == [0, 0, 0]
-
-    @mstr.read_holding_registers(0, 3).should == [0, 0, 0]
-    @mstr.preset_single_register(1, 10000)
-    
-    @sl.holding_registers.should == [0, 10000, 0]
-
-    @mstr.preset_multiple_registers(0, [1, 2, 3])
-
-    @sl.holding_registers.should == [1, 2, 3]
-    @sl.holding_registers[2] = 55
-    @sl.holding_registers.should == [1, 2, 55]
-
-    @mstr.read_holding_registers(0, 3) == [1, 2, 55]
-  end
-
-  it "should have input registers" do
-    @sl.input_registers.should == []
-    @sl.input_registers = [0, 0, 0]
-    @sl.input_registers.should == [0, 0, 0]
-
-    @mstr.read_input_registers(0, 3).should == [0, 0, 0]
-
-    @sl.input_registers[2] = 55
-    @sl.input_registers.should == [0, 0, 55]
-
-    @mstr.read_input_registers(0, 3) == [1, 2, 55]
-  end
-
-  after(:each) do
-    @sl.stop unless @sl.stoped?
-    @mstr.close unless @mstr.closed?
-  end
-
-end