Commit Graph
100 Commits
Author SHA1 Message Date
john30 e75aedcf2b removed replacement value from bit types
deny replacement value for BTI, HTI, HTM
added replacement value support to BDA and HDA
2014-12-26 19:30:51 +01:00
john30 d7a9d505b7 added support for using hex values in value list 2014-12-26 14:22:52 +01:00
john30 6a46e8cbdb added BCD:2 BCD:3 BCD:4 2014-12-26 13:57:28 +01:00
john30 44b76a27d6 HDA is now in hex instead of BCD 2014-12-26 13:27:15 +01:00
john30 3720cc89ab Merge branch 'master' of github.com:yuhu-/ebusd 2014-12-25 12:09:50 +01:00
john30 dd4127f57b removed unused buffering in port and count dumped bytes instead of using tellp(), small fix in wait for bus after lost arbitration 2014-12-25 12:09:27 +01:00
john30 5d02119d1e fixed previous commit 2014-12-21 09:48:57 +01:00
john30 1b718aefa4 Merge branch 'master' of github.com:yuhu-/ebusd 2014-12-21 09:46:07 +01:00
john30 cdcb2ec0b6 renamed cmd to name 2014-12-21 09:22:35 +01:00
john30 10c8c9165a renamed sub to field 2014-12-21 09:08:35 +01:00
john30 0282afc9b7 adjusted to changed template structure 2014-12-18 23:26:53 +01:00
john30 92b0f07fdf moved config file reading to ebusd.cpp, enhanced config checking mode 2014-12-18 23:21:10 +01:00
john30 985d1f4389 pass iterator to FileReader::addFromFile() in order to keep track of the erroneous column, added verbose mode to FileReader 2014-12-18 23:06:31 +01:00
john30 4b7ff1d97f directly forward messages to sinks until Thread is started 2014-12-18 23:05:11 +01:00
john30 e8b355b85e style 2014-12-18 22:04:46 +01:00
john30 d078044c36 initialize fields, allow missing pidfile 2014-12-18 22:04:23 +01:00
john30 cdf7fb6522 file mode 2014-12-18 21:15:31 +01:00
john30 6569f46e40 removed part column from templates 2014-12-18 21:07:38 +01:00
john30 11cec1d47b renamed _types to _templates 2014-12-18 21:00:10 +01:00
john30 c86655b964 merged 2014-12-15 20:28:41 +01:00
john30 970574ed50 Merge branch 'master' of https://github.com/yuhu-/ebusd
Conflicts:
	src/ebusd/baseloop.h
	src/lib/ebus/data.h
	src/lib/ebus/message.h
	src/lib/ebus/result.h
	src/lib/ebus/symbol.h
