Commit Graph

22 Commits

Author SHA1 Message Date
6166553755 Make my last change more readable.
As suggested by lategoodbye. Also make it more in line with the way
everything else is written.
2013-03-17 09:19:29 +01:00
b1063db3bc replace magic numbers with defines
fix MBUS_MAX_PRIMARY_SLAVES to 250
2013-03-02 18:03:31 +01:00
61fd2aa1c7 add new helper functions to check primary and secondary addresses 2012-12-31 13:37:17 +01:00
746e611236 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mbus/mbus-protocol-aux.h
2012-12-12 18:06:40 +01:00
dc948566db remove unnecessary POSIX header 2012-12-10 21:26:48 +01:00
72341baea5 Modify C header files to include from C++ code 2012-12-05 21:24:58 +02:00
688f0d3bc0 Added product name mapping for Elvaco meters 2012-10-21 23:24:04 +02:00
3de91c5eab Added product name mapping for Ista sensonic II mbus 2012-10-05 22:09:07 +02:00
d211c3cbcb new function mbus_frame_direction to get the direction of a frame
(slave to master or vice versa)
2012-10-03 23:03:05 +02:00
fe4217772c Added product name mapping for Sensus PolluCom E 2012-09-17 21:01:53 +02:00
e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines 2012-07-11 23:33:52 +02:00
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
989eada28a Improved model mapping
- initialize result buffer
- added new mappings
- added und fixed man codes
2012-05-29 20:33:09 +02:00
0cb23161e7 Added receive timestamp for each data record in XML output 2012-05-29 20:17:05 +02:00
f41b982093 New events for wildcard search 2012-05-20 03:22:02 +02:00
90aec91bff Added frame tracing (hex format) via debug switch 2012-05-15 22:57:03 +02:00
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
df06b93e97 Merge remote branch 'upstream/master'
Conflicts:
	mbus/mbus-protocol.c
2012-04-22 19:37:55 +02:00
e2400f5c27 Added new defines for decoding dif 2012-04-22 16:06:54 +02:00
5ce9a540ed Added error frames for testing 2012-04-22 15:53:54 +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
c10b37e53d got rid of duplicate catalog libmbus/libmbus 2012-04-15 10:51:15 +09:00