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
49d0fa05
Commit
49d0fa05
authored
Oct 19, 2009
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fixes: use for default "unsigned short" in Modbus
parent
0ebdd408
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
9 deletions
+11
-9
libuniset.spec
conf/libuniset.spec
+4
-1
MBTCPMaster.cc
extensions/MBTCPMaster/MBTCPMaster.cc
+1
-1
RTUExchange.cc
extensions/RTUExchange/RTUExchange.cc
+1
-1
VTypes.cc
extensions/lib/VTypes.cc
+5
-6
No files found.
conf/libuniset.spec
View file @
49d0fa05
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Name: libuniset
Name: libuniset
Version: 0.97
Version: 0.97
Release: eter
29
Release: eter
30
Summary: UniSet - library for building distributed industrial control systems
Summary: UniSet - library for building distributed industrial control systems
License: GPL
License: GPL
Group: Development/C++
Group: Development/C++
...
@@ -178,6 +178,9 @@ rm -f %buildroot%_libdir/*.la
...
@@ -178,6 +178,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
%changelog
* Sun Oct 18 2009 Pavel Vainerman <pv@altlinux.ru> 0.97-eter29
- new build
* Fri Oct 09 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter28
* Fri Oct 09 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter28
- minor optimization
- minor optimization
...
...
extensions/MBTCPMaster/MBTCPMaster.cc
View file @
49d0fa05
...
@@ -1568,7 +1568,7 @@ void MBTCPMaster::updateRSProperty( RSProperty* p, bool write_only )
...
@@ -1568,7 +1568,7 @@ void MBTCPMaster::updateRSProperty( RSProperty* p, bool write_only )
IOBase
::
processingAsDI
(
p
,
r
->
mbval
,
shm
,
force
);
IOBase
::
processingAsDI
(
p
,
r
->
mbval
,
shm
,
force
);
}
}
else
else
IOBase
::
processingAsAI
(
p
,
(
signed
short
)(
r
->
mbval
),
shm
,
force
);
IOBase
::
processingAsAI
(
p
,
(
un
signed
short
)(
r
->
mbval
),
shm
,
force
);
}
}
return
;
return
;
}
}
...
...
extensions/RTUExchange/RTUExchange.cc
View file @
49d0fa05
...
@@ -1730,7 +1730,7 @@ void RTUExchange::updateRSProperty( RSProperty* p, bool write_only )
...
@@ -1730,7 +1730,7 @@ void RTUExchange::updateRSProperty( RSProperty* p, bool write_only )
IOBase
::
processingAsDI
(
p
,
r
->
mbval
,
shm
,
force
);
IOBase
::
processingAsDI
(
p
,
r
->
mbval
,
shm
,
force
);
}
}
else
else
IOBase
::
processingAsAI
(
p
,
(
signed
short
)(
r
->
mbval
),
shm
,
force
);
IOBase
::
processingAsAI
(
p
,
(
un
signed
short
)(
r
->
mbval
),
shm
,
force
);
}
}
return
;
return
;
}
}
...
...
extensions/lib/VTypes.cc
View file @
49d0fa05
...
@@ -16,16 +16,15 @@ std::ostream& operator<<( std::ostream& os, const VType& vt )
...
@@ -16,16 +16,15 @@ std::ostream& operator<<( std::ostream& os, const VType& vt )
VType
str2type
(
const
std
::
string
s
)
VType
str2type
(
const
std
::
string
s
)
{
{
if
(
s
==
"Byte"
)
if
(
s
==
"Byte"
||
s
==
"byte"
)
return
vtByte
;
return
vtByte
;
if
(
s
==
"F2"
||
s
==
"f2"
)
if
(
s
==
"F2"
)
return
vtF2
;
return
vtF2
;
if
(
s
==
"F4"
)
if
(
s
==
"F4"
||
s
==
"f4"
)
return
vtF4
;
return
vtF4
;
if
(
s
==
"Unsigned"
)
if
(
s
==
"Unsigned"
||
s
==
"unsigned"
)
return
vtUnsigned
;
return
vtUnsigned
;
if
(
s
==
"Signed"
)
if
(
s
==
"Signed"
||
s
==
"signed"
)
return
vtSigned
;
return
vtSigned
;
return
vtUnknown
;
return
vtUnknown
;
...
...
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