2014-12-15 20:26:58 +01:00
john30 8e068fa34e disable doc for tools, warn if params miss documentation, convert TODO tags to todo-list 2014-12-15 20:14:29 +01:00
john30 4e81fd842b fixed documentation 2014-12-15 20:13:20 +01:00
John 55be6ddfcc help older compilers find the template ctor
fix for issue #25
2014-12-15 20:01:50 +01:00
John 72486436ad help older compilers find the template ctor
fix for issue #25
2014-12-15 20:00:57 +01:00
John b13e597602 corrected typo 2014-12-15 09:52:58 +01:00
john30 2df7bc75b2 deny invalid destination address in write hex 2014-12-14 18:58:44 +01:00
john30 118a0ea7d4 completed individual scanning with definitions in "scan" class, nicer passing of received data to BusRequests 2014-12-14 18:58:15 +01:00
john30 3a55d7552c fix for new result code empty 2014-12-14 18:55:11 +01:00
john30 5670c05a9a added base type PIN, simplified ident fields 2014-12-14 18:54:49 +01:00
john30 6d8a82a524 allow blank destination address (e.g. for scans), added MessageMap::findAll() 2014-12-14 18:50:49 +01:00
john30 2af6e55505 added result code for invalid address 2014-12-14 18:09:16 +01:00
john30 848a043f8b force refresh if single field is requested 2014-12-14 12:45:21 +01:00
john30 caa0ddc027 fix for new empty result code 2014-12-14 12:44:57 +01:00
john30 f2eb31ea1f avoid expensive math operations (logn) 2014-12-14 12:35:56 +01:00
john30 e507901d8f optimized handling scan result and remove typeinfo dependency 2014-12-14 12:15:40 +01:00
john30 2c2ab1c031 added option to read only a single field 2014-12-14 12:08:35 +01:00
john30 ad52a84833 implemented reload command, allow reading config from symlinks, added verbose and maxage (defaults to 5 minutes) options to read command, use "write -h" instead "hex" for hex commands 2014-12-14 11:43:04 +01:00
john30 0fc2396a12 added missing states in getStateCode 2014-12-14 11:37:14 +01:00
john30 83201eb287 removed nonsense formatting in DataFieldSet::read 2014-12-14 11:36:41 +01:00
john30 a9a9865583 added verbose arg to decode() 2014-12-14 11:36:14 +01:00
john30 7a975dd274 Merge branch 'master' of git://github.com/yuhu-/ebusd 2014-12-14 10:09:43 +01:00
john30 0fff38a43a Merge branch 'master' of git://github.com/yuhu-/ebusd 2014-12-13 17:56:33 +01:00
john30 1378b4c1e4 even nicer logging 2014-12-13 17:52:54 +01:00
john30 1f116aada7 unified logging 2014-12-13 14:56:19 +01:00
john30 e4f9306dde unified logging 2014-12-13 14:55:52 +01:00
john30 5d2b28f3db fixed ostringstream formatting (again) 2014-12-13 14:42:47 +01:00
john30 45c739228c corrected log area for update messages 2014-12-13 12:03:12 +01:00
john30 169c6a9460 switched to read/write instead of get/set and added force option to read (automatically picks up updated value if available), nicer response messages for BaseLoop, renamed area cyc to upd 2014-12-13 12:01:14 +01:00
john30 cda96e6e3b extraced FileReader to separate .h and added support for quoted CSV 2014-12-13 11:07:18 +01:00
john30 6eab4f86d1 also collect participant addressed actively 2014-12-13 00:14:11 +01:00
john30 27a563ca1d implemented scan, nicer logging 2014-12-13 00:02:14 +01:00
john30 3d89fef6ae added scanning and collection of seen bus addresses 2014-12-13 00:01:31 +01:00
john30 95d9c5fd08 added static dataType_t instances for string/bcd/uch, optimized and added missing initialization of ostringstream in readSymbols(), added DataFieldSet::createIdentFields() for ident message 2014-12-13 00:00:21 +01:00
john30 67549fd787 added simple ctor, added override dstAddress to prepareMaster() 2014-12-12 23:58:18 +01:00
john30 3ba98c1fba changed type definition to check first char for r/w, last char of type starting with r for priority digit, and last char of non r/w types (=update type) for "w" indicating update write 2014-12-11 22:45:13 +01:00
john30 83605cc24d better naming, updated help 2014-12-10 23:12:09 +01:00
john30 0bd7df2ce1 switch ";" and "," but keep ";" for values shown in/parsed from UI, added todos, removed "p" for poll (use 1-9 instead), formatting 2014-12-10 23:11:34 +01:00
john30 d36b024876 implemented answering queries to ebusd, added missing repetition during bs_sendResAck when NAK was received, always log received data in trace level and reduced message length 2014-12-10 21:42:21 +01:00
john30 57dba2cba4 add "done" to result for successful BC+MM messages without other result 2014-12-10 21:32:40 +01:00
john30 ba2b404900 added prepareSlave for answering requests 2014-12-10 21:31:44 +01:00
john30 98a4be5f84 fixd dump to file with direct buffer, moved more complex method implementation from .h to .cpp file 2014-12-10 20:46:19 +01:00
john30 fa61067a0f file mode 2014-12-07 19:05:04 +01:00
john30 33fbe411dc Merge branch 'master' of git://github.com/yuhu-/ebusd 2014-12-07 18:09:16 +01:00
john30 665a9ee3b9 Merge branch 'master' of git://github.com/yuhu-/ebusd
Conflicts:
	src/ebusctl/ebusctl.cpp
	src/ebusd/Makefile.am
	src/ebusd/baseloop.cpp
	src/ebusd/baseloop.h
	src/ebusd/bushandler.cpp
	src/ebusd/bushandler.h
	src/lib/ebus/message.cpp
	src/lib/ebus/message.h
	src/lib/ebus/port.cpp
	src/lib/ebus/symbol.cpp
	src/lib/ebus/symbol.h
	src/lib/ebus/test/test_data.cpp
	src/lib/ebus/test/test_message.cpp
