summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't include .gitignore into src packagev5.7.0-alpha1Alex Blasche2016-03-041-0/+4
* Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-03-0216-81/+527
|\
| * Move clearing or updating values into a common function.Karsten Heimrich2016-03-014-25/+27
| * Implement partial reading from the serial connection.Karsten Heimrich2016-03-011-5/+11
| * Properly calculate EncapsulatedInterfaceTransport sizes.Karsten Heimrich2016-02-242-41/+345
| * Make QModbusPdu::encode(...) clear and set instead of append.Karsten Heimrich2016-02-221-0/+1
| * Fix some documentation issues based on earlier feedback.Karsten Heimrich2016-02-191-2/+3
| * RTU: Respond with illegal function for TCP and ASCII only request.Karsten Heimrich2016-02-192-0/+28
| * Improve the Can filtering snippetsAlex Blasche2016-02-191-5/+13
| * Add documention for Modbus slave and master examplesAlex Blasche2016-02-196-3/+91
| * Adjust size calculation for Modbus Encapsulated Interface Transport.Karsten Heimrich2016-02-191-0/+8
* | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-02-1928-336/+441
|\|
| * Special implementation for Diagnostics:ReturnQueryData msg code.Karsten Heimrich2016-02-181-1/+19
| * Some API and data size calculation fixes.Karsten Heimrich2016-02-174-107/+85
| * Use a more explictit type for data minimum size request.Karsten Heimrich2016-02-172-10/+10
| * qDebug: Add exception byte when streaming exception response.Karsten Heimrich2016-02-172-3/+4
| * Provide docs on how to implement a custom CAN plugin.Alex Blasche2016-02-177-13/+79
| * doc: Be more explicit what argument types are supported.Karsten Heimrich2016-02-151-10/+15
| * Remove qdoc related defines, we support the features now.Karsten Heimrich2016-02-153-30/+2
| * Bump versionOswald Buddenhagen2016-02-081-1/+1
| * Cleanup constructors and destructors.Karsten Heimrich2016-01-2912-29/+11
| * Implement missing serial port error handling.Karsten Heimrich2016-01-291-0/+50
| * Implement timeout handling more close to the specification.Karsten Heimrich2016-01-292-118/+148
| * Make it possible to set data on a disconnected Modbus device.Karsten Heimrich2016-01-281-3/+3
| * Clear existing buffered data when connecting to the serial port.Karsten Heimrich2016-01-282-6/+14
| * Remove unused function declarations.Karsten Heimrich2016-01-271-4/+0
| * Only stop the response timeout after receiving a valid ADU.Karsten Heimrich2016-01-251-2/+1
| * Update timout settings.Karsten Heimrich2016-01-252-2/+2
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2016-01-2561-1246/+1476
|\|
| * Implement support for server listen only and busy state.Karsten Heimrich2016-01-222-219/+271
| * Update documentation.Karsten Heimrich2016-01-221-1/+3
| * QtSerialbus: Use Q_NULLPTR instead of 0 in all public headers.Karsten Heimrich2016-01-209-9/+9
| * Implement missing server device busy handling.Karsten Heimrich2016-01-192-7/+22
| * Document Modbus logging categoriesAlex Blasche2016-01-151-0/+17
| * Remove meta-type registration and add it where used.Karsten Heimrich2016-01-132-3/+3
| * Fix warning about missing meta-type registration.Karsten Heimrich2016-01-131-0/+6
| * Update .gitignore file.Karsten Heimrich2016-01-121-0/+1
| * Resolve TODO, implement read/write multiple register.Karsten Heimrich2016-01-083-378/+359
| * Remove use of Variable Length ArrayThiago Macieira2016-01-082-2/+5
| * Make examples compile on LinuxAlex Blasche2016-01-082-4/+4
| * Hide the raw filter option in can bus exampleAlex Blasche2016-01-081-0/+3
| * Add doc reference from QCanBusDevice to QCanBusDevice::FilterAlex Blasche2016-01-081-1/+2
| * Print more verbose type information in socketcan warningAlex Blasche2016-01-081-1/+1
| * Provide default values for QCanbusDevice::Filter members.Alex Blasche2016-01-083-3/+22
| * Make it more obvious in the example what Flexible Data rate meansAlex Blasche2016-01-081-1/+2
| * Unwarn modbus on windows.Karsten Heimrich2016-01-082-14/+1
| * Implement the ClearOverrunCounterAndFlag sub-function code.Karsten Heimrich2016-01-083-8/+18
| * Adjust class members and update documentation. No functional change.Karsten Heimrich2016-01-082-80/+80
| * Fix some qdoc warnings.Karsten Heimrich2016-01-083-5/+7
| * Adjust header includes according to our coding conventions.Karsten Heimrich2016-01-0826-66/+56