Commit Graph

32 Commits

Author SHA1 Message Date
5d724d9473 Initialize reply structures to avoid segmentation fault in debug 2012-07-13 22:59:26 +02:00
e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines 2012-07-11 23:33:52 +02:00
b95f29fcc8 mbus_connect() and mbus_disconnect() return 0 on success and -1 otherwise 2012-07-09 12:33:32 +02:00
5f9052b284 Renamed mbus_recv_frame_dummy() to more descriptive mbus_purge_frames() 2012-07-09 10:48:13 +02:00
78a6013d75 mbus_recv_dummy() instead of while loop. 2012-07-06 11:21:24 +02:00
6b2d43617f Merge remote-tracking branch 'upstream/master' 2012-07-06 11:14:47 +02:00
433744c80a Fix problem with multiple selected devices (secondary address)
- resend SND_NKE to ensure all devices are deselected, because the first
SND_NKE could get lost
2012-07-04 21:21:01 +02:00
736181b35e Revert "Fix problem with multiple selected devices (secondary address) resend "
This reverts commit 1fa5e202fb.
2012-07-04 21:15:55 +02:00
1fa5e202fb Fix problem with multiple selected devices (secondary address)
resend
2012-07-04 21:14:00 +02:00
ec50ab9286 Examples from bin directory updated. API usage updated in mbus-protocol-aux.h. 2012-07-04 19:49:54 +02:00
5d079254cc Extended mbus_recv_frame() error codes, improved collision handling
- handling TCP connection reset and read(2) timeout
2012-07-03 14:35:07 +02:00
2093b4a9c0 Merge remote-tracking branch 'upstream/master' 2012-06-23 14:29:14 +02:00
d025b27b07 - fixed check of mbus_sendrecv_request and mbus_recv_frame
- initialized memory in mbus_sendrecv_request
- used defines for special address instead of magic numbers
2012-06-20 00:23:25 +02:00
82aec2ff97 repo cleanup, no need for .in files in the repository 2012-06-18 21:11:49 +09:00
2f5476c3a5 Removed sleep workaround 2012-06-10 19:23:59 +02:00
49b49d077b Sync behaviour from serial to TCP connections 2012-05-29 21:34:20 +02:00
bf12395af9 Fixed segmentation fault in case of much XML output
Because of the multi telegrams it is impossible to use a fixed
buffer for XML output on the stack. Now the buffer is allocated on the
heap. These also leads to a change in return behaviour for all XML
functions, because it's possible that the buffer is NULL. For variable
data this buffer grows every time there are less than 1024 bytes left
for a new record.
2012-05-29 21:24:30 +02:00
c2f7c0d48e Improved wildcard search results (still not all meters were found)
- sleep 1 second after each init frame
- select secondary address with enabled FCB bit
2012-05-29 20:51:34 +02:00
cc39adc36a Fixed bug in wildcard search
- use valid reply to receive select result
2012-05-20 04:08:15 +02:00
69bc06eeb1 Improved readout by secondary address
- save 1 REQ_UD2 by selecting instead of probing seconday address
2012-05-20 03:55:36 +02:00
d12d7dd052 Fixed bug in multi telegram readout with secondary address
- init slave before selecting secondary address
2012-05-20 03:44:06 +02:00
1fb68d1e05 Fixed primary address scan
- scan only normal addresses (0-250)
- show collisions in scan result
2012-05-20 03:35:04 +02:00
eb96afcd7c Added new messages after changing baud rate 2012-05-20 03:31:05 +02:00
f14b3beb84 Fixed bugs in wildcard search
- init slaves before search
- corrected return codes
- handle collisions (possibly more bytes than expected)
- sync recv frame (tcp vs serial)
- add tracing
2012-05-15 23:30:55 +02:00
90aec91bff Added frame tracing (hex format) via debug switch 2012-05-15 22:57:03 +02:00
7d482e47f7 use the max frame limit 16 also for serial multi-telegram transfers (some devices does not seems to stop reporting 'more data follows', so unless we set a hard limit it will loop forever. so this limit should probably be made a cmd line argument) 2012-05-13 16:39:48 +09:00
dadf3b4823 added a debug/verbose flag to the primary address scan utils 2012-05-13 16:34:34 +09:00
726f837d2d improved error handling 2012-05-13 16:34:12 +09:00
74bb173147 Added multi-telegram support for serial connection 2012-04-23 20:56:26 +02:00
281394c092 attempt to unify the XML output for sequences of multi-telegram frames (single XML document, global record counts, no repeat of frame headers) 2012-04-21 08:34:01 +09:00
a65a96e333 Fixed usage 2012-04-16 21:01:29 +02:00
c10b37e53d got rid of duplicate catalog libmbus/libmbus 2012-04-15 10:51:15 +09:00