Learning/s7netplus
0
0
Fork 0
mirror of https://github.com/S7NetPlus/s7netplus.git synced 2026-02-17 14:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
423 Commits 4 Branches 25 Tags
a23408d67ef968b54dacd637fc64611d284f2864
Commit Graph

423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Croes
db50a62aad Merge pull request #152 from rapha-dev/invalid-tpkt-length 
Fixes invalid TPKT length in request header
 2018-07-04 23:15:58 +02:00
Raphael
2f3bbddaef Fixes invalid TPKT length in request header 2018-07-04 11:47:13 +02:00
Michael Croes
4ab73d0e3a Merge pull request #143 from rapha-dev/datatype-float 
Add support for datatype float (Single) and obsolete double (Double) …
 2018-07-03 21:54:22 +02:00
Raphael
932433ad69 Merge branch 'master' of https://github.com/rapha-dev/s7netplus into datatype-float 2018-07-03 08:44:51 +02:00
Raphael
d37c388d20 Fixed obsolete message 2018-07-03 08:41:54 +02:00
Michael Croes
c13fb970d0 Merge pull request #142 from mycroes/net-standard-1-3 
Support for NetStandard 1.3
 2018-07-02 23:00:19 +02:00
Michael Croes
28a1225265 Change S7.Net project type in S7.sln 2018-07-02 22:59:16 +02:00
Michael Croes
fc62bb79d4 Update supported frameworks and compile section 2018-07-02 20:27:29 +02:00
Raphael
b8b144d7ae Add support for datatype float (Single) and obsolete double (Double) usage 2018-07-02 10:20:02 +02:00
Michael Croes
98228924ea Simplify info declaration in Struct field loops 2018-06-30 22:19:44 +02:00
Michael Croes
a1f4e44c48 R#: Cleanup usings 2018-06-30 22:19:44 +02:00
Michael Croes
2df9d0b0bf Remove obsolete UWP / S7.Net.Core files 2018-06-30 22:19:44 +02:00
Michael Croes
7821b6b6f6 Add NetStandard 1.3 support 
Supersedes UWP support since UWP 10.0 supports up to NetStandard 1.4.
 2018-06-30 22:19:44 +02:00
Michael Croes
e516675a70 Replace InvalidEnumArgumentException usage 
InvalidEnumArgumentException is not supported in NetStandard 1.3.
 2018-06-30 22:19:44 +02:00
Michael Croes
710ab2e026 Provide a buffer to MemoryStream 
NetStandard 1.3 doesn't expose .GetBuffer(), this removes the need for
having it. The support for messages that span TPKT's is quite nasty, but
probably S7 PLC's will never even use a message spanning multiple TPKT's.
 2018-06-30 22:17:48 +02:00
Michael Croes
534ecb2546 Merge pull request #123 from deinok/master 
Port to NetStandard
 2018-06-28 22:07:09 +02:00
Raul Hidalgo Caballero
66fe6750b2 Merge branch 'master' into master 2018-06-28 10:40:11 +02:00
Michael Croes
85e1abfdb0 Merge pull request #138 from mycroes/connection-request 
Connection request test and cleanup
 2018-06-27 22:28:47 +02:00
Michael Croes
3409e52fef Add message for ReadWriteBytesMany assertion 2018-06-27 21:51:37 +02:00
Michael Croes
514dde365e Cleanup TSAP parameters 
- Remove duplicate parameter code / length (already in initial array)
- Remove separate branch for S7-400 (same as S7-300/1200)
- Change all values to 2-character hex
 2018-06-27 21:26:44 +02:00
Michael Croes
0f151e4947 Add tests for ConnectionRequest 2018-06-27 21:24:23 +02:00
Michael Croes
5f220cd31f Fix default namespace in S7.Net.UnitTest 2018-06-27 21:09:11 +02:00
Michael Croes
6569e5e169 Extract ConnectionRequest from PLCHelpers 2018-06-27 21:07:41 +02:00
Michael Croes
4bca9d8c19 Merge pull request #130 from mycroes/fix-communication-setup-pdu-size 
Fix the PDU size in communication setup
 2018-06-26 22:18:44 +02:00
Michael Croes
229558d586 Merge pull request #129 from mycroes/remove-obsolete-on-sync 
Remove obsolete attribute and comments
 2018-06-26 22:18:10 +02:00
