33 Commits

Author SHA1 Message Date
Stefan Wahren
d6c5529247 new function mbus_frame_direction to get the direction of a frame
(slave to master or vice versa)
extended mbus_frame_data_parse to check the direction of a frame
2012-10-03 23:01:44 +02:00
Stefan Wahren
fe4217772c Added product name mapping for Sensus PolluCom E 2012-09-17 21:01:53 +02:00
Stefan Wahren
1ae8869d7b convert all control chars into spaces to be xml 1.0 conform 2012-09-16 18:15:55 +02:00
Stefan Wahren
e653894bce Merge remote-tracking branch 'upstream/master' 2012-08-25 09:09:50 +02:00
Robert Johansson
dbd69e49f5 make sure that records are initialized to avoid potential core dumps after incomplete parsning and repacking 2012-08-12 19:08:14 +09:00
Stefan Wahren
166b93a1b1 Added product name mapping for Kamstrup 382 2012-07-25 00:09:11 +02:00
Robert Johansson
ed61932579 fixed bug in float point decoding. previously failed when exponent<0. 2012-07-24 23:59:20 +09:00
Robert Johansson
4af9518ce5 correct fprintf format type for size_t 2012-07-24 23:11:02 +09:00
jakubovsky
c848090f56 Rebuilding M-Bus context structs in progress
- changed local library file includes from <> to ""
- get rid of 'if (is_serial)' conditions
- mbus_context_serial() and mbus_context_tcp() allocates memory and initialize context specific function pointers
- simply mbus_connect() called instead of mbus_connect_tcp() or mbus_connect_serial()
- context specific data can still be accessed via (void* auxdata) pointer
- strdup(3) to copy host IP into TCP context struct
2012-07-04 17:18:36 +02:00
Stefan Wahren
f492e97186 Improved model mapping
- added und fixed mapping
2012-06-10 19:19:46 +02:00
Stefan Wahren
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
Stefan Wahren
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
Stefan Wahren
989eada28a Improved model mapping
- initialize result buffer
- added new mappings
- added und fixed man codes
2012-05-29 20:33:09 +02:00
Stefan Wahren
0cb23161e7 Added receive timestamp for each data record in XML output 2012-05-29 20:17:05 +02:00
Stefan Wahren
f41b982093 New events for wildcard search 2012-05-20 03:22:02 +02:00
Stefan Wahren
11f6392df3 Fixed potential segmentation faults 2012-05-18 13:35:02 +02:00
Stefan Wahren
f7c644bee6 Fixed output format of secondary address (always 16 digits, leading
zeros)
2012-05-15 23:06:14 +02:00
Stefan Wahren
8e56943fc8 Merge remote branch 'upstream/master' 2012-05-15 23:01:13 +02:00
Stefan Wahren
90aec91bff Added frame tracing (hex format) via debug switch 2012-05-15 22:57:03 +02:00
Stefan Wahren
61893a1b3d Fixed gcc warnings 2012-05-14 00:30:15 +02:00
Stefan Wahren
4178ffceb1 Added access to DRH in xml output function for data records 2012-05-14 00:26:41 +02:00
Stefan Wahren
5a7e69f90d Merge remote branch 'upstream/master'
Conflicts:
	mbus/mbus-serial.c
2012-05-14 00:09:05 +02:00
Stefan Wahren
8f48d75fb0 Added 2 event callbacks to handle send and receive events outside the
library
(now it is possible to trigger a led from an application if m-bus data
is received)
2012-05-13 23:57:24 +02:00
Robert Johansson
29201258e7 in mbus_frame_print for dumping frame in HEX format to stdout, now looping over all frames in a multi-telegram frame list 2012-05-13 16:33:53 +09:00
Stefan Wahren
6dd17954d2 Added check to avoid segmentation fault 2012-05-06 21:55:39 +02:00
Stefan Wahren
df06b93e97 Merge remote branch 'upstream/master'
Conflicts:
	mbus/mbus-protocol.c
2012-04-22 19:37:55 +02:00
Stefan Wahren
243564a275 Fixed return value for packing error frame 2012-04-22 16:12:01 +02:00
Stefan Wahren
1db372e7ab Improved error message in case of unknown Control Code 2012-04-22 16:09:38 +02:00
Stefan Wahren
e2400f5c27 Added new defines for decoding dif 2012-04-22 16:06:54 +02:00
Stefan Wahren
5ce9a540ed Added error frames for testing 2012-04-22 15:53:54 +02:00
Robert Johansson
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
Stefan Wahren
65b04fc6cb Added verification of control field 2012-04-18 21:16:27 +02:00
Robert
c10b37e53d got rid of duplicate catalog libmbus/libmbus 2012-04-15 10:51:15 +09:00