Commit Graph
691 Commits
Author SHA1 Message Date
john30 2f3f04222e fix for UDP connection introduced 20200411 with fix for #336 (fixes #383 2021-01-10 21:25:37 +01:00
john30 fd735278c8 fix test 2021-01-10 15:45:53 +01:00
john30 5c07889801 formatting 2021-01-10 15:36:02 +01:00
John 8bd35646d3 formatting 2021-01-10 15:12:59 +01:00
John cff4e4a8cb fix stupid merge 2021-01-10 14:13:07 +01:00
John c129222ffc Merge remote-tracking branch 'origin/master' into enhanced_device
# Conflicts:
#	docs/enhanced_proto.md
#	src/ebusd/bushandler.cpp
#	src/lib/ebus/device.cpp
#	src/lib/ebus/device.h
2021-01-10 13:51:53 +01:00
John f9943e2fe0 increase default network latency to 30ms, also use host latency of 20ms if WIN32 is defined 2021-01-10 13:42:36 +01:00
john30 61feda2f34 Revert "Merge branch 'enhanced_device' of github.com:john30/ebusd"
This reverts commit aaccb15a9b, reversing
changes made to edfe09a383.
2020-12-06 17:57:22 +01:00
john30 5d667fdc9c Merge branch 'enhanced_device' of github.com:john30/ebusd into enhanced_device 2020-12-06 17:04:29 +01:00
John-Michael Baier e70e474dce fix for cancelling arbitration 2020-11-29 19:13:52 +01:00
John-Michael Baier fe9235e569 documentation 2020-11-01 22:18:03 +01:00
john30 aaccb15a9b Merge branch 'enhanced_device' of github.com:john30/ebusd 2020-11-01 18:11:19 +01:00
John-Michael Baier 512b9d9456 set entry arbitration state for state machine to work properly 2020-11-01 15:35:39 +01:00
John-Michael Baier dc8de61042 fix logging sent byte when arbitration was lost 2020-11-01 11:08:31 +01:00
John-Michael Baier 91745fe847 add host latency 2020-11-01 10:44:15 +01:00
John-Michael Baier 7342fd0984 switch to milliseconds instead of micros for better readability 2020-11-01 10:43:36 +01:00
John-Michael Baier d02b2bd331 move transfer latency to device 2020-11-01 10:25:57 +01:00
john30 5e97d0864d compiler warning, add another test for exp 2020-05-16 09:51:48 +02:00
john30 80a105f293 compiler warning 2020-05-16 09:51:19 +02:00
John-Michael Baier e519193797 compiler warning 2020-05-09 09:23:14 +02:00
John-Michael Baier 60a138a045 Merge remote-tracking branch 'origin/master' into enhanced_device
# Conflicts:
#	src/lib/ebus/device.cpp
#	src/lib/ebus/device.h
2020-05-09 09:19:30 +02:00
john30 9e152daaa8 resolve net device host during connect (fixes #336) 2020-04-11 16:31:47 +02:00
john30 e61b507615 add dedicated error code for arbitration running 2020-04-11 13:28:40 +02:00
john30 165efcb25f add DEBUG_RAW_TRAFFIC define for debugging low level raw traffic 2020-04-11 13:27:51 +02:00
john30 5a6920afd5 simplified, fix for repeating read when first was incomplete 2020-02-16 10:49:17 +01:00
john30 b26bd2d941 fix for handling arbitration result 2020-02-15 13:14:12 +01:00
john30 2ddd7df758 add enhanced error codes 2020-02-15 12:39:24 +01:00
john30 f2aae4cb2b avoid unnecessary host traffic 2020-02-09 12:06:09 +01:00
john30 4174531a9d added notifyStatus to DeviceListener and log errors/info from enhanced device, switch to send error instead of duplicate when starting arbitration if that is already in progress, fix enhanced arbitration, also send initial reset if enhanced device is on network 2020-02-02 15:57:22 +01:00
john30 6d35c90c9c shorten timeout for receiving second part of enhanced proto 2020-02-02 09:53:19 +01:00
john30 3a77957e28 make terminal change immediate (otherwise sometimes causes params not being set under cygwin) 2020-02-02 09:00:53 +01:00
john30 a82ef6631f fix for two-byte enhanced transfer polling, fix unnecessary buffer allocation, fix skip for invalid protocol bytes 2020-01-25 19:44:41 +01:00
john30 b8658f8f2c Merge remote-tracking branch 'origin/master' into enhanced_device
# Conflicts:
#	src/lib/ebus/device.cpp
2020-01-25 15:27:11 +01:00
john30 7b8ceb7db5 support cygwin build 2020-01-11 12:51:37 +01:00
john30 f92a047c09 better constant name 2020-01-11 12:41:21 +01:00
john30 3b569a01e1 fix for bad string.c_str() usage on temporary strings (seems to be problematic starting with gcc>=6.3.0, fixes #325 and #326) 2020-01-11 12:39:23 +01:00
john30 177568c537 sharpen net device check keepalive options 2019-12-29 14:45:04 +01:00
john30 a68adba23f fix for new enhanced proto 2019-12-03 08:01:06 +01:00
john30 f84b5bb4ce implemented new enhanced proto 2019-11-30 00:13:36 +01:00
john ede35485d2 documentation 2019-10-06 17:06:55 +02:00
john 0ee454838d Merge remote-tracking branch 'origin/master' into enhanced_device
# Conflicts:
#	src/lib/ebus/device.cpp
2019-10-06 14:26:49 +02:00
john30 b23d8c32dc formatting 2019-08-15 19:05:25 +02:00
john30 27778f2255 use defines for values in source mask of message key and simplified a bit (in preparation of #278), documentation 2019-08-15 19:04:51 +02:00
Alex SamorukovandJohn 67fc6e59cc FreeBSD and MacOS related fixes and improvements: compilation and serial port access (#290)
fixes for compilation and usage under FreeBSD+MaxOS including setting low latency for FTDI device (thanks @samm-git)
2019-08-11 08:06:13 +02:00
john30 c26f7b3b07 also detect subsequent fields with less than 8 bits not fitting into 1 byte 2019-06-29 08:16:26 +02:00
john30 94932c1fe1 fix for #266 2019-03-16 15:50:45 +01:00
john30 fa434e5151 fix for messages with later set poll priority being preferred before others in the poll sequence 2019-01-13 20:52:00 +01:00
john30 cc6f16e65a fix for messages with later set poll priority being preferred before others in the poll sequence 2019-01-13 18:02:35 +01:00
john30 9cf2f426b6 fixed docu 2018-12-26 16:06:14 +01:00
john30 4dfa163efa code style 2018-12-26 16:03:14 +01:00