0.5 Release

--HG-- rename : tests/ModbusMasterUdp/output/test.fc16fc3.php.html => tests/ModbusMaster/ref/test.tcp.fc16fc3.php.html rename : tests/ModbusMasterUdp/output/test.fc26.php.html => tests/ModbusMaster/ref/test.tcp.fc26.php.html rename : tests/ModbusMasterUdp/output/test.fc16fc3.php.html => tests/ModbusMaster/ref/test.udp.fc16fc3.php.html rename : tests/ModbusMasterUdp/output/test.fc26.php.html => tests/ModbusMaster/ref/test.udp.fc26.php.html rename : tests/ModbusMasterUdp/output/test.fc16fc3.php.html => tests/ModbusMasterTcp/ref/test.fc16fc3.php.html rename : tests/ModbusMasterUdp/output/test.fc26.php.html => tests/ModbusMasterTcp/ref/test.fc26.php.html
Added tag 0.4.1 for changeset 1e09b0da7d8c
2013-06-14 07:42:17 -05:00 · 2013-06-14 07:40:52 -05:00 · 2013-06-14 07:40:48 -05:00 · 2013-06-14 07:39:18 -05:00
35 changed files with 1380 additions and 802 deletions
@@ -1,2 +1,4 @@
 a88b5a87fb4cd49f16ce72062cce19d55f1fbf98 0.2
 a7f90c18859d31922bdd8c61299e2790f5e2eb1a 0.3
