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

82 Commits

Author SHA1 Message Date
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
jakubovsky
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
Stefan Wahren
2093b4a9c0 Merge remote-tracking branch 'upstream/master' 2012-06-23 14:29:14 +02:00
Stefan Wahren
0d610b6a27 - fixed check of mbus_sendrecv_request and mbus_recv_frame 
- initialize memory in mbus_sendrecv_request
- used defines for special address instead of magic numbers
 2012-06-20 00:21:28 +02:00
Robert Johansson
82aec2ff97 repo cleanup, no need for .in files in the repository 2012-06-18 21:11:49 +09:00
Stefan Wahren
7c304b34a0 Always wait until complete frame has been transmitted 2012-06-11 21:22:31 +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
9fd35b781b Improved collision detection for scan 2012-05-29 19:39:56 +02:00
Stefan Wahren
ad4d307b57 Fixed endless loop in receive function in case of a incomplete frame 
(limit = 3 timeouts)
 2012-05-29 19:15:52 +02:00
Stefan Wahren
56bbccc0c1 Added a new function to select a device by it's secondary address 2012-05-20 03:58:16 +02:00
Stefan Wahren
ef630f2e5d Added a new function to select a device by it's secondary address 2012-05-20 03:52:15 +02:00