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

143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Wahren
7a83f7931d Fixed command args handling of mbus-serial-scan-secondary 2012-07-19 20:09:24 +02:00
Stefan Wahren
555c627665 Removed unnecessary sleep 2012-07-14 16:25:52 +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
c86ed10af7 Fixed result check for mbus_connect 2012-07-13 23:01:29 +02:00
Stefan Wahren
5d724d9473 Initialize reply structures to avoid segmentation fault in debug 2012-07-13 22:59:26 +02:00
Robert Johansson
198e9afcef Merge pull request #15 from lategoodbye/master 
Removed magic numbers and added new test frames
 2012-07-12 16:59:51 -07:00
Stefan Wahren
e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines 2012-07-11 23:33:52 +02:00
Stefan Wahren
ff37c4af8c Added test frames: 
- ABB F95
- Allmess Megacontrol CF-50
- Elster TMP-A
- EMH DIZ
- NZR DMZ 5/63
 2012-07-11 22:41:13 +02:00
Robert Johansson
9ef64d0fb5 added contributor 2012-07-10 19:52:47 +09:00
Robert Johansson
69373692b1 Merge pull request #14 from jakubovsky/master 
Few improvements
 2012-07-09 08:03:41 -07: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
78a6013d75 mbus_recv_dummy() instead of while loop. 2012-07-06 11:21:24 +02:00
jakubovsky
6b2d43617f Merge remote-tracking branch 'upstream/master' 2012-07-06 11:14:47 +02:00
Robert Johansson
d7f63586c6 Merge pull request #13 from lategoodbye/master 
Few bugfixes
 2012-07-05 06:30:52 -07:00
Stefan Wahren
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
Stefan Wahren
736181b35e Revert "Fix problem with multiple selected devices (secondary address) resend " 
This reverts commit 1fa5e202fb5af6c343d0597693185aa406dda7a9.
 2012-07-04 21:15:55 +02:00
Stefan Wahren
1fa5e202fb Fix problem with multiple selected devices (secondary address) 
resend
 2012-07-04 21:14:00 +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
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
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 0.8.0 2012-06-18 21:11:49 +09:00
Robert Johansson
d3e4decf59 maintenance updates for new release 0.8.0 2012-06-18 21:08:10 +09:00
Robert Johansson
34e3e3f8f9 cleaned up debian packaging directory 2012-06-18 21:06:44 +09:00
Robert Johansson
9e637e7752 added debian packaging files 2012-06-18 21:04:59 +09:00
Robert Johansson
d8819cb21f Merge pull request #12 from lategoodbye/master 
Improved serial communication
 2012-06-11 20:40:00 -07:00
Stefan Wahren
7c304b34a0 Always wait until complete frame has been transmitted 2012-06-11 21:22:31 +02:00
Stefan Wahren
2f5476c3a5 Removed sleep workaround 2012-06-10 19:23:59 +02:00
Stefan Wahren
f492e97186 Improved model mapping 
- added und fixed mapping
 2012-06-10 19:19:46 +02:00
Robert Johansson
1a742682c7 Merge pull request #11 from lategoodbye/master 
More bugfixes for scan and data readout
 2012-05-29 17:59:53 -07:00
Stefan Wahren
49b49d077b Sync behaviour from serial to TCP connections 2012-05-29 21:34:20 +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
Robert Johansson
198a0df8f0 Merge pull request #10 from lategoodbye/master 
A lot of bugfixes especially for serial connections
 2012-05-20 05:47:30 -07:00
Stefan Wahren
dd97141f21 Removed directory test from building (not so good idea) 2012-05-20 13:03:03 +02:00
Stefan Wahren
cc39adc36a Fixed bug in wildcard search 
- use valid reply to receive select result
 2012-05-20 04:08:15 +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
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