wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
446 Commits 9 Branches 2 Tags
Commit Graph

196 Commits

Author SHA1 Message Date
Stefan Wahren
2335deb742 Fix segmentation fault 
- check if L Field is at least 3 to avoid crash (MBDOC48.PDF, page 23)
 2012-12-22 00:08:59 +01:00
Stefan Wahren
1080031879 Merge remote-tracking branch 'origin/master' 
Conflicts:
	mbus/mbus-protocol.c
 2012-12-20 20:57:33 +01:00
Stefan Wahren
404e245af5 replace magic number with define 2012-12-20 20:42:10 +01:00
Stefan Wahren
a4e92f6eab replace magic number with define 2012-12-20 20:12:19 +01:00
Stefan Wahren
746e611236 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mbus/mbus-protocol-aux.h
 2012-12-12 18:06:40 +01:00
Stefan Wahren
9b94df16b9 - add new type for context options 
- add new function mbus_context_set_option to set context specific
options like retransmission or echo cancelation
 2012-12-11 20:22:26 +01:00
Stefan Wahren
dc948566db remove unnecessary POSIX header 2012-12-10 21:26:48 +01:00
Stefan Wahren
72868fdc3f add a new helper function ( mbus_hex2bin ) to convert hex values 
into binary values
 2012-12-10 21:16:46 +01:00
aleax
72341baea5 Modify C header files to include from C++ code 2012-12-05 21:24:58 +02:00
Stefan Wahren
cfa35db086 Fixed potential segmentation fault 2012-10-22 23:35:45 +02:00
Stefan Wahren
688f0d3bc0 Added product name mapping for Elvaco meters 2012-10-21 23:24:04 +02:00
Stefan Wahren
bc2c85c378 Add custom VIFE handling with a corrective factor (from Jakob 
Skov-Pedersen)
 2012-10-21 11:21:07 +02:00
Stefan Wahren
0c26bc17a7 Add VIF for digital input and output 
Correct some cases
 2012-10-21 11:09:21 +02:00
Stefan Wahren
99d48d27b2 Extended mbus_data_variable_print to print out VIF/VIFE 2012-10-21 11:05:08 +02:00
Stefan Wahren
3de91c5eab Added product name mapping for Ista sensonic II mbus 2012-10-05 22:09:07 +02:00
Stefan Wahren
30ab8dd643 handle direction of ACK correctly 2012-10-04 23:20:28 +02:00
Stefan Wahren
fef774d98d Purge behavior as new context parameter (default = purge master to 
slave)
 2012-10-04 22:33:22 +02:00
Stefan Wahren
78f16f0248 New defines for purge behavior (echo cancelation) 2012-10-04 22:30:53 +02:00
Stefan Wahren
af80dda0d8 Revert "Extend mbus_recv_frame with simple echo cancelation" 
This reverts commit 169e37d360f5782dbbfe8bf9ccb5877cb6af7fb9.
 2012-10-03 23:25:10 +02:00
Stefan Wahren
169e37d360 Extend mbus_recv_frame with simple echo cancelation 2012-10-03 23:06:11 +02:00
Stefan Wahren
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
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
564483e092 new error message in case of unknown vif 2012-09-15 02:11:14 +02:00
Stefan Wahren
b55d038899 fixed typo in vif list 2012-09-15 02:06:08 +02:00
Stefan Wahren
1a538e73aa New parameter for mbus_send_ping_frame to purge response 2012-09-01 22:51:44 +02:00
Stefan Wahren
d2608d5de7 add allocation error handling 2012-09-01 22:14:21 +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
d816a1c30f Merge branch 'master' of github.com:rscada/libmbus 2012-07-25 00:04:16 +09: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
Robert Johansson
0ca0148bba Merge pull request #19 from lategoodbye/master 
Small bugfixes (retry counter, command args)
 2012-07-19 14:35:09 -07:00
Tmtom
3bc701e995 Corrected pkgnames/dirnames 2012-07-19 22:34:03 +02:00
Stefan Wahren
5467679f66 Reset retry counter after valid frame to be conform with M-Bus 
documentation
 2012-07-19 21:08:07 +02:00
Tmtom
db343cba2b First version of manpages. Added remaining baud rates for serial communication. 2012-07-17 21:50:02 +02:00
Stefan Wahren
08a4c55443 - Initialize maximum retry counter to 3 for serial and tcp connections 
- Retransmit request frame (just for mbus_sendrecv_request) in case of
timeout or invalid response
 2012-07-14 16:22:25 +02:00
Stefan Wahren
97f2ac34ba M-Bus handle extended by maximum retry counter (in case of transmission 
errors)
 2012-07-14 16:15:45 +02:00
Stefan Wahren
e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines 2012-07-11 23:33:52 +02:00
jakubovsky
b95f29fcc8 mbus_connect() and mbus_disconnect() return 0 on success and -1 otherwise 2012-07-09 12:33:32 +02:00
jakubovsky
5f9052b284 Renamed mbus_recv_frame_dummy() to more descriptive mbus_purge_frames() 2012-07-09 10:48:13 +02:00
jakubovsky
e70c07e8f3 TCP and serial specific data structs renamed. 2012-07-06 11:29:46 +02:00
jakubovsky
6b2d43617f Merge remote-tracking branch 'upstream/master' 2012-07-06 11:14:47 +02:00
jakubovsky
ec50ab9286 Examples from bin directory updated. API usage updated in mbus-protocol-aux.h. 2012-07-04 19:49:54 +02:00
jakubovsky
34255c7237 free_auxdata() added to mbus_handle interface for freeing context specific data 2012-07-04 19:08:51 +02:00
jakubovsky
645e5eb482 mbus_serial_connect() is ready 2012-07-04 18:38:50 +02: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
jakubovsky
9f9e0fc008 Fixed mbus_recv_frame() return value to -1 when invalid m-bus handle 2012-07-03 17:17:10 +02:00