0.8 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

.hgtags

@@ -1 +1,7 @@
 a88b5a87fb4cd49f16ce72062cce19d55f1fbf98 0.2
+a7f90c18859d31922bdd8c61299e2790f5e2eb1a 0.3
+bdf8b3f414c4d08fc0edf9fd1953f55db26e4bac 0.4
+1e09b0da7d8c62a9a292ee51540feac9de4c1222 0.4.1
+e1262f028e180c2719564f840ffa1a9f8672b6be 0.5
+079f8ac1f49faf4e6bbb84d62c39eee1507805f2 0.6
+5885b1a0d0dc89577eeb871ee2c3fba8e70dd4fb 0.7

Phpmodbus/IecType.php

@@ -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, 2013 Jan Krakora
  *
  * This source file is subject to the "PhpModbus license" that is bundled
  * with this package in the file license.txt.
  *
  * @author Jan Krakora
- * @copyright Copyright (c) 2004, 2010 Jan Krakora, WAGO Kontakttechnik GmbH & Co. KG (http://www.wago.com)
+ * @copyright Copyright (c) 2004, 2013 Jan Krakora
  * @license PhpModbus license
  * @category Phpmodbus
  * @package Phpmodbus
@@ -20,7 +20,7 @@
  * data types to a IEC data type.
  *
  * @author Jan Krakora
- * @copyright  Copyright (c) 2004, 2010 Jan Krakora, WAGO Kontakttechnik GmbH & Co. KG (http://www.wago.com)
+ * @copyright  Copyright (c) 2004, 2010 Jan Krakora
  * @package Phpmodbus
  */
 class IecType {
@@ -34,7 +34,7 @@ class IecType {
      * @return value IEC BYTE data type
      *
      */
-    function iecBYTE($value) {
+    public static function iecBYTE($value) {
         return chr($value & 0xFF);
     }
 
@@ -47,7 +47,7 @@ class IecType {
      * @return value IEC-1131 INT data type
      *
      */
-    function iecINT($value) {
+    public static function iecINT($value) {
         return self::iecBYTE(($value >> 8) & 0x00FF) .
                 self::iecBYTE(($value & 0x00FF));
     }
@@ -62,7 +62,7 @@ class IecType {
      * @return value IEC-1131 INT data type
      *
      */
-    function iecDINT($value, $endianness = 0) {
+    public static function iecDINT($value, $endianness = 0) {
         // result with right endianness
         return self::endianness($value, $endianness);
     }
@@ -76,7 +76,7 @@ class IecType {
      * @param value endianness defines endian codding (little endian == 0, big endian == 1)
      * @return value IEC-1131 REAL data type
      */
-    function iecREAL($value, $endianness = 0) {
+    public static function iecREAL($value, $endianness = 0) {
         // iecREAL representation
         $real = self::float2iecReal($value);
         // result with right endianness
@@ -95,7 +95,7 @@ class IecType {
      * @param float value to be converted
      * @return value IEC REAL data type
      */
-    private function float2iecReal($value) {
+    private static function float2iecReal($value) {
         // get float binary string
         $float = pack("f", $value);
         // set 32-bit unsigned integer of the float
@@ -113,7 +113,7 @@ class IecType {
      * @param bool $endianness
      * @return int
      */
-    private function endianness($value, $endianness = 0) {
+    private static function endianness($value, $endianness = 0) {
         if ($endianness == 0)
             return
                     self::iecBYTE(($value >> 8) & 0x000000FF) .

Phpmodbus/ModbusMasterTcp.php

@@ -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";
+  }
+}

Phpmodbus/ModbusMasterUdp.php

@@ -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,529 +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 $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);    
-    // 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;
-    }    
-  }
-  
-  /**
-   * 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;
-  }
-  
-  /**
-   * 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, $endianess);   // register values x
-        $dataLen += 4;
-      }
-      elseif($dataTypes[$key]=="REAL") {
-        $buffer1 .= iecType::iecREAL($dataitem, $endianess);   // 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($rpacket);
-    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, $endianess);   // register values x
-        $dataLen += 4;
-      }
-      elseif($dataTypes[$key]=="REAL") {
-        $buffer1 .= iecType::iecREAL($dataitem, $endianess);   // 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";    
   }
 }
-
-?>

Phpmodbus/PhpType.php

@@ -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.
  *
  * @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
  * @license PhpModbus license
  * @category Phpmodbus
  * @package Phpmodbus
@@ -21,7 +21,7 @@
  * (array of bytes) to the PHP data type, i.e. signed int, unsigned int and float.
  *
  * @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
  *
  */

README.md

@@ -0,0 +1,44 @@
+phpmodbus
+=========
+This project deals with an implementation of the basic functionality of the Modbus TCP and UDP based protocol using PHP.
+It's a copy of the releases from the project page over at [Google Code](https://code.google.com/p/phpmodbus/) with
+composer support added.
+
+Features
+--------
+
+* Modbus master
+    * FC1 - Read coils
+    * FC2 - Read input discretes
+    * FC3 - Read holding registers
+    * FC4 - Read holding input registers
+    * FC5 - Write single coil
+    * FC6 - Write single register
+    * FC15 - Write multiple coils
+    * FC16 - Write multiple registers
+    * FC23 - Read/Write multiple registers
+
+Example
+-------
+
+```php
+ // Modbus master UDP
+ $modbus = new ModbusMaster("192.168.1.1", "UDP");
+ // Read multiple registers
+ try {
+     $recData = $modbus->readMultipleRegisters(0, 12288, 5);
+ }
+ catch (Exception $e) {
+     // Print error information if any
+     echo $modbus;
+     echo $e;
+     exit;
+ }
+ // Print data in string format
+ echo PhpType::bytes2string($recData);
+```
+
+For more see [documentation][] or [FAQ][].
+
+[documentation]: https://code.google.com/p/phpmodbus/downloads/list
+[FAQ]: https://code.google.com/p/phpmodbus/wiki/FAQ

examples/example_750841_Mmemory.php

@@ -1,11 +1,10 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
 
 // Create Modbus object
-// $ip = "192.168.1.1";
 $ip = "192.192.15.51";
-$modbus = new ModbusMasterUdp($ip);
+$modbus = new ModbusMaster($ip, "UDP");
 
 try {
     // FC 3
@@ -14,7 +13,6 @@ try {
     $mw0address = 12288;
     $quantity = 6;
     $recData = $modbus->readMultipleRegisters($moduleId, $reference, $quantity);
-    print_r($recData);
 }
 catch (Exception $e) {
     echo $modbus;

examples/example_datatype.php

@@ -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

examples/example_fc1.php

@@ -0,0 +1,25 @@
+<?php
+
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster("192.192.15.51", "UDP");
+
+try {
+    // FC 1
+    $recData = $modbus->readCoils(0, 12288, 12);
+}
+catch (Exception $e) {
+    // Print error information if any
+    echo $modbus;
+    echo $e;
+    exit;
+}
+
+// Print status information
+echo "</br>Status:</br>" . $modbus;
+
+// Print read data
+echo "</br>Data:</br>";
+var_dump($recData); 
+echo "</br>";

examples/example_fc15.php

@@ -0,0 +1,26 @@
+<?php
+
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster("192.192.15.51", "UDP");
+
+// Data to be writen
+$data = array(TRUE, FALSE, TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 
+              TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE,
+              FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE,
+              TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+
+try {
+    // FC15
+    $modbus->writeMultipleCoils(0, 12288, $data);
+}
+catch (Exception $e) {
+    // Print error information if any
+    echo $modbus;
+    echo $e;
+    exit;
+}
+
+// Print status information
+echo $modbus;

examples/example_fc16.php

@@ -1,13 +1,13 @@
 <?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(1000, 2000, 3.0);
-$dataTypes = array("INT", "DINT", "REAL");
+$data = array(10, -1000, 2000, 3.0);
+$dataTypes = array("WORD", "INT", "DINT", "REAL");
 
 try {
     // FC16

examples/example_fc2.php

@@ -0,0 +1,26 @@
+<?php
+
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster("192.192.15.51", "UDP");
+
+try {
+    // FC 2
+    // read 2 input bits from address 0x0 (Wago input image)
+    $recData = $modbus->readInputDiscretes(0, 0, 2);
+}
+catch (Exception $e) {
+    // Print error information if any
+    echo $modbus;
+    echo $e;
+    exit;
+}
+
+// Print status information
+echo "</br>Status:</br>" . $modbus;
+
+// Print read data
+echo "</br>Data:</br>";
+var_dump($recData); 
+echo "</br>";

examples/example_fc23.php

@@ -1,13 +1,13 @@
 <?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(1000, 2000, 3.0);
-$dataTypes = array("INT", "DINT", "REAL");
+$data = array(10, -1000, 2000, 3.0);
+$dataTypes = array("WORD", "INT", "DINT", "REAL");
 
 try {
     // FC23

examples/example_fc3.php

@@ -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

examples/example_fc4.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp("192.192.15.51");
+
+try {
+    // Read input discretes - FC 4
+    $recData = $modbus->readMultipleInputRegisters(0, 0, 2);
+}
+catch (Exception $e) {
+    // Print error information if any
+    echo $modbus;
+    echo $e;
+    exit;
+}
+
+var_dump($recData);

examples/example_fc5.php

@@ -0,0 +1,24 @@
+<?php
+
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp("192.192.15.51");
+
+// Data to be writen - TRUE, FALSE
+$data_true = array(TRUE);
+$data_false = array(FALSE);
+
+try {
+    // Write single coil - FC5
+    $modbus->writeSingleCoil(0, 12288, $data_true);
+    $modbus->writeSingleCoil(0, 12289, $data_false);
+    $modbus->writeSingleCoil(0, 12290, $data_true);
+    $modbus->writeSingleCoil(0, 12291, $data_false);
+}
+catch (Exception $e) {
+    // Print error information if any
+    echo $modbus;
+    echo $e;
+    exit;
+}

examples/example_fc6.php

@@ -0,0 +1,26 @@
+<?php
+
+require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+
+// Create Modbus object
+$modbus = new ModbusMaster("192.192.15.51", "UDP");
+
+// Data to be writen
+$data = array(-1000);
+$dataTypes = array("INT");
+
+try {
+    // FC6
+    $modbus->writeSingleRegister(0, 12288, $data, $dataTypes);
+}
+catch (Exception $e) {
+    // Print error information if any
+    echo $modbus;
+    echo $e;
+    exit;
+}
+
+// Print status information
+echo $modbus;
+
+?>

license.txt

@@ -1,10 +1,10 @@
 The Phpmodbus License, Version 1
 ============================
 
-Copyright (c) 2004, 2008 Jan Krakora, Wago (http://www.wago.com)
+Copyright (c) 2004, 2013 Jan Krakora
 All rights reserved.
 
-This license is a legal agreement between you and Jan Krakora, Wago (the "Author")
+This license is a legal agreement between you and Jan Krakora (the "Author")
 for the use of Phpmodbus (the "Software"). By obtaining, using and/or
 copying the Software, you agree that you have read, understood, and will
 comply with the terms and conditions of this license.

readme.txt

@@ -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

tests/Codesys/TEST.EXP

@@ -0,0 +1,256 @@
+
+
+(* @NESTEDCOMMENTS := 'Yes' *)
+(* @PATH := '' *)
+(* @OBJECTFLAGS := '0, 8' *)
+(* @SYMFILEFLAGS := '2048' *)
+PROGRAM PLC_PRG
+VAR
+	(* BOOL, COIL *)
+	COIL1 AT %MX0.0 : BOOL := 0;
+	COIL2 AT %MX0.1 : BOOL := 0;
+	COIL3 AT %MX0.2 : BOOL := 0;
+	COIL4 AT %MX0.3 : BOOL := 0;
+	COIL5 AT %MX0.4 : BOOL := 0;
+	COIL6 AT %MX0.5 : BOOL := 0;
+	COIL7 AT %MX0.6 : BOOL := 0;
+	COIL8 AT %MX0.7 : BOOL := 0;
+
+	(* BYTE *)
+	BYTE1 AT %MB0 : BYTE := 0;
+	BYTE2 AT %MB1 : BYTE := 0;
+	BYTE3 AT %MB2 : BYTE := 0;
+	BYTE4 AT %MB3 : BYTE := 0;
+	BYTE5 AT %MB4 : BYTE := 0;
+
+	(* INT *)
+	INT1 AT %MW0 : INT := 0;
+	INT2 AT %MW1 : INT := 0;
+	INT3 AT %MW2 : INT := 0;
+	INT4 AT %MW3 : INT := 0;
+	INT5 AT %MW4 : INT := 0;
+
+	(* WORD *)
+	WORD1 AT %MW0 : WORD := 0;
+	WORD2 AT %MW1 : WORD := 0;
+	WORD3 AT %MW2 : WORD := 0;
+	WORD4 AT %MW3 : WORD := 0;
+	WORD5 AT %MW4 : WORD := 0;
+
+	(* DINT *)
+	DINT1 AT %MD0 : DINT := 0;
+	DINT2 AT %MD1 : DINT := 0;
+	DINT3 AT %MD2 : DINT := 0;
+	DINT4 AT %MD3 : DINT := 0;
+	DINT5 AT %MD4 : DINT := 0;
+
+	(* DWORD *)
+	DWORD1 AT %MD0 : DWORD := 0;
+	DWORD2 AT %MD1 : DWORD := 0;
+	DWORD3 AT %MD2 : DWORD := 0;
+	DWORD4 AT %MD3 : DWORD := 0;
+	DWORD5 AT %MD4 : DWORD := 0;
+
+	(* REAL *)
+	REAL1 AT %MD0 : REAL := 0;
+	REAL2 AT %MD1 : REAL := 0;
+	REAL3 AT %MD2 : REAL := 0;
+	REAL4 AT %MD3 : REAL := 0;
+	REAL5 AT %MD4 : REAL := 0;
+
+	(* String *)
+	STRING1 AT %MW0 : STRING := 'Hello word!!!';
+END_VAR
+
+(* @END_DECLARATION := '0' *)
+(* Something to do *)
+;
+END_PROGRAM
+
+(* @NESTEDCOMMENTS := 'Yes' *)
+(* @GLOBAL_VARIABLE_LIST := 'Global_Variables' *)
+(* @PATH := '' *)
+(* @OBJECTFLAGS := '0, 8' *)
+(* @SYMFILEFLAGS := '2048' *)
+VAR_GLOBAL
+END_VAR
+
+(* @OBJECT_END := 'Global_Variables' *)
+(* @CONNECTIONS := Global_Variables
+FILENAME : ''
+FILETIME : 0
+EXPORT : 0
+NUMOFCONNECTIONS : 0
+*)
+
+(* @NESTEDCOMMENTS := 'Yes' *)
+(* @GLOBAL_VARIABLE_LIST := 'Variable_Configuration' *)
+(* @PATH := '' *)
+(* @OBJECTFLAGS := '0, 8' *)
+(* @SYMFILEFLAGS := '2048' *)
+VAR_CONFIG
+END_VAR
+
+(* @OBJECT_END := 'Variable_Configuration' *)
+(* @CONNECTIONS := Variable_Configuration
+FILENAME : ''
+FILETIME : 0
+EXPORT : 0
+NUMOFCONNECTIONS : 0
+*)
+
+
+_ALARMCONFIG
+_ALARMCONFIGNEXTTEXTID : 10002
+_ALARMCONFIGFORMATS : 'HH$':$'mm$':$'ss','dd$'-$'MM$'-$'yyyy'
+_ALARMCLASSLIST : 1
+_ALARMCLASSID : 0
+_ALARMCLASSACKTYPE : 0
+_ALARMCLASSNAME : 'DEFAULT'
+_ALARMCLASSDESCRIPTION : ''
+_ALARMCLASSBGCOLORS : 16777215,16777215,16777215
+_ALARMCLASSTEXTCOLORS : 3394560,255,16711680
+_ALARMCLASSBITMAPS : '','',''
+_ALARMACTIONLIST : 0
+(* @ALARMCLASSRESETCOLORS := '_ALARMCLASSRESETCOLORS: 33023,16777215' *)
+(* @ALARMCLASSRESETBITMAP := '_ALARMCLASSRESETBITMAP: $'$'' *)
+_ALARMGROUPLISTNAME : 'System'
+_ALARMGROUPPATH : 'System'
+_ALARMGROUPLIST : 0
+_VISUALSETTINGSFLAGS : 0,0,0,0
+_VISUALSETTINGSFLAGS : '','',''
+_VISUALSETTINGSDYNTEXTFILECOUNT : 0
+
+(* @ALARMCONFIGFLAGS := '_ALARMCONFIGFLAGS: 0' *)
+(* @ALARMCONFIGGLOBALDB_STR := '_ALARMCONFIGGLOBALDB_STRINGS: $'$',$'$',$'$',$'$'' *)
+(* @ALARMCONFIGGLOBALDB_NUM := '_ALARMCONFIGGLOBALDB_NUMBERS: 0,0' *)
+_END_ALARMCONFIG
+
+
+LIBRARY
+Standard.lib 2.12.10 14:48:34
+(* @LIBRARYSYMFILEINFO := '0' *)
+NumOfPOUs: 26
+ASCIIBYTE_TO_STRING: 2048
+CONCAT: 0
+CTD: 0
+CTU: 0
+CTUD: 0
+DELETE: 0
+F_TRIG: 0
+FIND: 0
+INSERT: 0
+LEFT: 0
+LEN: 0
+MID: 0
+R_TRIG: 0
+REAL_STATE: 2048
+REPLACE: 0
+RIGHT: 0
+RS: 0
+RTC: 0
+SEMA: 0
+SR: 0
+STANDARD_VERSION: 2048
+STRING_COMPARE: 2048
+STRING_TO_ASCIIBYTE: 2048
+TOF: 0
+TON: 0
+TP: 0
+NumOfGVLs: 1
+'Global Variables 0': 0
+END_LIBRARY
+
+LIBRARY
+SYSLIBCALLBACK.LIB 2.12.10 14:48:32
+(* @LIBRARYSYMFILEINFO := '0' *)
+NumOfPOUs: 2
+SysCallbackRegister: 0
+SysCallbackUnregister: 0
+NumOfGVLs: 2
+Globale_Variablen: 0
+Version: 0
+END_LIBRARY
+
+PLC_CONFIGURATION
+_GLOBAL
+_VERSION: 3
+_AUTOADR: 0
+_CHECKADR: 0
+_SAVECONFIGFILESINPROJECT: 0
+_END_GLOBAL
+
+_MODULE: '3S'
+_SECTION_NAME: 'Root'
+_INDEX_IN_PARENT: '-1'
+_MODULE_NAME: 'Hardware configuration'
+_NODE_ID: -1
+_IECIN: %IB0
+_IECOUT: %QB0
+_IECDIAG: %MB0
+_DOWNLOAD: 1
+_EXCLUDEFROMAUTOADR: 0
+_COMMENT: ''
+
+_MODULE: '3S'
+_SECTION_NAME: 'K_Bus'
+_INDEX_IN_PARENT: '1'
+_MODULE_NAME: 'K-Bus'
+_NODE_ID: 0
+_IECIN: %IB0
+_IECOUT: %QB0
+_IECDIAG: %MB0
+_DOWNLOAD: 1
+_EXCLUDEFROMAUTOADR: 0
+_COMMENT: ''
+_END_MODULE
+
+_MODULE: '3S'
+_SECTION_NAME: 'FB_VARS'
+_INDEX_IN_PARENT: '2'
+_MODULE_NAME: 'Fieldbus variables'
+_NODE_ID: 1
+_IECIN: %IB0
+_IECOUT: %QB0
+_IECDIAG: %MB0
+_DOWNLOAD: 1
+_EXCLUDEFROMAUTOADR: 0
+_COMMENT: ''
+_END_MODULE
+_END_MODULE
+PLC_END
+
+
+RESOURCE
+{event_task : 'start','Called when program starts','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,1,11986}
+{event_task : 'stop','Called when program stops','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,2,11986}
+{event_task : 'before_reset','Called before reset takes place','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,3,11986}
+{event_task : 'after_reset','Called after reset took place','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,4,11986}
+{event_task : 'shutdown','Called before shutdown is performed (Firmware update over ethernet)','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,5,11986}
+{event_task : 'excpt_watchdog','Software watchdog of IEC-task expired','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,7,11986}
+{event_task : 'excpt_fieldbus','Fieldbus error','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,9,11986}
+{event_task : 'excpt_ioupdate','KBus error','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,10,11986}
+{event_task : 'excpt_dividebyzero','Division by zero. Only integer operations!','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,18,11986}
+{event_task : 'excpt_noncontinuable','Exception handler','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,20,11986}
+{event_task : 'after_reading_inputs','Called after reading of inputs','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,28,11986}
+{event_task : 'before_writing_outputs','Called before writing of outputs','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,29,11986}
+{event_task : 'debug_loop','Debug loop at breakpoint','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,31,11986}
+{event_task : 'online_change','Is called after CodeInit() at Online-Change','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,33,11986}
+{event_task : 'before_download','Is called before the Download starts','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,34,11986}
+{event_task : 'event_login','Is called before the login service is performed','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,501,11986}
+{event_task : 'eth_overload','Ethernet Overload','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,750,11986}
+{event_task : 'eth_network_ready','Is called directly after the Network and the PLC are initialised','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,751,11986}
+{event_task : 'blink_code','New blink code / Blink code cleared ( Call STATUS_GET_LAST_ERROR for details )','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,752,11986}
+{event_task : 'interrupt_0','Interrupt Real Time Clock (every second)','','FUNCTION systemevent: DWORD VAR_INPUT dwEvent: DWORD; dwFilter: DWORD; dwOwner: DWORD; END_VAR '}{event_task_info : 0,1000,11986}
+
+END_RESOURCE
+
+
+_WORKSPACE
+_GLOBALVISUALSETTINGS
+_VISUALSETTINGSFLAGS : 0,0,0,0
+_VISUALSETTINGSFLAGS : '','',''
+_VISUALSETTINGSDYNTEXTFILECOUNT : 0
+_VISUALBITMAPLISTCOUNT : 0
+_END_GLOBALVISUALSETTINGS
+_END_WORKSPACE

tests/Codesys/_make_exp.cmd

@@ -0,0 +1,15 @@
+rem Create Codesys EXP file
+
+rem Build cmd file
+set CODESYS="c:\Program Files (x86)\WAGO Software\CoDeSys V2.3\codesys.exe"
+set PROJECT=test
+del %PROJECT%.EXP
+echo file open %PROJECT%.pro >> codesys_cmd_file.cmd
+echo project export %PROJECT%.EXP >> codesys_cmd_file.cmd
+rem echo file saveas %PROJECT%.lib internallib >> codesys_cmd_file.cmd
+echo file close >> codesys_cmd_file.cmd
+echo file quit >> codesys_cmd_file.cmd
+%CODESYS% /noinfo /cmd codesys_cmd_file.cmd 
+
+rem Clean all when finished
+del codesys_cmd_file.cmd

tests/IecType/ref/test.iecReal.php.html

@@ -1 +1,12 @@
-Endianing off <hr>0 --> Packet: 0000_0000_</br>1 --> Packet: 0000_3f80_</br>-2 --> Packet: 0000_c000_</br>0.333333333333 --> Packet: aaaa_3eaa_</br>25 --> Packet: 0000_41c8_</br>Endianing on <hr>0 --> Packet: 0000_0000_</br>1 --> Packet: 3f80_0000_</br>-2 --> Packet: c000_0000_</br>0.333333333333 --> Packet: 3eaa_aaaa_</br>25 --> Packet: 41c8_0000_</br>
+Endianing off <hr>
+0 --> Packet: 0000_0000_<br>
+1 --> Packet: 0000_3f80_<br>
+-2 --> Packet: 0000_c000_<br>
+0.333333333333 --> Packet: aaab_3eaa_<br>
+25 --> Packet: 0000_41c8_<br>
+Endianing on <hr>
+0 --> Packet: 0000_0000_<br>
+1 --> Packet: 3f80_0000_<br>
+-2 --> Packet: c000_0000_<br>
+0.333333333333 --> Packet: 3eaa_aaab_<br>
+25 --> Packet: 41c8_0000_<br>

tests/IecType/test.iecReal.php

@@ -7,7 +7,7 @@ $data = Array (
     "0" => 0, // -> 0000 0000
     "1" => 1, // -> 3f80 0000
     "2" => -2, // -> c000 0000
-    "3" => 1/3, // -> 3eaa aaab
+    "3" => 0.333333333333, //1/3 -> 3eaa aaab
     "4" => 25 // -> 41c8 0000
 );
 
@@ -25,26 +25,26 @@ function printPacket($packet){
     if($i % 2)
       $str .= "_";
   }
-  $str .= "</br>";
+  $str .= "<br>\n";
   return $str;
 }
 
-echo "Endianing off <hr>";
+echo "Endianing off <hr>\n";
 // Print mixed values
 for($i=0;$i<count($data);$i++) {
   echo $data[$i] . " --> ";
   $v = IecType::iecREAL($data[$i], 0);
   echo printPacket($v);
-  "<br>";
+  "<br>\n";
 }
 
-echo "Endianing on <hr>";
+echo "Endianing on <hr>\n";
 // Print mixed values
 for($i=0;$i<count($data);$i++) {
   echo $data[$i] . " --> ";
   $v = IecType::iecREAL($data[$i], 1);
   echo printPacket($v);
-  "<br>";
+  "<br>\n";
 }
  
 ?>

tests/ModbusMaster/_test.bat

@@ -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

tests/ModbusMaster/ref/test.tcp.fc16fc3.php.html

@@ -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
+)

tests/ModbusMaster/ref/test.tcp.fc26.php.html

@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE

tests/ModbusMaster/ref/test.tcp.socket_protocol_mismatch.php.html

@@ -0,0 +1 @@
+Caught exception: Unknown socket protocol, should be 'TCP' or 'UDP'

tests/ModbusMaster/ref/test.udp.fc16fc3.php.html

@@ -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
+)

tests/ModbusMaster/ref/test.udp.fc26.php.html

@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE

tests/ModbusMaster/test.tcp.fc16fc3.php

@@ -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);
+
+?>

tests/ModbusMaster/test.tcp.fc26.php

@@ -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";
+?>

tests/ModbusMaster/test.tcp.socket_protocol_mismatch.php

@@ -0,0 +1,22 @@
+<?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
+try {
+    $recData = $modbus->readWriteRegisters(0, 12288, 6, 12288, $data, $dataTypes);
+} catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+    exit();
+}
+// Should through an Exception
+
+// Print status information
+echo "Should never reach this line!";

tests/ModbusMaster/test.udp.fc16fc3.php

@@ -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);
+
+?>

tests/ModbusMaster/test.udp.fc26.php

@@ -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";
+?>

tests/ModbusMasterTcp/_test.bat

@@ -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

tests/ModbusMasterTcp/ref/test.fc16fc3.php.html

@@ -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
+)

tests/ModbusMasterTcp/ref/test.fc26.php.html

@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE

tests/ModbusMasterTcp/test.fc16fc3.php

@@ -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);
+
+?>

tests/ModbusMasterTcp/test.fc26.php

@@ -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";
+?>

tests/ModbusMasterUdp/ref/test.fc15fc1.php.html

@@ -0,0 +1,66 @@
+array(32) {
+  [0]=>
+  bool(true)
+  [1]=>
+  bool(false)
+  [2]=>
+  bool(true)
+  [3]=>
+  bool(true)
+  [4]=>
+  bool(false)
+  [5]=>
+  bool(true)
+  [6]=>
+  bool(true)
+  [7]=>
+  bool(true)
+  [8]=>
+  bool(true)
+  [9]=>
+  bool(true)
+  [10]=>
+  bool(true)
+  [11]=>
+  bool(true)
+  [12]=>
+  bool(false)
+  [13]=>
+  bool(false)
+  [14]=>
+  bool(false)
+  [15]=>
+  bool(false)
+  [16]=>
+  bool(false)
+  [17]=>
+  bool(false)
+  [18]=>
+  bool(false)
+  [19]=>
+  bool(false)
+  [20]=>
+  bool(true)
+  [21]=>
+  bool(true)
+  [22]=>
+  bool(true)
+  [23]=>
+  bool(true)
+  [24]=>
+  bool(true)
+  [25]=>
+  bool(true)
+  [26]=>
+  bool(true)
+  [27]=>
+  bool(true)
+  [28]=>
+  bool(true)
+  [29]=>
+  bool(true)
+  [30]=>
+  bool(true)
+  [31]=>
+  bool(true)
+}

tests/ModbusMasterUdp/ref/test.fc16fc3.php.html

@@ -62,7 +62,7 @@ Array
     [10] => 192
     [11] => 0
     [12] => 170
-    [13] => 170
+    [13] => 171
     [14] => 62
     [15] => 170
     [16] => 0

tests/ModbusMasterUdp/ref/test.fc16fc3bind.php.html

@@ -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
+)

tests/ModbusMasterUdp/ref/test.fc2.php.html

@@ -0,0 +1,7 @@
+Test should pass when %IX0.0==FALSE and %IX0.1==TRUE
+array(2) {
+  [0]=>
+  bool(false)
+  [1]=>
+  bool(true)
+}

tests/ModbusMasterUdp/ref/test.fc26bind.php.html

@@ -0,0 +1 @@
+writeMultipleRegister (FC26): DONE

tests/ModbusMasterUdp/ref/test.fc4.php.html

@@ -0,0 +1,11 @@
+Test should pass when %IX0.0==FALSE and %IX0.1==TRUE
+array(4) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(2)
+  [2]=>
+  int(0)
+  [3]=>
+  int(0)
+}

tests/ModbusMasterUdp/ref/test.fc5.php.html

@@ -0,0 +1,5 @@
+Array
+(
+    [0] => 0
+    [1] => 5
+)

tests/ModbusMasterUdp/ref/test.fc6fc3.php.html

@@ -0,0 +1,5 @@
+Array
+(
+    [0] => 207
+    [1] => 199
+)

tests/ModbusMasterUdp/test.fc15fc1.php

@@ -0,0 +1,22 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp($test_host_ip);
+
+// Data to be writen - BOOL array
+$data = array(1, 0, TRUE, TRUE, 0, 1, TRUE, TRUE, 
+              1, 1, TRUE, TRUE, 0, 0, FALSE, FALSE,
+              0, 0, FALSE, FALSE, 1, 1, TRUE, TRUE,
+              1, 1, TRUE, TRUE, 1, 1, TRUE, TRUE);
+// Write data - FC 15
+$modbus->writeMultipleCoils(0, 12288, $data);
+//echo $modbus->status;
+//$modbus->status = "";
+//echo "\n\n";
+// Read data - FC 1
+$recData = $modbus->readCoils(0, 12288, 32);
+//echo $modbus->status;
+//echo "\n\n";
+var_dump($recData);

tests/ModbusMasterUdp/test.fc16fc3.php

@@ -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);

tests/ModbusMasterUdp/test.fc16fc3bind.php

@@ -0,0 +1,45 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$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);
+$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);
+
+?>

tests/ModbusMasterUdp/test.fc2.php

@@ -0,0 +1,14 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp($test_host_ip);
+
+// Test requirements
+echo "Test should pass when %IX0.0==FALSE and %IX0.1==TRUE\n";
+
+// Read input discretes - FC 2
+$recData = $modbus->readInputDiscretes(0, 0, 2);
+
+var_dump($recData);

tests/ModbusMasterUdp/test.fc26.php

@@ -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);

tests/ModbusMasterUdp/test.fc26bind.php

@@ -0,0 +1,25 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp($test_host_ip);
+$modbus->client = $test_bind_client_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";
+?>

tests/ModbusMasterUdp/test.fc4.php

@@ -0,0 +1,14 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp($test_host_ip);
+
+// Test requirements
+echo "Test should pass when %IX0.0==FALSE and %IX0.1==TRUE\n";
+
+// Read input discretes - FC 4
+$recData = $modbus->readMultipleInputRegisters(0, 0, 2);
+
+var_dump($recData);

tests/ModbusMasterUdp/test.fc5.php

@@ -0,0 +1,23 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp($test_host_ip);
+
+// Data to be writen - TRUE, FALSE
+$data_true = array(TRUE);
+$data_false = array(FALSE);
+
+// Reset target WORD
+$modbus->writeSingleRegister(0, 12288, array(0), array('WORD'));
+
+// Write single coil - FC5
+$modbus->writeSingleCoil(0, 12288, $data_true);
+$modbus->writeSingleCoil(0, 12289, $data_false);
+$modbus->writeSingleCoil(0, 12290, $data_true);
+$modbus->writeSingleCoil(0, 12291, $data_false);
+
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 1);
+print_r($recData);

tests/ModbusMasterUdp/test.fc6fc3.php

@@ -0,0 +1,15 @@
+<?php
+require_once dirname(__FILE__) . '/../../Phpmodbus/ModbusMasterUdp.php';
+require_once dirname(__FILE__) . '/../config.php';
+
+// Create Modbus object
+$modbus = new ModbusMasterUdp($test_host_ip);
+
+// Data to be writen - INT
+$data = array(-12345);
+$dataTypes = array("INT");
+// Write data - FC6
+$modbus->writeSingleRegister(0, 12288, $data, $dataTypes);
+// Read data - FC3
+$recData = $modbus->readMultipleRegisters(0, 12288, 1);
+print_r($recData);

tests/config.bat

@@ -1,4 +1,4 @@
-set php=c:\Program_Files\xampplite\php\php.exe
+set php=c:\Program_Files\xampp\php\php.exe
 rem set php=C:\PHP\versions\php-5.2.6-Win32\php.exe -d auto_prepend_file=C:\PHP\locale.php
 set diff="diff.exe"
 rem set testUri=http://localHost/nette/_trunk/tests

tests/config.php

@@ -1,3 +1,3 @@
 <?php
-  $testip = "192.192.15.51";  
-?>
+  $test_host_ip = "192.192.1.10";  
+  $test_bind_client_ip = "192.192.1.100";

tutorials/Phpmodbus/Phpmodbus.pkg

@@ -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,12 +16,18 @@
   <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:
    <itemizedlist>
+     <listitem><para>FC  1: read multiple coils</para></listitem>
+     <listitem><para>FC  2: read input discretes</para></listitem>
      <listitem><para>FC  3: read multiple registers</para></listitem>
+     <listitem><para>FC  4: read multiple input registers</para></listitem>
+     <listitem><para>FC  5: write single coil</para></listitem>
+     <listitem><para>FC  6: write single register</para></listitem>
+     <listitem><para>FC 15: write multiple coils</para></listitem>
      <listitem><para>FC 16: write multiple registers</para></listitem>
      <listitem><para>FC 23: read write registers</para></listitem>
     </itemizedlist>
@@ -30,12 +36,9 @@
    For more about Modbus protocol see [{@link http://www.modbus.org}] or
    [{@link http://en.wikipedia.org/wiki/Modbus Wiki}]
   </para>
-  <note>
-   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.).
@@ -44,34 +47,73 @@
    Copy the Phpmodbus library to your PHP project folder.
   </para>
   <para>
-   Create a PHP script and assign the library using
-     <programlisting role="ini">
-      <![CDATA[ require_once dirname(__FILE__) . '/Phpmodbus/ModbusMasterUdp.php'; ]]>
+   Create a PHP script and assign the library using require_once() command
+     <programlisting role="c">
+      <![CDATA[require_once dirname(__FILE__) . '/Phpmodbus/ModbusMaster.php'; ]]>
+     </programlisting>     
+  </para>
+  <para>
+    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 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>
+    To read 5 words (10 bytes) from the device ID=0 and its memory address 12288
+    use try-catch method call
+    <programlisting role="c" linenumbering="numbered" startinglinenumber="3">
+      <![CDATA[try {
+    // Function processing
+    $recData = $modbus->readMultipleRegisters(0, 12288, 5); 
+}
+catch (Exception $e) {
+    // Exception processing, e.g. print error information
+    echo $modbus;
+    echo $e;
+    exit; 
+}]]>
      </programlisting>
   </para>
   <para>
-    To create the Modbus master object, that will communicate with a Modbus slave
-    at IP address 192.168.1.1, write
-    <programlisting role="ini">
-      <![CDATA[ $modbus = new ModbusMasterUdp("192.168.1.1"); ]]>
-     </programlisting>
+    To process the function byte stream, use conversion to PHP types in 
   </para>
-  <para>
-    To read 5 words (10 bytes) located at the memory beginning at address = 12288 of
-    the devide with Modbus ID=0 use
-    <programlisting role="ini">
-      <![CDATA[ $recData = $modbus->readMultipleRegisters(0, 12288, 5); ]]>
+  <programlisting role="c" linenumbering="numbered" startinglinenumber="15">
+      <![CDATA[echo PhpType::bytes2string($recData); ]]>
      </programlisting>
-  </para>
   <para>
   For other examples see sections bellow.
   </para>
- </refsect1>
+ </refsect1>  
  <refsect1 id="{@id examples}">
   <title>Examples</title>
   <para>
     This section presents library features and examples
   </para>
+    <refsect2 id="{@id example_fc1}">
+    <title>FC1 - read mutliple coils</title>
+    <para>
+      FC1 functionality example
+    </para>
+    <para>
+    {@example example_fc1.php}
+    </para>
+  </refsect2>
+  <refsect2 id="{@id example_fc2}">
+    <title>FC2 - read input discretes</title>
+    <para>
+      FC2 functionality example
+    </para>
+    <para>
+    {@example example_fc2.php}
+    </para>
+  </refsect2>
   <refsect2 id="{@id example_fc3}">
     <title>FC3 - read mutliple registers</title>
     <para>
@@ -81,6 +123,42 @@
     {@example example_fc3.php}
     </para>
   </refsect2>
+  <refsect2 id="{@id example_fc4}">
+    <title>FC4 - read multiple input registers </title>
+    <para>
+      FC4 functionality example
+    </para>
+    <para>
+    {@example example_fc4.php}
+    </para>
+  </refsect2>
+  <refsect2 id="{@id example_fc5}">
+    <title>FC5 - write single coil</title>
+    <para>
+      FC5 functionality example
+    </para>
+    <para>
+    {@example example_fc5.php}
+    </para>
+  </refsect2>
+  <refsect2 id="{@id example_fc6}">
+    <title>FC6 - write single register</title>
+    <para>
+      FC6 functionality example
+    </para>
+    <para>
+    {@example example_fc6.php}
+    </para>
+  </refsect2>
+  <refsect2 id="{@id example_fc15}">
+    <title>FC15 - write mutliple coils</title>
+    <para>
+      FC15 functionality example
+    </para>
+    <para>
+    {@example example_fc15.php}
+    </para>
+  </refsect2>
   <refsect2 id="{@id example_fc16}">
     <title>FC16 - write mutliple registers</title>
     <para>
@@ -118,4 +196,15 @@
     </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>