+bdf8b3f414c4d08fc0edf9fd1953f55db26e4bac 0.4
+1e09b0da7d8c62a9a292ee51540feac9de4c1222 0.4.1
@@ -0,0 +1,798 @@
+<?php
+/**
+ * Phpmodbus Copyright (c) 2004, 2012 Jan Krakora
+ *  
+ * This source file is subject to the "PhpModbus license" that is bundled
+ * with this package in the file license.txt.
+ *   
+ *
+ * @copyright  Copyright (c) 2004, 2012 Jan Krakora
+ * @license PhpModbus license 
+ * @category Phpmodbus
+ * @tutorial Phpmodbus.pkg 
+ * @package Phpmodbus 
+ * @version $id$
+ *  
+ */
+
+require_once dirname(__FILE__) . '/IecType.php';
+require_once dirname(__FILE__) . '/PhpType.php'; 
+
+/**
+ * ModbusMaster
+ *
+ * This class deals with the MODBUS master
+ *  
+ * Implemented MODBUS master functions:
+ *   - FC  1: read coils
+ *   - FC  3: read multiple registers
+ *   - FC 15: write multiple coils 
+ *   - FC 16: write multiple registers
+ *   - FC 23: read write registers
+ *   
+ * @author Jan Krakora
+ * @copyright  Copyright (c) 2004, 2012 Jan Krakora
+ * @package Phpmodbus  
+ *
+ */
+class ModbusMaster {
+  private $sock;
+  public $host = "192.168.1.1";
+  public $port = "502";  
+  public $client = "";
+  public $client_port = "502";
+  public $status;
+  public $timeout_sec = 5; // Timeout 5 sec
+  public $endianess = 0; // Endianess codding (little endian == 0, big endian == 1) 
+  public $socket_protocol = "UDP"; // Socket protocol (TCP, UDP)
+  
+  /**
+   * ModbusMaster
+   *
+   * This is the constructor that defines {@link $host} IP address of the object. 
+   *     
+   * @param String $host An IP address of a Modbus TCP device. E.g. "192.168.1.1"
+   * @param String $protocol Socket protocol (TCP, UDP)   
+   */         
+  function ModbusMaster($host, $protocol){
+    $this->socket_protocol = $protocol;
+    $this->host = $host;
+  }
+
+  /**
+   * __toString
+   *
+   * Magic method
+   */
+  function  __toString() {
+      return "<pre>" . $this->status . "</pre>";
+  }
+
+  /**
+   * connect
+   *
+   * Connect the socket
+   *
+   * @return bool
+   */
+  private function connect(){
+    // Create a protocol specific socket 
+    if ($this->socket_protocol == "TCP"){ 
+        // TCP socket
+        $this->sock = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);      
+    } elseif ($this->socket_protocol == "UDP"){
+        // UDP socket
+        $this->sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+    } else {
+        throw new Exception("Unknown socket protocol, should be 'TCP' or 'UDP'");
+    }
+    // Bind the client socket to a specific local port
+    if (strlen($this->client)>0){
+        $result = socket_bind($this->sock, $this->client, $this->client_port);
+        if ($result === false) {
+            throw new Exception("socket_bind() failed.</br>Reason: ($result)".
+                socket_strerror(socket_last_error($this->sock)));
+        } else {
+            $this->status .= "Bound\n";
+        }
+    }
+    // Connect the socket
+    $result = @socket_connect($this->sock, $this->host, $this->port);
+    if ($result === false) {
+        throw new Exception("socket_connect() failed.</br>Reason: ($result)".
+            socket_strerror(socket_last_error($this->sock)));
+    } else {
+        $this->status .= "Connected\n";
+        return true;        
+    }    
+  }
+
+  /**
+   * disconnect
+   *
+   * Disconnect the socket
+   */
+  private function disconnect(){    
+    socket_close($this->sock);
+    $this->status .= "Disconnected\n";
+  }
+
+  /**
+   * send
+   *
+   * Send the packet via Modbus
+   *
+   * @param string $packet
+   */
+  private function send($packet){
+    socket_write($this->sock, $packet, strlen($packet));  
+    $this->status .= "Send\n";
+  }
+
+  /**
+   * rec
+   *
+   * Receive data from the socket
+   *
+   * @return bool
+   */
+  private function rec(){
+    socket_set_nonblock($this->sock);
+    $readsocks[] = $this->sock;     
+    $writesocks = NULL;
+    $exceptsocks = NULL;
+    $rec = "";
+    $lastAccess = time();
+    while (socket_select($readsocks, 
+            $writesocks, 
+            $exceptsocks,
+            0, 
+            300000) !== FALSE) {
+            $this->status .= "Wait data ... \n";
+        if (in_array($this->sock, $readsocks)) {
+            while (@socket_recv($this->sock, $rec, 2000, 0)) {
+                $this->status .= "Data received\n";
+                return $rec;
+            }
+            $lastAccess = time();
+        } else {             
+            if (time()-$lastAccess >= $this->timeout_sec) {
+                throw new Exception( "Watchdog time expired [ " .
+                  $this->timeout_sec . " sec]!!! Connection to " . 
+                  $this->host . " is not established.");
+            }
+        }
+        $readsocks[] = $this->sock;
+    }
+  } 
+  
+  /**
+   * responseCode
+   *
+   * Check the Modbus response code
+   *
+   * @param string $packet
+   * @return bool
+   */
+  private function responseCode($packet){    
+    if(($packet[7] & 0x80) > 0) {
+      throw new Exception("Modbus response error code:" . ord($packet[8]));
+    } else {
+      $this->status .= "Modbus response error code: NOERROR\n";
+      return true;
+    }    
+  }
+  
+  /**
+   * readCoils
+   * 
+   * Modbus function FC 1(0x01) - Read Coils
+   * 
+   * Reads {@link $quantity} of Coils (boolean) from reference 
+   * {@link $referenceRead} of a memory of a Modbus device given by 
+   * {@link $unitId}.
+   * 
+   * @param type $unitId
+   * @param type $reference
+   * @param type $quantity 
+   */
+  function readCoils($unitId, $reference, $quantity){
+    $this->status .= "readCoils: START\n";
+    // connect
+    $this->connect();
+    // send FC 3    
+    $packet = $this->readCoilsPacketBuilder($unitId, $reference, $quantity);
+    $this->status .= $this->printPacket($packet);    
+    $this->send($packet);
+    // receive response
+    $rpacket = $this->rec();
+    $this->status .= $this->printPacket($rpacket);    
+    // parse packet    
+    $receivedData = $this->readCoilsParser($rpacket, $quantity);
+    // disconnect
+    $this->disconnect();
+    $this->status .= "readCoils: DONE\n";
+    // return
+    return $receivedData;
+  }
+  
+  /**
+   * fc1
+   * 
+   * Alias to {@link readMultipleCoils} method
+   * 
+   * @param type $unitId
+   * @param type $reference
+   * @param type $quantity
+   * @return type 
+   */
+  function fc1($unitId, $reference, $quantity){
+    return $this->readCoils($unitId, $reference, $quantity);
+  }
+  
+  /**
+   * readCoilsPacketBuilder
+   * 
+   * FC1 packet builder - read coils
+   * 
+   * @param type $unitId
+   * @param type $reference
+   * @param type $quantity
+   * @return type 
+   */
+  private function readCoilsPacketBuilder($unitId, $reference, $quantity){
+    $dataLen = 0;
+    // build data section
+    $buffer1 = "";
+    // build body
+    $buffer2 = "";
+    $buffer2 .= iecType::iecBYTE(1);              // FC 1 = 1(0x01)
+    // build body - read section    
+    $buffer2 .= iecType::iecINT($reference);      // refnumber = 12288      
+    $buffer2 .= iecType::iecINT($quantity);       // quantity
+    $dataLen += 5;
+    // build header
+    $buffer3 = '';
+    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID
+    $buffer3 .= iecType::iecINT(0);               // protocol ID
+    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght
+    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID
+    // return packet string
+    return $buffer3. $buffer2. $buffer1;
+  }
+  
+  /**
+   * readCoilsParser
+   * 
+   * FC 1 response parser
+   * 
+   * @param type $packet
+   * @param type $quantity
+   * @return type 
+   */
+  private function readCoilsParser($packet, $quantity){    
+    $data = array();
+    // check Response code
+    $this->responseCode($packet);
+    // get data from stream
+    for($i=0;$i<ord($packet[8]);$i++){
+      $data[$i] = ord($packet[9+$i]);
+    }    
+    // get bool values to array
+    $data_bolean_array = array();
+    $di = 0;
+    foreach($data as $value){
+      for($i=0;$i<8;$i++){
+        if($di > $quantity) continue;
+        // get boolean value 
+        $v = ($value >> $i) & 0x01;
+        // build boolean array
+        if($v == 0){
+          $data_bolean_array[] = FALSE;
+        } else {
+          $data_bolean_array[] = TRUE;
+        }
+        $di++;
+      }
+    }
+    return $data_bolean_array;
+  }
+  
+  /**
+   * readMultipleRegisters
+   *
+   * Modbus function FC 3(0x03) - Read Multiple Registers.
+   * 
+   * This function reads {@link $quantity} of Words (2 bytes) from reference 
+   * {@link $referenceRead} of a memory of a Modbus device given by 
+   * {@link $unitId}.
+   *    
+   *
+   * @param int $unitId usually ID of Modbus device 
+   * @param int $reference Reference in the device memory to read data (e.g. in device WAGO 750-841, memory MW0 starts at address 12288).
+   * @param int $quantity Amounth of the data to be read from device.
+   * @return false|Array Success flag or array of received data.
+   */
+  function readMultipleRegisters($unitId, $reference, $quantity){
+    $this->status .= "readMultipleRegisters: START\n";
+    // connect
+    $this->connect();
+    // send FC 3    
+    $packet = $this->readMultipleRegistersPacketBuilder($unitId, $reference, $quantity);
+    $this->status .= $this->printPacket($packet);    
+    $this->send($packet);
+    // receive response
+    $rpacket = $this->rec();
+    $this->status .= $this->printPacket($rpacket);    
+    // parse packet    
+    $receivedData = $this->readMultipleRegistersParser($rpacket);
+    // disconnect
+    $this->disconnect();
+    $this->status .= "readMultipleRegisters: DONE\n";
+    // return
+    return $receivedData;
+  }
+  
+  /**
+   * fc3
+   *
+   * Alias to {@link readMultipleRegisters} method.
+   *
+   * @param int $unitId
+   * @param int $reference
+   * @param int $quantity
+   * @return false|Array
+   */
+  function fc3($unitId, $reference, $quantity){
+    return $this->readMultipleRegisters($unitId, $reference, $quantity);
+  }  
+  
+  /**
+   * readMultipleRegistersPacketBuilder
+   *
+   * Packet FC 3 builder - read multiple registers
+   *
+   * @param int $unitId
+   * @param int $reference
+   * @param int $quantity
+   * @return string
+   */
+  private function readMultipleRegistersPacketBuilder($unitId, $reference, $quantity){
+    $dataLen = 0;
+    // build data section
+    $buffer1 = "";
+    // build body
+    $buffer2 = "";
+    $buffer2 .= iecType::iecBYTE(3);             // FC 3 = 3(0x03)
+    // build body - read section    
+    $buffer2 .= iecType::iecINT($reference);  // refnumber = 12288      
+    $buffer2 .= iecType::iecINT($quantity);       // quantity
+    $dataLen += 5;
+    // build header
+    $buffer3 = '';
+    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID
+    $buffer3 .= iecType::iecINT(0);               // protocol ID
+    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght
+    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID
+    // return packet string
+    return $buffer3. $buffer2. $buffer1;
+  }
+  
+  /**
+   * readMultipleRegistersParser
+   *
+   * FC 3 response parser
+   *
+   * @param string $packet
+   * @return array
+   */
+  private function readMultipleRegistersParser($packet){    
+    $data = array();
+    // check Response code
+    $this->responseCode($packet);
+    // get data
+    for($i=0;$i<ord($packet[8]);$i++){
+      $data[$i] = ord($packet[9+$i]);
+    }    
+    return $data;
+  }
+  
+  /**
+   * writeMultipleCoils
+   * 
+   * Modbus function FC15(0x0F) - Write Multiple Coils
+   *
+   * This function writes {@link $data} array at {@link $reference} position of 
+   * memory of a Modbus device given by {@link $unitId}. 
+   * 
+   * @param type $unitId
+   * @param type $reference
+   * @param type $data
+   * @return type 
+   */
+  function writeMultipleCoils($unitId, $reference, $data){
+    $this->status .= "writeMultipleCoils: START\n";
+    // connect
+    $this->connect();
+    // send FC16    
+    $packet = $this->writeMultipleCoilsPacketBuilder($unitId, $reference, $data);
+    $this->status .= $this->printPacket($packet);    
+    $this->send($packet);
+    // receive response
+    $rpacket = $this->rec();
+    $this->status .= $this->printPacket($rpacket);    
+    // parse packet
+    $this->writeMultipleCoilsParser($rpacket);
+    // disconnect
+    $this->disconnect();
+    $this->status .= "writeMultipleCoils: DONE\n";
+    return true;
+  }
+  
+  /**
+   * fc15
+   *
+   * Alias to {@link writeMultipleCoils} method
+   *
+   * @param int $unitId
+   * @param int $reference
+   * @param array $data
+   * @return bool
+   */
+  function fc15($unitId, $reference, $data){    
+    return $this->writeMultipleCoils($unitId, $reference, $data);
+  }
+  
+  /**
+   * writeMultipleCoilsPacketBuilder
+   *
+   * Packet builder FC15 - Write multiple coils
+   *
+   * @param int $unitId
+   * @param int $reference
+   * @param array $data
+   * @return string
+   */
+  private function writeMultipleCoilsPacketBuilder($unitId, $reference, $data){
+    $dataLen = 0;    
+    // build bool stream to the WORD array
+    $data_word_stream = array();
+    $data_word = 0;
+    $shift = 0;    
+    for($i=0;$i<count($data);$i++) {
+      if((($i % 8) == 0) && ($i > 0)) {
+        $data_word_stream[] = $data_word;
+        $shift = 0;
+        $data_word = 0;
+        $data_word |= (0x01 && $data[$i]) << $shift;
+        $shift++;
+      }
+      else {
+        $data_word |= (0x01 && $data[$i]) << $shift;
+        $shift++;
+      }
+    }
+    $data_word_stream[] = $data_word;
+    // show binary stream to status string
+    foreach($data_word_stream as $d){
+        $this->status .= sprintf("byte=b%08b\n", $d);
+    }    
+    // build data section
+    $buffer1 = "";
+    foreach($data_word_stream as $key=>$dataitem) {
+        $buffer1 .= iecType::iecBYTE($dataitem);   // register values x
+        $dataLen += 1;
+    }
+    // build body
+    $buffer2 = "";
+    $buffer2 .= iecType::iecBYTE(15);             // FC 15 = 15(0x0f)
+    $buffer2 .= iecType::iecINT($reference);      // refnumber = 12288      
+    $buffer2 .= iecType::iecINT(count($data));      // bit count      
+    $buffer2 .= iecType::iecBYTE((count($data)+7)/8);       // byte count
+    $dataLen += 6;
+    // build header
+    $buffer3 = '';
+    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID    
+    $buffer3 .= iecType::iecINT(0);               // protocol ID    
+    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght    
+    $buffer3 .= iecType::iecBYTE($unitId);        // unit ID    
+     
+    // return packet string
+    return $buffer3. $buffer2. $buffer1;
+  }
+  
+  /**
+   * writeMultipleCoilsParser
+   *
+   * FC15 response parser
+   *
+   * @param string $packet
+   * @return bool
+   */
+  private function writeMultipleCoilsParser($packet){
+    $this->responseCode($packet);
+    return true;
+  }
+  
+  /**
+   * writeMultipleRegister
+   *
+   * Modbus function FC16(0x10) - Write Multiple Register.
+   *
+   * This function writes {@link $data} array at {@link $reference} position of 
+   * memory of a Modbus device given by {@link $unitId}.
+   *
+   *
+   * @param int $unitId usually ID of Modbus device 
+   * @param int $reference Reference in the device memory (e.g. in device WAGO 750-841, memory MW0 starts at address 12288)
+   * @param array $data Array of values to be written.
+   * @param array $dataTypes Array of types of values to be written. The array should consists of string "INT", "DINT" and "REAL".    
+   * @return bool Success flag
+   */       
+  function writeMultipleRegister($unitId, $reference, $data, $dataTypes){
+    $this->status .= "writeMultipleRegister: START\n";
+    // connect
+    $this->connect();
+    // send FC16    
+    $packet = $this->writeMultipleRegisterPacketBuilder($unitId, $reference, $data, $dataTypes);
+    $this->status .= $this->printPacket($packet);    
+    $this->send($packet);
+    // receive response
+    $rpacket = $this->rec();
+    $this->status .= $this->printPacket($rpacket);    
+    // parse packet
+    $this->writeMultipleRegisterParser($rpacket);
+    // disconnect
+    $this->disconnect();
+    $this->status .= "writeMultipleRegister: DONE\n";
+    return true;
+  }
+
+
+  /**
+   * fc16
+   *
+   * Alias to {@link writeMultipleRegister} method
+   *
+   * @param int $unitId
+   * @param int $reference
+   * @param array $data
+   * @param array $dataTypes
+   * @return bool
+   */
+  function fc16($unitId, $reference, $data, $dataTypes){    
+    return $this->writeMultipleRegister($unitId, $reference, $data, $dataTypes);
+  }
+
+
+  /**
+   * writeMultipleRegisterPacketBuilder
+   *
+   * Packet builder FC16 - WRITE multiple register
+   *     e.g.: 4dd90000000d0010300000030603e807d00bb8
+   *
+   * @param int $unitId
+   * @param int $reference
+   * @param array $data
+   * @param array $dataTypes
+   * @return string
+   */
+  private function writeMultipleRegisterPacketBuilder($unitId, $reference, $data, $dataTypes){
+    $dataLen = 0;
+    // build data section
+    $buffer1 = "";
+    foreach($data as $key=>$dataitem) {
+      if($dataTypes[$key]=="INT"){
+        $buffer1 .= iecType::iecINT($dataitem);   // register values x
+        $dataLen += 2;
+      }
+      elseif($dataTypes[$key]=="DINT"){
+        $buffer1 .= iecType::iecDINT($dataitem, $this->endianness);   // register values x
+        $dataLen += 4;
+      }
+      elseif($dataTypes[$key]=="REAL") {
+        $buffer1 .= iecType::iecREAL($dataitem, $this->endianness);   // register values x
+        $dataLen += 4;
+      }       
+      else{
+        $buffer1 .= iecType::iecINT($dataitem);   // register values x
+        $dataLen += 2;
+      }
+    }
+    // build body
+    $buffer2 = "";
+    $buffer2 .= iecType::iecBYTE(16);             // FC 16 = 16(0x10)
+    $buffer2 .= iecType::iecINT($reference);      // refnumber = 12288      
+    $buffer2 .= iecType::iecINT($dataLen/2);        // word count      
+    $buffer2 .= iecType::iecBYTE($dataLen);     // byte count
+    $dataLen += 6;
+    // build header
+    $buffer3 = '';
+    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID    
+    $buffer3 .= iecType::iecINT(0);               // protocol ID    
+    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght    
+    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID    
+    
+    // return packet string
+    return $buffer3. $buffer2. $buffer1;
+  }
+  
+  /**
+   * writeMultipleRegisterParser
+   *
+   * FC16 response parser
+   *
+   * @param string $packet
+   * @return bool
+   */
+  private function writeMultipleRegisterParser($packet){
+    $this->responseCode($packet);
+    return true;
+  }
+  
+  /**
+   * readWriteRegisters
+   *
+   * Modbus function FC23(0x17) - Read Write Registers.
+   * 
+   * This function writes {@link $data} array at reference {@link $referenceWrite} 
+   * position of memory of a Modbus device given by {@link $unitId}. Simultanously, 
+   * it returns {@link $quantity} of Words (2 bytes) from reference {@link $referenceRead}.
+   *
+   *
+   * @param int $unitId usually ID of Modbus device 
+   * @param int $referenceRead Reference in the device memory to read data (e.g. in device WAGO 750-841, memory MW0 starts at address 12288).
+   * @param int $quantity Amounth of the data to be read from device.   
+   * @param int $referenceWrite Reference in the device memory to write data.
+   * @param array $data Array of values to be written.
+   * @param array $dataTypes Array of types of values to be written. The array should consists of string "INT", "DINT" and "REAL".   
+   * @return false|Array Success flag or array of data.
+   */
+  function readWriteRegisters($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes){
+    $this->status .= "readWriteRegisters: START\n";
+    // connect
+    $this->connect();
+    // send FC23    
+    $packet = $this->readWriteRegistersPacketBuilder($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes);
+    $this->status .= $this->printPacket($packet);    
+    $this->send($packet);
+    // receive response
+    $rpacket = $this->rec();
+    $this->status .= $this->printPacket($rpacket);
+    // parse packet
+    $receivedData = $this->readWriteRegistersParser($rpacket);
+    // disconnect
+    $this->disconnect();
+    $this->status .= "writeMultipleRegister: DONE\n";
+    // return
+    return $receivedData;
+  }
+  
+  /**
+   * fc23
+   *
+   * Alias to {@link readWriteRegisters} method.
+   *
+   * @param int $unitId
+   * @param int $referenceRead
+   * @param int $quantity
+   * @param int $referenceWrite
+   * @param array $data
+   * @param array $dataTypes
+   * @return false|Array
+   */
+  function fc23($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes){
+    return $this->readWriteRegisters($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes);
+  }
+  
+  /**
+   * readWriteRegistersPacketBuilder
+   *
+   * Packet FC23 builder - READ WRITE registers
+   *
+   *
+   * @param int $unitId
+   * @param int $referenceRead
+   * @param int $quantity
+   * @param int $referenceWrite
+   * @param array $data
+   * @param array $dataTypes
+   * @return string
+   */
+  private function readWriteRegistersPacketBuilder($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes){
+    $dataLen = 0;
+    // build data section
+    $buffer1 = "";
+    foreach($data as $key => $dataitem) {
+      if($dataTypes[$key]=="INT"){
+        $buffer1 .= iecType::iecINT($dataitem);   // register values x
+        $dataLen += 2;
+      }
+      elseif($dataTypes[$key]=="DINT"){
+        $buffer1 .= iecType::iecDINT($dataitem, $this->endianness);   // register values x
+        $dataLen += 4;
+      }
+      elseif($dataTypes[$key]=="REAL") {
+        $buffer1 .= iecType::iecREAL($dataitem, $this->endianness);   // register values x
+        $dataLen += 4;
+      }       
+      else{
+        $buffer1 .= iecType::iecINT($dataitem);   // register values x
+        $dataLen += 2;
+      }
+    }
+    // build body
+    $buffer2 = "";
+    $buffer2 .= iecType::iecBYTE(23);             // FC 23 = 23(0x17)
+    // build body - read section    
+    $buffer2 .= iecType::iecINT($referenceRead);  // refnumber = 12288      
+    $buffer2 .= iecType::iecINT($quantity);       // quantity
+    // build body - write section    
+    $buffer2 .= iecType::iecINT($referenceWrite); // refnumber = 12288      
+    $buffer2 .= iecType::iecINT($dataLen/2);      // word count      
+    $buffer2 .= iecType::iecBYTE($dataLen);       // byte count
+    $dataLen += 10;
+    // build header
+    $buffer3 = '';
+    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID    
+    $buffer3 .= iecType::iecINT(0);               // protocol ID    
+    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght    
+    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID    
+    
+    // return packet string
+    return $buffer3. $buffer2. $buffer1;
+  }
+  
+
+  /**
+   * readWriteRegistersParser
+   *
+   * FC23 response parser
+   *
+   * @param string $packet
+   * @return array
+   */
+  private function readWriteRegistersParser($packet){
+    $data = array();
+    // if not exception
+    if(!$this->responseCode($packet))
+      return false;
+    // get data
+    for($i=0;$i<ord($packet[8]);$i++){
+      $data[$i] = ord($packet[9+$i]);
+    }    
+    return $data;
+  }
+
+  /**
+   * byte2hex
+   *
+   * Parse data and get it to the Hex form
+   *
+   * @param char $value
+   * @return string
+   */
+  private function byte2hex($value){
+    $h = dechex(($value >> 4) & 0x0F);
+    $l = dechex($value & 0x0F);
+    return "$h$l";
+  }
+
+  /**
+   * printPacket
+   *
+   * Print a packet in the hex form
+   *
+   * @param string $packet
+   * @return string
+   */
+  private function printPacket($packet){
+    $str = "";   
+    $str .= "Packet: "; 
+    for($i=0;$i<strlen($packet);$i++){
+      $str .= $this->byte2hex(ord($packet[$i]));
+    }
+    $str .= "\n";
+    return $str;
+  }
+}
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Phpmodbus Copyright (c) 2004, 2012 Jan Krakora
+ *  
+ * This source file is subject to the "PhpModbus license" that is bundled
+ * with this package in the file license.txt.
+ *   
+ *
+ * @copyright  Copyright (c) 2004, 2012 Jan Krakora
+ * @license PhpModbus license 
+ * @category Phpmodbus
+ * @tutorial Phpmodbus.pkg 
+ * @package Phpmodbus 
+ * @version $id$
+ *  
+ */
+
+require_once dirname(__FILE__) . '/ModbusMaster.php'; 
+
+/**
+ * ModbusMasterTcp
+ *
+ * This class deals with the MODBUS master using TCP. Extends ModbusMaster class.
+ *  
+ * Implemented MODBUS functions:
+ *   - FC  1: read coils
+ *   - FC  3: read multiple registers
+ *   - FC 15: write multiple coils 
+ *   - FC 16: write multiple registers
+ *   - FC 23: read write registers
+ *   
+ * @author Jan Krakora
+ * @copyright  Copyright (c) 2004, 2012 Jan Krakora
+ * @package Phpmodbus  
+ *
+ */
+class ModbusMasterTcp extends ModbusMaster {
+  /**
+   * ModbusMasterTcp
+   *
+   * This is the constructor that defines {@link $host} IP address of the object. 
+   *     
+   * @param String $host An IP address of a Modbus TCP device. E.g. "192.168.1.1".
+   */         
+  function ModbusMasterTcp($host){
+    $this->host = $host;
+    $this->socket_protocol = "TCP";
+  }
+}
@@ -1,12 +1,12 @@
 <?php
 /**
- * Phpmodbus Copyright (c) 2004, 2010 Jan Krakora, WAGO Kontakttechnik GmbH & Co. KG (http://www.wago.com)
+ * Phpmodbus Copyright (c) 2004, 2012 Jan Krakora
 *  
 * This source file is subject to the "PhpModbus license" that is bundled
 * with this package in the file license.txt.
 *   
 *
- * @copyright  Copyright (c) 2004, 2010 Jan Krakora, WAGO Kontakttechnik GmbH & Co. KG (http://www.wago.com)
+ * @copyright  Copyright (c) 2004, 2012 Jan Krakora
 * @license PhpModbus license 
 * @category Phpmodbus
 * @tutorial Phpmodbus.pkg 
@@ -15,776 +15,36 @@
 *  
 */

