fixed the examples

README.md

@@ -2,15 +2,15 @@
 
 Implementation of the basic functionality of the Modbus TCP and UDP based protocol using PHP. 
 
-This is a fork of the original project at https://code.google.com/p/phpmodbus/
+**NOTE: This is a fork to fix & update the library code (and code alone). Notably, the tests are probably all broken.**
 
 > **What's new**
 > 
 > This fork adds a namespace and fixes issues encountered when porting to PHP 7
 
-**WARNING: Everything except the actual code in this repo may be broken and outdated.**
 
-Implemented features:
+## Implemented features
+
  * Modbus master
  * FC1 - Read coils 
  * FC2 - Read input discretes
@@ -22,18 +22,24 @@ Implemented features:
  * FC16 - Write multiple registers
  * FC23 - Read/Write multiple registers
 
-Example:
+
+## Requirements
+
+ * The PHP extension php_sockets.dll should be enabled (server php.ini file)
+
+ 
+## Example
 
 ```php
-require_once dirname(__FILE__) . '/Phpmodbus/ModbusMaster.php'; 
+use PHPModbus/ModbusMaster; 
+use PHPModbus/PhpType; 
 
 // Modbus master UDP
 $modbus = new ModbusMaster("192.168.1.1", "UDP"); 
 // Read multiple registers
 try {
     $recData = $modbus->readMultipleRegisters(0, 12288, 5); 
-}
+} catch (Exception $e) {
-catch (Exception $e) {
     // Print error information if any
     echo $modbus;
     echo $e;
@@ -43,7 +49,14 @@ catch (Exception $e) {
 echo PhpType::bytes2string($recData); 
 ```
 
-For more see [http://code.google.com/p/phpmodbus/downloads/list documentation] or [http://code.google.com/p/phpmodbus/wiki/FAQ FAQ].
+Use the `setTimeout($seconds)` and `setSocketTimeout($read_timeout_sec, $write_timeout_sec)` methods to adjust wait times.
+
+Most of the code is (to some extent) commented and documented with PhpDoc. You should get useful tooltips in your IDE.
+
+
+## GoogleCode legacy docs & downloads
+
+This project was originally hosted on (now defunct) Google Code. It's still archived here:
+
+* [GoogleCode Archived Repo](http://code.google.com/p/phpmodbus)
 
-Note: 
- * The PHP extension php_sockets.dll should be enabled (server php.ini file)

examples/example_750841_Mmemory.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $ip = "192.192.15.51";
@@ -13,8 +13,7 @@ try {
 	$mw0address = 12288;
 	$quantity = 6;
 	$recData = $modbus->readMultipleRegisters($moduleId, $reference, $quantity);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	echo $modbus;
 	echo $e;
 	exit;
@@ -59,9 +58,8 @@ catch (Exception $e) {
 	</table>
 
 	<h2>Modbus class status</h2>
-        <?php
+
-        echo $modbus;
+	<pre><?= $modbus ?></pre>
-        ?>
 
 	</body>
 </html>

examples/example_datatype.php

@@ -1,6 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
+use PHPModbus\PhpType;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -9,8 +10,7 @@ try {
 	// FC 3
 	// read 10 words (20 bytes) from device ID=0, address=12288
 	$recData = $modbus->readMultipleRegisters(0, 12288, 10);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;
@@ -58,4 +58,3 @@ foreach($values as $bytes)
 // Get string from STRING interpretation
 echo "<h3>STRING to string </h3>\n";
 echo PhpType::bytes2string($recData) . "</br>";
-?>

examples/example_fc1.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -8,8 +8,7 @@ $modbus = new ModbusMaster("192.192.15.51", "UDP");
 try {
 	// FC 1
 	$recData = $modbus->readCoils(0, 12288, 12);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;

examples/example_fc15.php

@@ -1,21 +1,22 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
 
-// Data to be writen
+// Data to be written - supports both 0/1 and booleans (true, false)
-$data = array(TRUE, FALSE, TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 
+$data = array(
-              TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE,
+	1, 0, 1, 1, 0, 1, 1, 1,
-              FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE,
+	1, 1, 1, 1, 0, 0, 0, 0,
-              TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+	0, 0, 0, 0, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+);
 
 try {
 	// FC15
 	$modbus->writeMultipleCoils(0, 12288, $data);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;

examples/example_fc16.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -12,8 +12,7 @@ $dataTypes = array("WORD", "INT", "DINT", "REAL");
 try {
 	// FC16
 	$modbus->writeMultipleRegister(0, 12288, $data, $dataTypes);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;

examples/example_fc2.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -9,8 +9,7 @@ try {
 	// FC 2
 	// read 2 input bits from address 0x0 (Wago input image)
 	$recData = $modbus->readInputDiscretes(0, 0, 2);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;

examples/example_fc22.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -14,8 +14,7 @@ $orMask =  0x0000 ^ (pow(2, $bitNumber) * $bitValue ) ;
 try {
 	// FC22
 	$modbus->maskWriteRegister(0, 12288, $andMask, $orMask);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;
@@ -24,5 +23,3 @@ catch (Exception $e) {
 
 // Print status information
 echo $modbus;
-
-?>

examples/example_fc23.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -12,8 +12,7 @@ $dataTypes = array("WORD", "INT", "DINT", "REAL");
 try {
 	// FC23
 	$recData = $modbus->readWriteRegisters(0, 12288, 6, 12288, $data, $dataTypes);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;
@@ -27,5 +26,3 @@ echo "</br>Status:</br>" . $modbus;
 echo "</br>Data:</br>";
 print_r($recData);
 echo "</br>";
-
-?>

examples/example_fc3.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // Create Modbus object
 $modbus = new ModbusMaster("192.192.15.51", "UDP");
@@ -8,8 +8,7 @@ $modbus = new ModbusMaster("192.192.15.51", "UDP");
 try {
 	// FC 3
 	$recData = $modbus->readMultipleRegisters(0, 12288, 6);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;
@@ -23,4 +22,3 @@ echo "</br>Status:</br>" . $modbus;
 echo "</br>Data:</br>";
 print_r($recData);
 echo "</br>";
-?>

examples/example_fc4.php

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

examples/example_fc5.php

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

examples/example_fc6.php

@@ -1,19 +1,17 @@
 <?php
 
-require_once dirname(__FILE__) . '/../Phpmodbus/ModbusMaster.php';
+use PHPModbus\ModbusMaster;
 
 // 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);
+	$modbus->writeSingleRegister(0, 12288, $data);
-}
+} catch (Exception $e) {
-catch (Exception $e) {
 	// Print error information if any
 	echo $modbus;
 	echo $e;
@@ -22,5 +20,3 @@ catch (Exception $e) {
 
 // Print status information
 echo $modbus;
-
-?>