Raul Hidalgo Caballero
daf0f8e0d6 Merge branch 'master' into master 2018-06-21 21:24:01 +02:00
Michael Croes
d9abebe550 Fix the PDU size in communication setup 
[7, 80] resulted in 1872; [7, 128] (or [0x07, 0x80] in hex) results in
the 1920 as specified in comments.
 2018-06-21 20:49:05 +02:00
Michael Croes
2083ab1501 Remove obsolete attribute and comments 
References #124.
 2018-06-21 20:28:22 +02:00
Michele Cattafesta
003d775228 Merge pull request #127 from mycroes/write-short-array-fix 
Write short array fix
 2018-06-21 13:32:44 +01:00
Michele Cattafesta
e1c62c899b Merge pull request #121 from mycroes/master 
Add multiple write support
 2018-06-21 13:31:39 +01:00
Michael Croes
5a82313eb1 Change order of byte assignment for uniformity 
Order is now same as ToByteArray(Int16[] value), where the order is
important due to the index increment in the same line.
 2018-06-19 21:26:03 +02:00
Michael Croes
8d64bd89fc Fix byte order when serializing short[] / Int16[] 
Values should be written as big-endian, unfortunately the ordering for
short values in an array was little-endian.
 2018-06-19 21:24:28 +02:00
Michael Croes
299918e293 Add Plc.Write/WriteAsync(params DataItem[] dataItems) 2018-06-15 21:50:41 +02:00
Michael Croes
740a47ab43 Add initial WriteMultiple protocol 2018-06-15 21:39:38 +02:00
Michael Croes
38d089e117 Add boolean support to GetPackage 2018-06-15 21:39:38 +02:00
Michael Croes
aaab24a4c2 Add and move serialization helpers 
Added (Get|Set)WordAt, SetAddressAt and moved GetPackage method.
 2018-06-15 21:39:38 +02:00
Michele Cattafesta
0721b1a84a Merge pull request #125 from rapha-dev/master 
Fixes for Exception naming ReadData
 2018-06-10 17:13:15 +01:00
Raphael
1b22badea1 Fixed ErrorCode.ReadData for specific methods 2018-06-08 10:26:52 +02:00
Raphael
ddfedaa17e Typo in Exception string 2018-06-08 10:22:42 +02:00
Raul Hidalgo Caballero
2d24adc874 Port to NetStandard 2018-06-05 17:33:42 +02:00
Michele Cattafesta
44bf1366e4 Merge pull request #111 from thoj/tcpclient 
RFC/WIP: Async API
 2018-05-21 20:23:07 +01:00
Thomas Jäger
64e485c54a Revert "Use socket instead of TcpClient and stream." 
Revert back to using Stream/TcpClient. High performance stuff is moved
to highperformancesockets branch. I think this is interesting, but i also
feel that this is premature optimization. I doubth that this will be a
performance bottleneck ofr the forseeable future.

This reverts commit 1b34716a30.
 2018-05-18 08:52:19 +02:00
Thomas Jäger
219c1cc71a Revert "Use high performance wrapper" 
This reverts commit a3277133af.
 2018-05-18 08:43:44 +02:00
Thomas Jäger
a3277133af Use high performance wrapper 2018-05-16 16:29:11 +02:00
Thomas Jäger
00e22ee214 Incorporate fixes from #117 (moved to helpers) 
fix array naming.
 2018-05-16 15:50:00 +02:00
Thomas Jäger
8ac96162f9 Merge remote-tracking branch 'upstream/master' into tcpclient 2018-05-16 11:33:46 +02:00
Thomas Jäger
1b34716a30 Use socket instead of TcpClient and stream. 
Async implemented with wrapper.
 2018-05-16 11:24:21 +02:00
Thomas Jäger
b8b890977e Fix structured comments 2018-05-14 14:19:33 +02:00
Michele Cattafesta
013ff5fd92 Merge pull request #117 from rapha-dev/master 
Fixed bug in ReadMultipleVars on VarType.Bit
v0.1.9 		2018-05-12 23:03:57 +01:00
Raphael
642cf8169e Fixed bug for reading VarType.Bit and VarType.Byte on odd number of bytes in ReadMultipleVars() 2018-05-07 11:47:52 +02:00