-require_once dirname(__FILE__) . '/IecType.php';
-require_once dirname(__FILE__) . '/PhpType.php'; 
+require_once dirname(__FILE__) . '/ModbusMaster.php'; 

 /**
 * ModbusMasterUdp
 *
 * This class deals with the MODBUS master using UDP stack.
 *  
- * Implemented MODBUS functions:
+ * Implemented MODBUS master functions:
+ *   - FC  1: read coils
 *   - FC  3: read multiple registers
+ *   - FC 15: write multiple coils 
 *   - FC 16: write multiple registers
 *   - FC 23: read write registers
 *   
 * @author Jan Krakora
- * @copyright  Copyright (c) 2004, 2010 Jan Krakora, WAGO Kontakttechnik GmbH & Co. KG (http://www.wago.com)
+ * @copyright  Copyright (c) 2004, 2012 Jan Krakora
 * @package Phpmodbus  
 *
 */
-class ModbusMasterUdp {
-  var $sock;
-  var $port = "502";
-  var $host = "192.168.1.1";
-  var $client = "";
-  var $client_port = "502";
-  var $status;
-  var $timeout_sec = 5; // 5 sec
-  var $endianess = 0; // defines endian codding (little endian == 0, big endian == 1) 
+class ModbusMasterUdp extends ModbusMaster {
  
  /**
-   * Modbus
+   * ModbusMasterUdp
   *
   * This is the constructor that defines {@link $host} IP address of the object. 
   *     
-   * @param String $host An IP address of a Modbus TCP device. E.g. "192.168.1.1".
+   * @param String $host An IP address of a Modbus UDP device. E.g. "192.168.1.1".
   */         
  function ModbusMasterUdp($host){
    $this->host = $host;
-  }
-
-  /**
-   * __toString
-   *
-   * Magic method
-   */
-  function  __toString() {
-      return "<pre>" . $this->status . "</pre>";
-  }
-
-  /**
-   * connect
-   *
-   * Connect the socket
-   *
-   * @return bool
-   */
-  private function connect(){
-    // UDP socket
-    $this->sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    // Bind the client socket to a specific local port
-    if (strlen($this->client)>0){
-        $result = socket_bind($this->sock, $this->client, $this->client_port);
-        if ($result === false) {
-            throw new Exception("socket_bind() failed.</br>Reason: ($result)".
-                socket_strerror(socket_last_error($this->sock)));
-        } else {
-            $this->status .= "Bound\n";
-        }
-    }
-    // connect
-    $result = @socket_connect($this->sock, $this->host, $this->port);
-    if ($result === false) {
-        throw new Exception("socket_connect() failed.</br>Reason: ($result)".
-            socket_strerror(socket_last_error($this->sock)));
-    } else {
-        $this->status .= "Connected\n";
-        return true;        
-    }    
-  }
-
-  /**
-   * disconnect
-   *
-   * Disconnect the socket
-   */
-  private function disconnect(){    
-    socket_close($this->sock);
-    $this->status .= "Disconnected\n";
-  }
-
-  /**
-   * send
-   *
-   * Send the packet via Modbus
-   *
-   * @param string $packet
-   */
-  private function send($packet){
-    socket_write($this->sock, $packet, strlen($packet));  
-    $this->status .= "Send\n";
-  }
-
-  /**
-   * rec
-   *
-   * Receive data from the socket
-   *
-   * @return bool
-   */
-  private function rec(){
-    socket_set_nonblock($this->sock);
-    $readsocks[] = $this->sock;     
-    $writesocks = NULL;
-    $exceptsocks = NULL;
-    $rec = "";
-    $lastAccess = time();
-    while (socket_select($readsocks, 
-            $writesocks, 
-            $exceptsocks,
-            0, 
-            300000) !== FALSE) {
-            $this->status .= "Wait data ... \n";
-        if (in_array($this->sock, $readsocks)) {
-            while (@socket_recv($this->sock, $rec, 2000, 0)) {
-                $this->status .= "Data received\n";
-                return $rec;
-            }
-            $lastAccess = time();
-        } else {             
-            if (time()-$lastAccess >= $this->timeout_sec) {
-                throw new Exception( "Watchdog time expired [ " .
-                  $this->timeout_sec . " sec]!!! Connection to " . 
-                  $this->host . " is not established.");
-            }
-        }
-        $readsocks[] = $this->sock;
-    }
-  } 
-  
-  /**
-   * responseCode
-   *
-   * Check the Modbus response code
-   *
-   * @param string $packet
-   * @return bool
-   */
-  private function responseCode($packet){    
-    if(($packet[7] & 0x80) > 0) {
-      throw new Exception("Modbus response error code:" . ord($packet[8]));
-    } else {
-      $this->status .= "Modbus response error code: NOERROR\n";
-      return true;
-    }    
-  }
-  
-  /**
-   * readCoils
-   * 
-   * Modbus function FC 1(0x01) - Read Coils
-   * 
-   * Reads {@link $quantity} of Coils (boolean) from reference 
-   * {@link $referenceRead} of a memory of a Modbus device given by 
-   * {@link $unitId}.
-   * 
-   * @param type $unitId
-   * @param type $reference
-   * @param type $quantity 
-   */
-  function readCoils($unitId, $reference, $quantity){
-    $this->status .= "readCoils: START\n";
-    // connect
-    $this->connect();
-    // send FC 3    
-    $packet = $this->readCoilsPacketBuilder($unitId, $reference, $quantity);
-    $this->status .= $this->printPacket($packet);    
-    $this->send($packet);
-    // receive response
-    $rpacket = $this->rec();
-    $this->status .= $this->printPacket($rpacket);    
-    // parse packet    
-    $receivedData = $this->readCoilsParser($rpacket, $quantity);
-    // disconnect
-    $this->disconnect();
-    $this->status .= "readCoils: DONE\n";
-    // return
-    return $receivedData;
-  }
-  
-  /**
-   * fc1
-   * 
-   * Alias to {@link readMultipleCoils} method
-   * 
-   * @param type $unitId
-   * @param type $reference
-   * @param type $quantity
-   * @return type 
-   */
-  function fc1($unitId, $reference, $quantity){
-    return $this->readCoils($unitId, $reference, $quantity);
-  }
-  
-  /**
-   * readCoilsPacketBuilder
-   * 
-   * FC1 packet builder - read coils
-   * 
-   * @param type $unitId
-   * @param type $reference
-   * @param type $quantity
-   * @return type 
-   */
-  private function readCoilsPacketBuilder($unitId, $reference, $quantity){
-    $dataLen = 0;
-    // build data section
-    $buffer1 = "";
-    // build body
-    $buffer2 = "";
-    $buffer2 .= iecType::iecBYTE(1);              // FC 1 = 1(0x01)
-    // build body - read section    
-    $buffer2 .= iecType::iecINT($reference);      // refnumber = 12288      
-    $buffer2 .= iecType::iecINT($quantity);       // quantity
-    $dataLen += 5;
-    // build header
-    $buffer3 = '';
-    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID
-    $buffer3 .= iecType::iecINT(0);               // protocol ID
-    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght
-    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID
-    // return packet string
-    return $buffer3. $buffer2. $buffer1;
-  }
-  
-  /**
-   * readCoilsParser
-   * 
-   * FC 1 response parser
-   * 
-   * @param type $packet
-   * @param type $quantity
-   * @return type 
-   */
-  private function readCoilsParser($packet, $quantity){    
-    $data = array();
-    // check Response code
-    $this->responseCode($packet);
-    // get data from stream
-    for($i=0;$i<ord($packet[8]);$i++){
-      $data[$i] = ord($packet[9+$i]);
-    }    
-    // get bool values to array
-    $data_bolean_array = array();
-    $di = 0;
-    foreach($data as $value){
-      for($i=0;$i<8;$i++){
-        if($di > $quantity) continue;
-        // get boolean value 
-        $v = ($value >> $i) & 0x01;
-        // build boolean array
-        if($v == 0){
-          $data_bolean_array[] = FALSE;
-        } else {
-          $data_bolean_array[] = TRUE;
-        }
-        $di++;
-      }
-    }
-    return $data_bolean_array;
-  }
-  
-  /**
-   * readMultipleRegisters
-   *
-   * Modbus function FC 3(0x03) - Read Multiple Registers.
-   * 
-   * This function reads {@link $quantity} of Words (2 bytes) from reference 
-   * {@link $referenceRead} of a memory of a Modbus device given by 
-   * {@link $unitId}.
-   *    
-   *
-   * @param int $unitId usually ID of Modbus device 
-   * @param int $reference Reference in the device memory to read data (e.g. in device WAGO 750-841, memory MW0 starts at address 12288).
-   * @param int $quantity Amounth of the data to be read from device.
-   * @return false|Array Success flag or array of received data.
-   */
-  function readMultipleRegisters($unitId, $reference, $quantity){
-    $this->status .= "readMultipleRegisters: START\n";
-    // connect
-    $this->connect();
-    // send FC 3    
-    $packet = $this->readMultipleRegistersPacketBuilder($unitId, $reference, $quantity);
-    $this->status .= $this->printPacket($packet);    
-    $this->send($packet);
-    // receive response
-    $rpacket = $this->rec();
-    $this->status .= $this->printPacket($rpacket);    
-    // parse packet    
-    $receivedData = $this->readMultipleRegistersParser($rpacket);
-    // disconnect
-    $this->disconnect();
-    $this->status .= "readMultipleRegisters: DONE\n";
-    // return
-    return $receivedData;
-  }
-  
-  /**
-   * fc3
-   *
-   * Alias to {@link readMultipleRegisters} method.
-   *
-   * @param int $unitId
-   * @param int $reference
-   * @param int $quantity
-   * @return false|Array
-   */
-  function fc3($unitId, $reference, $quantity){
-    return $this->readMultipleRegisters($unitId, $reference, $quantity);
-  }  
-  
-  /**
-   * readMultipleRegistersPacketBuilder
-   *
-   * Packet FC 3 builder - read multiple registers
-   *
-   * @param int $unitId
-   * @param int $reference
-   * @param int $quantity
-   * @return string
-   */
-  private function readMultipleRegistersPacketBuilder($unitId, $reference, $quantity){
-    $dataLen = 0;
-    // build data section
-    $buffer1 = "";
-    // build body
-    $buffer2 = "";
-    $buffer2 .= iecType::iecBYTE(3);             // FC 3 = 3(0x03)
-    // build body - read section    
-    $buffer2 .= iecType::iecINT($reference);  // refnumber = 12288      
-    $buffer2 .= iecType::iecINT($quantity);       // quantity
-    $dataLen += 5;
-    // build header
-    $buffer3 = '';
-    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID
-    $buffer3 .= iecType::iecINT(0);               // protocol ID
-    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght
-    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID
-    // return packet string
-    return $buffer3. $buffer2. $buffer1;
-  }
-  
-  /**
-   * readMultipleRegistersParser
-   *
-   * FC 3 response parser
-   *
-   * @param string $packet
-   * @return array
-   */
-  private function readMultipleRegistersParser($packet){    
-    $data = array();
-    // check Response code
-    $this->responseCode($packet);
-    // get data
-    for($i=0;$i<ord($packet[8]);$i++){
-      $data[$i] = ord($packet[9+$i]);
-    }    
-    return $data;
-  }
-  
-  /**
-   * writeMultipleCoils
-   * 
-   * Modbus function FC15(0x0F) - Write Multiple Coils
-   *
-   * This function writes {@link $data} array at {@link $reference} position of 
-   * memory of a Modbus device given by {@link $unitId}. 
-   * 
-   * @param type $unitId
-   * @param type $reference
-   * @param type $data
-   * @return type 
-   */
-  function writeMultipleCoils($unitId, $reference, $data){
-    $this->status .= "writeMultipleCoils: START\n";
-    // connect
-    $this->connect();
-    // send FC16    
-    $packet = $this->writeMultipleCoilsPacketBuilder($unitId, $reference, $data);
-    $this->status .= $this->printPacket($packet);    
-    $this->send($packet);
-    // receive response
-    $rpacket = $this->rec();
-    $this->status .= $this->printPacket($rpacket);    
-    // parse packet
-    $this->writeMultipleCoilsParser($rpacket);
-    // disconnect
-    $this->disconnect();
-    $this->status .= "writeMultipleCoils: DONE\n";
-    return true;
-  }
-  
-  /**
-   * fc15
-   *
-   * Alias to {@link writeMultipleCoils} method
-   *
-   * @param int $unitId
-   * @param int $reference
-   * @param array $data
-   * @return bool
-   */
-  function fc15($unitId, $reference, $data){    
-    return $this->writeMultipleCoils($unitId, $reference, $data);
-  }
-  
-  /**
-   * writeMultipleCoilsPacketBuilder
-   *
-   * Packet builder FC15 - Write multiple coils
-   *
-   * @param int $unitId
-   * @param int $reference
-   * @param array $data
-   * @return string
-   */
-  private function writeMultipleCoilsPacketBuilder($unitId, $reference, $data){
-    $dataLen = 0;
-    $endianness = 0;    
-    // build bool stream to the WORD array
-    $data_word_stream = array();
-    $data_word = 0;
-    $shift = 0;    
-    for($i=0;$i<count($data);$i++) {
-      if((($i % 8) == 0) && ($i > 0)) {
-        $data_word_stream[] = $data_word;
-        $shift = 0;
-        $data_word = 0;
-        $data_word |= (0x01 && $data[$i]) << $shift;
-        $shift++;
-      }
-      else {
-        $data_word |= (0x01 && $data[$i]) << $shift;
-        $shift++;
-      }
-    }
-    $data_word_stream[] = $data_word;
-    // show binary stream to status string
-    foreach($data_word_stream as $d){
-        $this->status .= sprintf("byte=b%08b\n", $d);
-    }    
-    // build data section
-    $buffer1 = "";
-    foreach($data_word_stream as $key=>$dataitem) {
-        $buffer1 .= iecType::iecBYTE($dataitem);   // register values x
-        $dataLen += 1;
-    }
-    // build body
-    $buffer2 = "";
-    $buffer2 .= iecType::iecBYTE(15);             // FC 15 = 15(0x0f)
-    $buffer2 .= iecType::iecINT($reference);      // refnumber = 12288      
-    $buffer2 .= iecType::iecINT(count($data));      // bit count      
-    $buffer2 .= iecType::iecBYTE((count($data)+7)/8);       // byte count
-    $dataLen += 6;
-    // build header
-    $buffer3 = '';
-    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID    
-    $buffer3 .= iecType::iecINT(0);               // protocol ID    
-    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght    
-    $buffer3 .= iecType::iecBYTE($unitId);        // unit ID    
-     
-    // return packet string
-    return $buffer3. $buffer2. $buffer1;
-  }
-  
-  /**
-   * writeMultipleCoilsParser
-   *
-   * FC15 response parser
-   *
-   * @param string $packet
-   * @return bool
-   */
-  private function writeMultipleCoilsParser($packet){
-    $this->responseCode($packet);
-    return true;
-  }
-  
-  /**
-   * writeMultipleRegister
-   *
-   * Modbus function FC16(0x10) - Write Multiple Register.
-   *
-   * This function writes {@link $data} array at {@link $reference} position of 
-   * memory of a Modbus device given by {@link $unitId}.
-   *
-   *
-   * @param int $unitId usually ID of Modbus device 
-   * @param int $reference Reference in the device memory (e.g. in device WAGO 750-841, memory MW0 starts at address 12288)
-   * @param array $data Array of values to be written.
-   * @param array $dataTypes Array of types of values to be written. The array should consists of string "INT", "DINT" and "REAL".    
-   * @return bool Success flag
-   */       
-  function writeMultipleRegister($unitId, $reference, $data, $dataTypes){
-    $this->status .= "writeMultipleRegister: START\n";
-    // connect
-    $this->connect();
-    // send FC16    
-    $packet = $this->writeMultipleRegisterPacketBuilder($unitId, $reference, $data, $dataTypes);
-    $this->status .= $this->printPacket($packet);    
-    $this->send($packet);
-    // receive response
-    $rpacket = $this->rec();
-    $this->status .= $this->printPacket($rpacket);    
-    // parse packet
-    $this->writeMultipleRegisterParser($rpacket);
-    // disconnect
-    $this->disconnect();
-    $this->status .= "writeMultipleRegister: DONE\n";
-    return true;
-  }
-
-
-  /**
-   * fc16
-   *
-   * Alias to {@link writeMultipleRegister} method
-   *
-   * @param int $unitId
-   * @param int $reference
-   * @param array $data
-   * @param array $dataTypes
-   * @return bool
-   */
-  function fc16($unitId, $reference, $data, $dataTypes){    
-    return $this->writeMultipleRegister($unitId, $reference, $data, $dataTypes);
-  }
-
-
-  /**
-   * writeMultipleRegisterPacketBuilder
-   *
-   * Packet builder FC16 - WRITE multiple register
-   *     e.g.: 4dd90000000d0010300000030603e807d00bb8
-   *
-   * @param int $unitId
-   * @param int $reference
-   * @param array $data
-   * @param array $dataTypes
-   * @return string
-   */
-  private function writeMultipleRegisterPacketBuilder($unitId, $reference, $data, $dataTypes){
-    $dataLen = 0;
-    $endianness = 0;
-    // build data section
-    $buffer1 = "";
-    foreach($data as $key=>$dataitem) {
-      if($dataTypes[$key]=="INT"){
-        $buffer1 .= iecType::iecINT($dataitem);   // register values x
-        $dataLen += 2;
-      }
-      elseif($dataTypes[$key]=="DINT"){
-        $buffer1 .= iecType::iecDINT($dataitem, $endianness);   // register values x
-        $dataLen += 4;
-      }
-      elseif($dataTypes[$key]=="REAL") {
-        $buffer1 .= iecType::iecREAL($dataitem, $endianness);   // register values x
-        $dataLen += 4;
-      }       
-      else{
-        $buffer1 .= iecType::iecINT($dataitem);   // register values x
-        $dataLen += 2;
-      }
-    }
-    // build body
-    $buffer2 = "";
-    $buffer2 .= iecType::iecBYTE(16);             // FC 16 = 16(0x10)
-    $buffer2 .= iecType::iecINT($reference);      // refnumber = 12288      
-    $buffer2 .= iecType::iecINT($dataLen/2);        // word count      
-    $buffer2 .= iecType::iecBYTE($dataLen);     // byte count
-    $dataLen += 6;
-    // build header
-    $buffer3 = '';
-    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID    
-    $buffer3 .= iecType::iecINT(0);               // protocol ID    
-    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght    
-    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID    
-    
-    // return packet string
-    return $buffer3. $buffer2. $buffer1;
-  }
-  
-  /**
-   * writeMultipleRegisterParser
-   *
-   * FC16 response parser
-   *
-   * @param string $packet
-   * @return bool
-   */
-  private function writeMultipleRegisterParser($packet){
-    $this->responseCode($packet);
-    return true;
-  }
-  
-  /**
-   * readWriteRegisters
-   *
-   * Modbus function FC23(0x17) - Read Write Registers.
-   * 
-   * This function writes {@link $data} array at reference {@link $referenceWrite} 
-   * position of memory of a Modbus device given by {@link $unitId}. Simultanously, 
-   * it returns {@link $quantity} of Words (2 bytes) from reference {@link $referenceRead}.
-   *
-   *
-   * @param int $unitId usually ID of Modbus device 
-   * @param int $referenceRead Reference in the device memory to read data (e.g. in device WAGO 750-841, memory MW0 starts at address 12288).
-   * @param int $quantity Amounth of the data to be read from device.   
-   * @param int $referenceWrite Reference in the device memory to write data.
-   * @param array $data Array of values to be written.
-   * @param array $dataTypes Array of types of values to be written. The array should consists of string "INT", "DINT" and "REAL".   
-   * @return false|Array Success flag or array of data.
-   */
-  function readWriteRegisters($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes){
-    $this->status .= "readWriteRegisters: START\n";
-    // connect
-    $this->connect();
-    // send FC23    
-    $packet = $this->readWriteRegistersPacketBuilder($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes);
-    $this->status .= $this->printPacket($packet);    
-    $this->send($packet);
-    // receive response
-    $rpacket = $this->rec();
-    $this->status .= $this->printPacket($rpacket);
-    // parse packet
-    $receivedData = $this->readWriteRegistersParser($rpacket);
-    // disconnect
-    $this->disconnect();
-    $this->status .= "writeMultipleRegister: DONE\n";
-    // return
-    return $receivedData;
-  }
-  
-  /**
-   * fc23
-   *
-   * Alias to {@link readWriteRegisters} method.
-   *
-   * @param int $unitId
-   * @param int $referenceRead
-   * @param int $quantity
-   * @param int $referenceWrite
-   * @param array $data
-   * @param array $dataTypes
-   * @return false|Array
-   */
-  function fc23($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes){
-    return $this->readWriteRegisters($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes);
-  }
-  
-  /**
-   * readWriteRegistersPacketBuilder
-   *
-   * Packet FC23 builder - READ WRITE registers
-   *
-   *
-   * @param int $unitId
-   * @param int $referenceRead
-   * @param int $quantity
-   * @param int $referenceWrite
-   * @param array $data
-   * @param array $dataTypes
-   * @return string
-   */
-  private function readWriteRegistersPacketBuilder($unitId, $referenceRead, $quantity, $referenceWrite, $data, $dataTypes){
-    $dataLen = 0;
-    $endianness = 0;
-    // build data section
-    $buffer1 = "";
-    foreach($data as $key => $dataitem) {
-      if($dataTypes[$key]=="INT"){
-        $buffer1 .= iecType::iecINT($dataitem);   // register values x
-        $dataLen += 2;
-      }
-      elseif($dataTypes[$key]=="DINT"){
-        $buffer1 .= iecType::iecDINT($dataitem, $endianness);   // register values x
-        $dataLen += 4;
-      }
-      elseif($dataTypes[$key]=="REAL") {
-        $buffer1 .= iecType::iecREAL($dataitem, $endianness);   // register values x
-        $dataLen += 4;
-      }       
-      else{
-        $buffer1 .= iecType::iecINT($dataitem);   // register values x
-        $dataLen += 2;
-      }
-    }
-    // build body
-    $buffer2 = "";
-    $buffer2 .= iecType::iecBYTE(23);             // FC 23 = 23(0x17)
-    // build body - read section    
-    $buffer2 .= iecType::iecINT($referenceRead);  // refnumber = 12288      
-    $buffer2 .= iecType::iecINT($quantity);       // quantity
-    // build body - write section    
-    $buffer2 .= iecType::iecINT($referenceWrite); // refnumber = 12288      
-    $buffer2 .= iecType::iecINT($dataLen/2);      // word count      
-    $buffer2 .= iecType::iecBYTE($dataLen);       // byte count
-    $dataLen += 10;
-    // build header
-    $buffer3 = '';
-    $buffer3 .= iecType::iecINT(rand(0,65000));   // transaction ID    
-    $buffer3 .= iecType::iecINT(0);               // protocol ID    
-    $buffer3 .= iecType::iecINT($dataLen + 1);    // lenght    
-    $buffer3 .= iecType::iecBYTE($unitId);        //unit ID    
-    
-    // return packet string
-    return $buffer3. $buffer2. $buffer1;
-  }
-  
-
-  /**
-   * readWriteRegistersParser
-   *
-   * FC23 response parser
-   *
-   * @param string $packet
-   * @return array
-   */
-  private function readWriteRegistersParser($packet){
-    $data = array();
-    // if not exception
-    if(!$this->responseCode($packet))
-      return false;
-    // get data
-    for($i=0;$i<ord($packet[8]);$i++){
-      $data[$i] = ord($packet[9+$i]);
-    }    
-    return $data;
-  }
-
-  /**
-   * byte2hex
-   *
-   * Parse data and get it to the Hex form
-   *
-   * @param char $value
-   * @return string
-   */
-  private function byte2hex($value){
-    $h = dechex(($value >> 4) & 0x0F);
-    $l = dechex($value & 0x0F);
-    return "$h$l";
-  }
-
-  /**
-   * printPacket
-   *
-   * Print a packet in the hex form
-   *
-   * @param string $packet
-   * @return string
-   */
-  private function printPacket($packet){
-    $str = "";   
-    $str .= "Packet: "; 
-    for($i=0;$i<strlen($packet);$i++){
-      $str .= $this->byte2hex(ord($packet[$i]));
-    }
-    $str .= "\n";
-    return $str;
+    $this->socket_protocol = "UDP";    
  }
 }
-
-?>
@@ -1,10 +1,10 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
 $ip = "192.192.15.51";
-$modbus = new ModbusMasterUdp($ip);
+$modbus = new ModbusMaster($ip, "UDP");

 try {
    // FC 3
@@ -1,9 +1,9 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp("192.192.15.51");
+$modbus = new ModbusMaster("192.192.15.51", "UDP");

 try {
    // FC 3
@@ -1,9 +1,9 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp("192.192.15.51");
+$modbus = new ModbusMaster("192.192.15.51", "UDP");

 try {
    // FC 1
@@ -1,9 +1,9 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp("192.192.15.51");
+$modbus = new ModbusMaster("192.192.15.51", "UDP");

 // Data to be writen
 $data = array(TRUE, FALSE, TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 
@@ -1,9 +1,9 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp("192.192.15.51");
+$modbus = new ModbusMaster("192.192.15.51", "UDP");

 // Data to be writen
 $data = array(10, -1000, 2000, 3.0);
@@ -1,9 +1,9 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp("192.192.15.51");
+$modbus = new ModbusMaster("192.192.15.51", "UDP");

 // Data to be writen
 $data = array(10, -1000, 2000, 3.0);
@@ -1,9 +1,9 @@
 <?php

-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp("192.192.15.51");
+$modbus = new ModbusMaster("192.192.15.51", "UDP");

 try {
    // FC 3
@@ -1,19 +0,0 @@
-Copyright (c) 2004, 2009 Jan Krakora, Wago (http://www.wago.com)
-All rights reserved.
-
-Phpmodbus library
-####################
-
-Phpmodbus for PHP is a small and easy-to-use Modbus UDP master library. For more
-see project at http://phpmodbus.googlecode.com
-
-Release notes
-===============
-
-0.1 -> 0.2.r20
---------------
-+ Added new class for conversion from received bytes to PHP data types (PhpType class)
-+ Added new data conversion using PhpType example
-+ Added new alias methods fc3, fc16 and fc23 (ModbusMasterUdp class)
-* Fixed problems with the endianess when data written (IecType class)
-* Improved commentaries for documentation
@@ -0,0 +1,11 @@
+@echo off
+call ../config.bat
+
+for %%f in (test.*.php) do %php% -q "%%f" > "output/%%f.html"
+
+cd output
+for %%f in (*.html) do %diff% "%%f" ../ref/"%%f"
+cd ..
+pause
+
+@echo on
@@ -0,0 +1,72 @@
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 1
+    [4] => 0
+    [5] => 1
+    [6] => 0
+    [7] => 255
+    [8] => 0
+    [9] => 255
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 1
+    [4] => 255
+    [5] => 255
+    [6] => 127
+    [7] => 255
+    [8] => 128
+    [9] => 0
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 0
+    [4] => 0
+    [5] => 1
+    [6] => 0
+    [7] => 0
+    [8] => 255
+    [9] => 255
+    [10] => 255
+    [11] => 255
+    [12] => 255
+    [13] => 255
+    [14] => 127
+    [15] => 255
+    [16] => 0
+    [17] => 0
+    [18] => 128
+    [19] => 0
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 0
+    [4] => 0
+    [5] => 0
+    [6] => 63
+    [7] => 128
+    [8] => 0
+    [9] => 0
+    [10] => 192
+    [11] => 0
+    [12] => 170
+    [13] => 171
+    [14] => 62
+    [15] => 170
+    [16] => 0
+    [17] => 0
+    [18] => 65
+    [19] => 200
+)
@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE
@@ -0,0 +1,7 @@
+
+Fatal error: Uncaught exception 'Exception' with message 'Unknown socket protocol, should be 'TCP' or 'UDP'' in D:\Projects\20081010_phpmodbus\src\trunk\Phpmodbus\ModbusMaster.php:87
+Stack trace:
+#0 D:\Projects\20081010_phpmodbus\src\trunk\Phpmodbus\ModbusMaster.php(654): ModbusMaster->connect()
+#1 D:\Projects\20081010_phpmodbus\src\trunk\tests\ModbusMaster\test.tcp.socket_protocol_mismatch.php(13): ModbusMaster->readWriteRegisters(0, 12288, 6, 12288, Array, Array)
+#2 {main}
+  thrown in D:\Projects\20081010_phpmodbus\src\trunk\Phpmodbus\ModbusMaster.php on line 87
@@ -0,0 +1,72 @@
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 1
+    [4] => 0
+    [5] => 1
+    [6] => 0
+    [7] => 255
+    [8] => 0
+    [9] => 255
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 1
+    [4] => 255
+    [5] => 255
+    [6] => 127
+    [7] => 255
+    [8] => 128
+    [9] => 0
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 0
+    [4] => 0
+    [5] => 1
+    [6] => 0
+    [7] => 0
+    [8] => 255
+    [9] => 255
+    [10] => 255
+    [11] => 255
+    [12] => 255
+    [13] => 255
+    [14] => 127
+    [15] => 255
+    [16] => 0
+    [17] => 0
+    [18] => 128
+    [19] => 0
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 0
+    [4] => 0
+    [5] => 0
+    [6] => 63
+    [7] => 128
+    [8] => 0
+    [9] => 0
+    [10] => 192
+    [11] => 0
+    [12] => 170
+    [13] => 171
+    [14] => 62
+    [15] => 170
+    [16] => 0
+    [17] => 0
+    [18] => 65
+    [19] => 200
+)
@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE
@@ -0,0 +1,44 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMaster.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster($test_host_ip, "TCP");
+
+// Data to be writen - BYTE
+$data = array(0, 1, 1, pow(2,8)-1, pow(2,8)-1);
+$dataTypes = array("BYTE", "BYTE", "BYTE", "BYTE", "BYTE");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 5);
+print_r($recData);
+
+// Data to be writen - INT
+$data = array(0, 1, -1, pow(2,15)-1, -pow(2,15));
+$dataTypes = array("INT", "INT", "INT", "INT", "INT");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 5);
+print_r($recData);
+
+// Data to be writen - DINT
+$data = array(0, 1, -1, pow(2,31)-1, -pow(2,31));
+$dataTypes = array("DINT", "DINT", "DINT", "DINT", "DINT");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 10);
+print_r($recData);
+
+// Data to be writen - REAL
+$data = array(0, 1, -2, 1/3, 25);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL", "REAL");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 10);
+print_r($recData);
+
+?>
@@ -0,0 +1,24 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMaster.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster($test_host_ip, "TCP");
+
+// Data to be writen
+$data = array(1000, 2000, 1.250, 1.250);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL");
+
+// FC23
+$recData = $modbus->readWriteRegisters(0, 12288, 6, 12288, $data, $dataTypes);
+
+if(!$recData) {
+  // Print error information if any
+  echo "</br>Error:</br>" . $modbus->errstr . "</br>";
+  //
+  exit();
+}
+
+// Print status information
+echo "writeMultipleRegister (FC26): DONE";
+?>
@@ -0,0 +1,18 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMaster.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster($test_host_ip, "Mismatch");
+
+// Data to be writen
+$data = array(1000, 2000, 1.250, 1.250);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL");
+
+// FC23
+$recData = $modbus->readWriteRegisters(0, 12288, 6, 12288, $data, $dataTypes);
+
+// Should through an Exception
+
+// Print status information
+echo "Something wrong!";
@@ -0,0 +1,44 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMaster.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster($test_host_ip, "UDP");
+
+// Data to be writen - BYTE
+$data = array(0, 1, 1, pow(2,8)-1, pow(2,8)-1);
+$dataTypes = array("BYTE", "BYTE", "BYTE", "BYTE", "BYTE");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 5);
+print_r($recData);
+
+// Data to be writen - INT
+$data = array(0, 1, -1, pow(2,15)-1, -pow(2,15));
+$dataTypes = array("INT", "INT", "INT", "INT", "INT");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 5);
+print_r($recData);
+
+// Data to be writen - DINT
+$data = array(0, 1, -1, pow(2,31)-1, -pow(2,31));
+$dataTypes = array("DINT", "DINT", "DINT", "DINT", "DINT");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 10);
+print_r($recData);
+
+// Data to be writen - REAL
+$data = array(0, 1, -2, 1/3, 25);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL", "REAL");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 10);
+print_r($recData);
+
+?>
@@ -0,0 +1,24 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMaster.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster($test_host_ip, "UDP");
+
+// Data to be writen
+$data = array(1000, 2000, 1.250, 1.250);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL");
+
+// FC23
+$recData = $modbus->readWriteRegisters(0, 12288, 6, 12288, $data, $dataTypes);
+
+if(!$recData) {
+  // Print error information if any
+  echo "</br>Error:</br>" . $modbus->errstr . "</br>";
+  //
+  exit();
+}
+
+// Print status information
+echo "writeMultipleRegister (FC26): DONE";
+?>
@@ -0,0 +1,11 @@
+@echo off
+call ../config.bat
+
+for %%f in (test.*.php) do %php% -q "%%f" > "output/%%f.html"
+
+cd output
+for %%f in (*.html) do %diff% "%%f" ../ref/"%%f"
+cd ..
+pause
+
+@echo on
@@ -0,0 +1,72 @@
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 1
+    [4] => 0
+    [5] => 1
+    [6] => 0
+    [7] => 255
+    [8] => 0
+    [9] => 255
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 1
+    [4] => 255
+    [5] => 255
+    [6] => 127
+    [7] => 255
+    [8] => 128
+    [9] => 0
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 0
+    [4] => 0
+    [5] => 1
+    [6] => 0
+    [7] => 0
+    [8] => 255
+    [9] => 255
+    [10] => 255
+    [11] => 255
+    [12] => 255
+    [13] => 255
+    [14] => 127
+    [15] => 255
+    [16] => 0
+    [17] => 0
+    [18] => 128
+    [19] => 0
+)
+Array
+(
+    [0] => 0
+    [1] => 0
+    [2] => 0
+    [3] => 0
+    [4] => 0
+    [5] => 0
+    [6] => 63
+    [7] => 128
+    [8] => 0
+    [9] => 0
+    [10] => 192
+    [11] => 0
+    [12] => 170
+    [13] => 171
+    [14] => 62
+    [15] => 170
+    [16] => 0
+    [17] => 0
+    [18] => 65
+    [19] => 200
+)
@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE
@@ -0,0 +1,44 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterTcp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterTcp($test_host_ip);
+
+// Data to be writen - BYTE
+$data = array(0, 1, 1, pow(2,8)-1, pow(2,8)-1);
+$dataTypes = array("BYTE", "BYTE", "BYTE", "BYTE", "BYTE");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 5);
+print_r($recData);
+
+// Data to be writen - INT
+$data = array(0, 1, -1, pow(2,15)-1, -pow(2,15));
+$dataTypes = array("INT", "INT", "INT", "INT", "INT");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 5);
+print_r($recData);
+
+// Data to be writen - DINT
+$data = array(0, 1, -1, pow(2,31)-1, -pow(2,31));
+$dataTypes = array("DINT", "DINT", "DINT", "DINT", "DINT");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 10);
+print_r($recData);
+
+// Data to be writen - REAL
+$data = array(0, 1, -2, 1/3, 25);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL", "REAL");
+// Write data - FC 16
+$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 10);
+print_r($recData);
+
+?>
@@ -0,0 +1,24 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterTcp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterTcp($test_host_ip);
+
+// Data to be writen
+$data = array(1000, 2000, 1.250, 1.250);
+$dataTypes = array("REAL", "REAL", "REAL", "REAL");
+
+// FC23
+$recData = $modbus->readWriteRegisters(0, 12288, 6, 12288, $data, $dataTypes);
+
+if(!$recData) {
+  // Print error information if any
+  echo "</br>Error:</br>" . $modbus->errstr . "</br>";
+  //
+  exit();
+}
+
+// Print status information
+echo "writeMultipleRegister (FC26): DONE";
+?>
@@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
 require_once dirname(__FILE__) . '/../config.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp($testip);
