Skip to content

Add more endianness options with word order #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add more endianness options with word order #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Phpmodbus/ModbusMaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ class ModbusMaster {
public $client_port = "502";
public $status;
public $timeout_sec = 5; // Timeout 5 sec
public $endianness = 0; // Endianness codding (little endian == 0, big endian == 1)
public $endianness = 0;
/* 1: low byte first, low word first (little endian)
* 2: low byte first, high word first
* 3: high byte first, low word first (default, backward compatibility also 0)
* 4: high byte first, high word first (big endian)
*/
public $socket_protocol = "UDP"; // Socket protocol (TCP, UDP)

/**
Expand Down
47 changes: 31 additions & 16 deletions Phpmodbus/PhpType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,21 +229,36 @@ private static function checkData($data) {
* @param bool $endianness
* @return int
*/
private static function combineBytes($data, $endianness) {
$value = 0;
// Combine bytes
if ($endianness == 0)
$value = (($data[3] & 0xFF)<<16) |
(($data[2] & 0xFF)<<24) |
(($data[1] & 0xFF)) |
(($data[0] & 0xFF)<<8);
else
$value = (($data[3] & 0xFF)<<24) |
(($data[2] & 0xFF)<<16) |
(($data[1] & 0xFF)<<8) |
(($data[0] & 0xFF));

return $value;
}
private static function combineBytes($data, $endianness) {
$value = 0;
// Combine bytes
switch($endianness) {
case 1:
$value = (($data[3] & 0xFF)<<24) |
(($data[2] & 0xFF)<<16) |
(($data[1] & 0xFF)<<8) |
(($data[0] & 0xFF));
break;
case 2:
$value = (($data[1] & 0xFF)<<24) |
(($data[0] & 0xFF)<<16) |
(($data[3] & 0xFF)<<8) |
(($data[2] & 0xFF));
break;
case 4:
$value = (($data[0] & 0xFF)<<24) |
(($data[1] & 0xFF)<<16) |
(($data[2] & 0xFF)<<8) |
(($data[3] & 0xFF));
break;
default:
$value = (($data[2] & 0xFF)<<24) |
(($data[3] & 0xFF)<<16) |
(($data[0] & 0xFF)<<8) |
(($data[1] & 0xFF));
break;
}
return $value;
}
}
?>