Pull request #15: MEP function for conversion of timetag to timestamp with explicit timezoneMerge in ODY_WRAP/iec60870 from feature/timetagtotimestampwithtimezone to development
* commit 'f5237b8f5990aaef62e47970035a4ffe75a5d62a':
MEP function for conversion of timetag to timestamp with explicit timezone
Merge pull request #13 in ODY_WRAP/iec60870 from development to master* commit '84e1065a90c18b794bafc9d6bb2a2255450bec96':
slf4j handling
fixed unplanned start of timers
Merge pull request #12 in ODY_WRAP/iec60870 from development to master* commit 'dbdda2152c2bc6daa20953c5883133da2a393f66':
updated ody_dev
fixed AbstractIEC104ProtocolHandler after merge
Revert "Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master""
Revert "Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master""
Revert "ODY-1807: added buffering of partial received APDUs"
Revert "AbstractIEC104ProtocolH...
Merge pull request #11 in ODY_WRAP/iec60870 from merge to development* commit 'e481c86181a41e19bc3b5754f63e3d04d1dc2fef':
updated ody_dev
fixed AbstractIEC104ProtocolHandler after merge
Revert "Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master""
Revert "Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master""
Revert "ODY-1807: added buffering of partial received APDUs"
Revert "AbstractIEC104ProtocolH...
Merge pull request #9 in ODY_WRAP/iec60870 from development to master* commit 'f4df23dd5207954008f39801ae083f06a11b95e4':
fixed classes after merge errors
AbstractIEC104ProtocolHandler
ODY-1807: added buffering of partial received APDUs
Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master"
AbstractIEC104ProtocolHandler
ODY-1807: added buffering of partial received APDUs
fixed classes after merge errors
AbstractIEC104Proto...
Merge pull request #10 in ODY_WRAP/iec60870 from merge to development* commit '20843916aa67fc879f43a1a4962c8bf8bd9be9ff':
fixed classes after merge errors
AbstractIEC104ProtocolHandler
ODY-1807: added buffering of partial received APDUs
Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master"
AbstractIEC104ProtocolHandler
ODY-1807: added buffering of partial received APDUs
Revert "Merge pull request #5 in ODY_WRAP/iec60870 fro...
Merge pull request #6 in ODY_WRAP/iec60870 from bugfix/ODY-1807-data-loss-with-39-tcp-iec104-receivers to development* commit '2cd8f0d7ec28d804d64eff4fa0ce5db1c7b988ba':
ODY-1807: added buffering of partial received APDUs
Merge pull request #7 in ODY_WRAP/iec60870 from toMaster to master* commit '1f710443b7c995480acb4f31cf88e4e5e1199e49':
Revert "Merge pull request #5 in ODY_WRAP/iec60870 from development to master"
Merge pull request #5 in ODY_WRAP/iec60870 from development to master* commit '7620b3e555248bb3db1faaa5cbf6ba863c3d8419': (28 commits)
fixed use of transfer
Fix in protocol handler
Added option to set base64 en/decoding
APDUHandler: tried to fix timer handling
IEC104: made it possible to ignore send and receive numbers without ignoring startDT
removed warning
APDU handler: fixed handling of wrong send sequence no.
updated iec wrapper
IECClient:...