2014-12-07 15:19:45 +01:00
john30 51bf3dcd4e documentation 2014-12-07 14:59:13 +01:00
john30 41152a4031 file mode 2014-12-07 14:57:05 +01:00
john30 1a138dfe1c added polling by priority 2014-12-07 14:49:44 +01:00
john30 a8c1343218 added polling by priority 2014-12-07 14:45:33 +01:00
john30 dc6f5a0980 removed misleading SymbolString copy constructor 2014-12-07 14:44:14 +01:00
john30 2663c0ca76 avoid copying SymbolString 2014-12-07 14:24:38 +01:00
john30 0a87e9d853 avoid copying SymbolString 2014-12-07 14:23:55 +01:00
john30 3599378364 removed getReceivedData() 2014-12-07 10:00:57 +01:00
john30 d33cede5ea store last value in Message with update time 2014-12-07 10:00:26 +01:00
john30 4ffc6155a1 fixed escaping and crc 2014-12-07 09:43:49 +01:00
john30 8089dab4b4 solved todo 2014-12-06 23:50:31 +01:00
john30 f3f2e1a451 removed debug code 2014-12-06 23:49:00 +01:00
john30 8ef8418702 added cyc command 2014-12-06 23:43:04 +01:00
john30 5bbdcac5d4 store received data 2014-12-06 23:42:41 +01:00
john30 c0c1cf3966 allow passive messages to be found as well, added leadingSeparator to decode(), fixed default part for passive set 2014-12-06 23:41:14 +01:00
john30 97d4e40172 added set 2014-12-06 22:26:58 +01:00
john30 e173ba6ad5 removed commented stuff 2014-12-06 22:26:13 +01:00
john30 0325625a56 avoid cancelling request if part of the message is repeated 2014-12-06 22:01:12 +01:00
john30 c5c9c436dc extended raw logging to also include sent symbols, added optionas for and implemented: send+lock retries, lock counter, bus acquisition+slave receive timeout, switched to directly receiving bytes instead of queuing them, only send SYN when send is complete, adjusted default timeouts to include 2*1,2% tolerance 2014-12-06 21:48:33 +01:00
john30 62fc5046e2 added optional direct buffer to write to (instead of queuing the data), extended raw logging to include sent symbols 2014-12-06 21:24:24 +01:00
john30 c4812bd16c reduced DataField::read() and ::write() to a single SymbolString, adjusted BusHandler accordingly, fix for BusRequest::notify, added define for and corrected send timeout, added syn after failed send, fixed cleanup, reduced logging 2014-12-06 16:54:32 +01:00
john30 b0749c8662 fixes for get+hex 2014-12-06 16:54:14 +01:00
john30 f5a9f2b1d1 code style 2014-12-06 16:45:20 +01:00
john30 382da6215c reduced DataField::read() and ::write() to a single SymbolString, adjusted message accordingly 2014-12-06 16:44:52 +01:00
john30 b831df5eca corrected prepareMaster() 2014-12-06 15:33:46 +01:00
john30 1c63392869 unified output 2014-12-06 15:26:53 +01:00
john30 d71a9623e7 unified output 2014-12-06 15:26:33 +01:00
john30 fe66df7afa added missing code, formatting 2014-12-06 15:23:23 +01:00
john30 482e849a1e use result code 2014-12-06 15:22:41 +01:00
john30 2bd88f45db fix for walking through added messages 2014-12-06 13:46:52 +01:00
john30 73b74f1602 implemented get 2014-12-06 13:02:16 +01:00
john30 38f0ddbe78 simplified message type detection 2014-12-06 12:47:48 +01:00
john30 0e1e724f62 reworked result codes, added new base type VTI (vaillant specific time), added support for replacement value for time types 2014-12-06 12:47:01 +01:00
john30 15249302fb reworked result codes, added new base type VTI (vaillant specific time), added support for replacement value for time types 2014-12-06 12:46:15 +01:00
john30 9cea334407 better ==, added commented code for debug, added todo 2014-12-06 12:35:41 +01:00