Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
22f0c4e5
Commit
22f0c4e5
authored
May 07, 2013
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(modbus): Исправил ошибку в функции autodetect-slave (eterbug #9220)
parent
9e1c3629
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
mbrtutester.cc
Utilities/MBTester/mbrtutester.cc
+2
-2
mbtcptester.cc
Utilities/MBTester/mbtcptester.cc
+1
-1
No files found.
Utilities/MBTester/mbrtutester.cc
View file @
22f0c4e5
...
@@ -58,7 +58,7 @@ static void print_help()
...
@@ -58,7 +58,7 @@ static void print_help()
printf
(
" fn - function of test [0x01,0x02,0x03,0x04]. Default: 0x04
\n
"
);
printf
(
" fn - function of test [0x01,0x02,0x03,0x04]. Default: 0x04
\n
"
);
printf
(
"[--autodetect-slave] [beg end reg fn] - find slave
\n
"
);
printf
(
"[--autodetect-slave] [beg end reg fn] - find slave
\n
"
);
printf
(
" beg - start addres Default: 0
\n
"
);
printf
(
" beg - start addres Default: 0
\n
"
);
printf
(
" end - end addres Default: 25
5
\n
"
);
printf
(
" end - end addres Default: 25
4
\n
"
);
printf
(
" reg - register of test. Default: 0
\n
"
);
printf
(
" reg - register of test. Default: 0
\n
"
);
printf
(
" fn - function of test [0x01,0x02,0x03,0x04]. Default: 0x04
\n
"
);
printf
(
" fn - function of test [0x01,0x02,0x03,0x04]. Default: 0x04
\n
"
);
printf
(
"[-y|--use485F] - use RS485 Fastwel.
\n
"
);
printf
(
"[-y|--use485F] - use RS485 Fastwel.
\n
"
);
...
@@ -109,7 +109,7 @@ int main( int argc, char **argv )
...
@@ -109,7 +109,7 @@ int main( int argc, char **argv )
ModbusRTU
::
ModbusAddr
slaveaddr
=
0x00
;
ModbusRTU
::
ModbusAddr
slaveaddr
=
0x00
;
ModbusRTU
::
SlaveFunctionCode
fn
=
ModbusRTU
::
fnReadInputRegisters
;
ModbusRTU
::
SlaveFunctionCode
fn
=
ModbusRTU
::
fnReadInputRegisters
;
ModbusRTU
::
ModbusAddr
beg
=
0
;
ModbusRTU
::
ModbusAddr
beg
=
0
;
ModbusRTU
::
ModbusAddr
end
=
25
5
;
ModbusRTU
::
ModbusAddr
end
=
25
4
;
ModbusRTU
::
DiagnosticsSubFunction
subfunc
=
ModbusRTU
::
subEcho
;
ModbusRTU
::
DiagnosticsSubFunction
subfunc
=
ModbusRTU
::
subEcho
;
ModbusRTU
::
ModbusData
dat
=
0
;
ModbusRTU
::
ModbusData
dat
=
0
;
int
tout
=
2000
;
int
tout
=
2000
;
...
...
Utilities/MBTester/mbtcptester.cc
View file @
22f0c4e5
...
@@ -43,7 +43,7 @@ static void print_help()
...
@@ -43,7 +43,7 @@ static void print_help()
printf
(
"[--read03] slaveaddr reg count - read from reg (from slaveaddr). Default: count=1
\n
"
);
printf
(
"[--read03] slaveaddr reg count - read from reg (from slaveaddr). Default: count=1
\n
"
);
printf
(
"[--read04] slaveaddr reg count - read from reg (from slaveaddr). Default: count=1
\n
"
);
printf
(
"[--read04] slaveaddr reg count - read from reg (from slaveaddr). Default: count=1
\n
"
);
printf
(
"[--diag08] slaveaddr subfunc [dat] - diagnostics request
\n
"
);
printf
(
"[--diag08] slaveaddr subfunc [dat] - diagnostics request
\n
"
);
printf
(
"[--read4314] slaveaddr devID objID - (0x2B/0x0E): read device identification (devID=[1...4], objID=[0..25
5
])
\n
"
);
printf
(
"[--read4314] slaveaddr devID objID - (0x2B/0x0E): read device identification (devID=[1...4], objID=[0..25
4
])
\n
"
);
// printf("[--read43-13] slaveaddr ... - (0x2B/0x0D): CANopen General Reference Request and Response PDU \n");
// printf("[--read43-13] slaveaddr ... - (0x2B/0x0D): CANopen General Reference Request and Response PDU \n");
printf
(
"[-i|--iaddr] ip - Modbus server ip. Default: 127.0.0.1
\n
"
);
printf
(
"[-i|--iaddr] ip - Modbus server ip. Default: 127.0.0.1
\n
"
);
printf
(
"[-a|--myaddr] addr - Modbus address for master. Default: 0x01.
\n
"
);
printf
(
"[-a|--myaddr] addr - Modbus address for master. Default: 0x01.
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment