Commit Graph

312 Commits

Author SHA1 Message Date
34e3e3f8f9 cleaned up debian packaging directory 2012-06-18 21:06:44 +09:00
9e637e7752 added debian packaging files 2012-06-18 21:04:59 +09:00
d8819cb21f Merge pull request #12 from lategoodbye/master
Improved serial communication
2012-06-11 20:40:00 -07:00
7c304b34a0 Always wait until complete frame has been transmitted 2012-06-11 21:22:31 +02:00
2f5476c3a5 Removed sleep workaround 2012-06-10 19:23:59 +02:00
f492e97186 Improved model mapping
- added und fixed mapping
2012-06-10 19:19:46 +02:00
1a742682c7 Merge pull request #11 from lategoodbye/master
More bugfixes for scan and data readout
2012-05-29 17:59:53 -07:00
49b49d077b Sync behaviour from serial to TCP connections 2012-05-29 21:34:20 +02:00
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
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
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
9fd35b781b Improved collision detection for scan 2012-05-29 19:39:56 +02:00
ad4d307b57 Fixed endless loop in receive function in case of a incomplete frame
(limit = 3 timeouts)
2012-05-29 19:15:52 +02:00
198a0df8f0 Merge pull request #10 from lategoodbye/master
A lot of bugfixes especially for serial connections
2012-05-20 05:47:30 -07:00
dd97141f21 Removed directory test from building (not so good idea) 2012-05-20 13:03:03 +02:00
cc39adc36a Fixed bug in wildcard search
- use valid reply to receive select result
2012-05-20 04:08:15 +02:00
56bbccc0c1 Added a new function to select a device by it's secondary address 2012-05-20 03:58:16 +02:00
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
ef630f2e5d Added a new function to select a device by it's secondary address 2012-05-20 03:52:15 +02:00
d12d7dd052 Fixed bug in multi telegram readout with secondary address
- init slave before selecting secondary address
2012-05-20 03:44:06 +02:00
1fb68d1e05 Fixed primary address scan
- scan only normal addresses (0-250)
- show collisions in scan result
2012-05-20 03:35:04 +02:00
eb96afcd7c Added new messages after changing baud rate 2012-05-20 03:31:05 +02:00
a60277a5e6 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git 2012-05-20 03:25:30 +02:00
f41b982093 New events for wildcard search 2012-05-20 03:22:02 +02:00
67af972e69 Added a new product name database 2012-05-20 03:12:10 +02:00
45ebed05b7 Added error message in case of invalid parameter 2012-05-20 03:05:26 +02:00
0ed30c1ad9 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git 2012-05-20 02:58:56 +02:00
9154fee1c4 Merge remote branch 'upstream/master' 2012-05-20 02:56:44 +02:00
03d4876425 New events for wildcard search 2012-05-20 02:52:11 +02:00
c6031f3287 Added missing header file 2012-05-20 02:39:29 +02:00
9817d00329 Fixed potential segmentation fault 2012-05-18 14:14:17 +02:00
b055dc612f Replaced deprecated BSD against ANSI functions (bzero -> memset, bcopy
-> memcopy)
2012-05-18 13:55:43 +02:00
11f6392df3 Fixed potential segmentation faults 2012-05-18 13:35:02 +02:00
567fa74660 Merge pull request #9 from lategoodbye/f14b3beb84101c90c8eea0cc024f6ce658dea4ab
Fixed bugs with serial connection
2012-05-16 00:30:52 -07:00
2c98c6c54d Added test directory to automake 2012-05-15 23:43:39 +02:00
f2919f97ca Switch back to default output 2012-05-15 23:35:13 +02:00
f14b3beb84 Fixed bugs in wildcard search
- init slaves before search
- corrected return codes
- handle collisions (possibly more bytes than expected)
- sync recv frame (tcp vs serial)
- add tracing
2012-05-15 23:30:55 +02:00
980bbb1862 Fixed baud rate switching:
- added missing call of tcsetattr
- handle return values
- adjust timeout correctly
2012-05-15 23:17:49 +02:00
f7c644bee6 Fixed output format of secondary address (always 16 digits, leading
zeros)
2012-05-15 23:06:14 +02:00
8e56943fc8 Merge remote branch 'upstream/master' 2012-05-15 23:01:13 +02:00
90aec91bff Added frame tracing (hex format) via debug switch 2012-05-15 22:57:03 +02:00
29aab5b395 Merge pull request #8 from lategoodbye/master
Introducing event handling
2012-05-13 18:58:16 -07:00
61893a1b3d Fixed gcc warnings 2012-05-14 00:30:15 +02:00
4178ffceb1 Added access to DRH in xml output function for data records 2012-05-14 00:26:41 +02:00
5a7e69f90d Merge remote branch 'upstream/master'
Conflicts:
	mbus/mbus-serial.c
2012-05-14 00:09:05 +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
7d482e47f7 use the max frame limit 16 also for serial multi-telegram transfers (some devices does not seems to stop reporting 'more data follows', so unless we set a hard limit it will loop forever. so this limit should probably be made a cmd line argument) 2012-05-13 16:39:48 +09:00
dadf3b4823 added a debug/verbose flag to the primary address scan utils 2012-05-13 16:34:34 +09:00
726f837d2d improved error handling 2012-05-13 16:34:12 +09:00