+$modbus = new ModbusMasterUdp($test_host_ip);

 // Data to be writen - BOOL array
 $data = array(1, 0, TRUE, TRUE, 0, 1, TRUE, TRUE, 
@@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
 require_once dirname(__FILE__) . '/../config.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp($testip);
+$modbus = new ModbusMasterUdp($test_host_ip);

 // Data to be writen - BYTE
 $data = array(0, 1, 1, pow(2,8)-1, pow(2,8)-1);
@@ -3,8 +3,8 @@ require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
 require_once dirname(__FILE__) . '/../config.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp($testip);
-$modbus->client = "192.192.15.133";
+$modbus = new ModbusMasterUdp($test_host_ip);
+$modbus->client = $test_bind_client_ip;

 // Data to be writen - BYTE
 $data = array(0, 1, 1, pow(2,8)-1, pow(2,8)-1);
@@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
 require_once dirname(__FILE__) . '/../config.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp($testip);
+$modbus = new ModbusMasterUdp($test_host_ip);

 // Data to be writen
 $data = array(1000, 2000, 1.250, 1.250);
@@ -3,8 +3,8 @@ require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
 require_once dirname(__FILE__) . '/../config.php';

 // Create Modbus object
-$modbus = new ModbusMasterUdp($testip);
-$modbus->client = "192.192.15.133";
+$modbus = new ModbusMasterUdp($test_host_ip);
+$modbus->client = $test_bind_client_ip;

 // Data to be writen
 $data = array(1000, 2000, 1.250, 1.250);
@@ -1,3 +1,4 @@
 <?php
-  $testip = "192.192.15.51";  
+  $test_host_ip = "192.192.15.51";  
+  $test_bind_client_ip = "192.192.15.113";
 ?>
@@ -7,7 +7,7 @@
  <author>
   Jan Krakora
   <authorblurb>
-    {@link mailto:jak.krakora@wago.com email}
+    {@link mailto:krakora.jan@googlemail.com email}
   </authorblurb>
  </author>
 </refsynopsisdiv>
@@ -16,7 +16,7 @@
  <title>Introduction</title>
  <para>
   Phpmodbus is a PHP library for the Modbus protocol. The library implements
-   Modbus UDP master class with subset of the most used Modbus commands.
+   Modbus TCP/UDP master class with subset of the most used Modbus commands.
  </para>
  <para>
   The library implements:
@@ -36,8 +36,8 @@
   Developed with support of <graphic fileref="wago_logo.png"/> {@link http://www.wago.com}.
  </note>
 </refsect1>
- <refsect1 id="{@id intro}">
-  <title>Installation</title>
+ <refsect1 id="{@id install}">
+  <title>Install</title>
  <para>
   At the first, it is supposed an PHP solution has been already installed on
   your server (LAMP, WAMP, MSS+CGI etc.).
@@ -48,14 +48,20 @@
  <para>
   Create a PHP script and assign the library using require_once() command
     <programlisting role="c">
-      <![CDATA[require_once dirname(__FILE__) . '/Phpmodbus/ModbusMasterUdp.php'; ]]>
-     </programlisting>
+      <![CDATA[require_once dirname(__FILE__) . '/Phpmodbus/ModbusMaster.php'; ]]>
+     </programlisting>     
  </para>
  <para>
-    To create the Modbus master object communicating to the 192.168.1.1 modbus slave 
-    at IP address 192.168.1.1 write
+    To create UDP Modbus master object communicating to an modbus slave 
+    e.g. at IP address 192.168.1.1 write
    <programlisting role="c" linenumbering="numbered" startinglinenumber="2">
-      <![CDATA[ $modbus = new ModbusMasterUdp("192.168.1.1"); ]]>
+      <![CDATA[ $modbus = new ModbusMaster("192.168.1.1", "UDP"); ]]>
+    </programlisting>
+  </para>
+  <para>
+    To create TCP Modbus master use
+    <programlisting role="c" linenumbering="numbered" startinglinenumber="2">
+      <![CDATA[ $modbus = new ModbusMaster("192.168.1.1", "TCP"); ]]>
    </programlisting>
  </para>
  <para>
@@ -83,7 +89,7 @@ catch (Exception $e) {
  <para>
  For other examples see sections bellow.
  </para>
- </refsect1>
+ </refsect1>  
 <refsect1 id="{@id examples}">
  <title>Examples</title>
  <para>
@@ -153,4 +159,15 @@ catch (Exception $e) {
    </para>
  </refsect2>
 </refsect1> 
+ <refsect1 id="{@id back_comp}">
+  <title>Back compatibility</title>
+  <para>
+   This version is back compatible to the last versions. Just use  
+   <programlisting role="c">
+      <![CDATA[require_once dirname(__FILE__) . '/Phpmodbus/ModbusMasterUdp.php';
+$modbus = new ModbusMasterUdp("192.168.1.1"); 
+// ... ]]>
+     </programlisting>
+  </para>
+ </refsect1>
 </refentry>
Author	SHA1	Message	Date
John Long	c5c65f8088	0.5 Release --HG-- rename : tests/ModbusMasterUdp/output/test.fc16fc3.php.html => tests/ModbusMaster/ref/test.tcp.fc16fc3.php.html rename : tests/ModbusMasterUdp/output/test.fc26.php.html => tests/ModbusMaster/ref/test.tcp.fc26.php.html rename : tests/ModbusMasterUdp/output/test.fc16fc3.php.html => tests/ModbusMaster/ref/test.udp.fc16fc3.php.html rename : tests/ModbusMasterUdp/output/test.fc26.php.html => tests/ModbusMaster/ref/test.udp.fc26.php.html rename : tests/ModbusMasterUdp/output/test.fc16fc3.php.html => tests/ModbusMasterTcp/ref/test.fc16fc3.php.html rename : tests/ModbusMasterUdp/output/test.fc26.php.html => tests/ModbusMasterTcp/ref/test.fc26.php.html	2013-06-14 07:42:17 -05:00
John Long	6c999a7450	Added tag 0.4.1 for changeset 1e09b0da7d8c	2013-06-14 07:40:52 -05:00
John Long	82c6fcf1d1	0.4.1	2013-06-14 07:40:48 -05:00
John Long	94772fcd7c	Added tag 0.4 for changeset bdf8b3f414c4	2013-06-14 07:39:18 -05:00