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

420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Wahren
663642b7ec Adopt retransmission for secondary address probing 2013-10-19 13:56:58 +02:00
Stefan Wahren
e6173103e2 Avoid unnecessary data request in mbus_read_slave 2013-10-19 13:43:00 +02:00
Stefan Wahren
b674dfcf24 Use new retransmission option and handle member 2013-10-19 11:44:37 +02:00
Stefan Wahren
31016929bc Seperate retransmission maximum in two parameters 
one for data requests and another for search requests
- add new handle member for max search retransmission
- set default maximum for search retransmission to one
- rename define for retransmission option
 2013-10-18 20:15:53 +02:00
Stefan Wahren
7ca329ee40 Add product name mapping for Rossweiner Modularis 2013-10-18 17:32:22 +02:00
Stefan Wahren
fc8392de91 Merge remote-tracking branch 'upstream/master' 2013-10-17 15:55:57 +02:00
Stefan Wahren
d54b594696 Sync behavior to mbus-serial-request-data-multi-reply 
- init slaves before requesting data
- free ressources before exit
- refactor data request
- fix comments
 2013-10-17 14:17:57 +02:00
Stefan Wahren
28b73bf9d8 Add manufacturer ID for Rossweiner 2013-10-17 13:45:45 +02:00
Robert
ef0f05c460 Merge pull request #60 from lategoodbye/master 
Improve event handling and support to send user data
 2013-10-15 09:37:35 -07:00
Stefan Wahren
c2a3f4b871 Fix event handling after moving callbacks to mbus handle 2013-10-13 21:56:15 +02:00
Stefan Wahren
0cf57bfc35 Move event handling from global variable to handle 
- remove global event function pointer
- add event function pointer to handle structure
- add handle parameter to register functions
- move all register functions to mbus-protocol-aux.c
 2013-10-13 21:49:40 +02:00
Stefan Wahren
9e23818152 Add new function to send a user data packet from master to slave 2013-10-13 14:52:45 +02:00
Stefan Wahren
d5f06ec910 Replace magic number for M-Bus frame data length with define 2013-10-05 10:38:07 +02:00
Robert
3e24215e51 Merge pull request #59 from lategoodbye/master 
Remove trailing whitespace
 2013-10-02 06:58:45 -07:00
Stefan Wahren
55d4c0fba2 Remove trailing whitespace 
Signed-off-by: Stefan Wahren <info@lategoodbye.de>
 2013-09-13 17:53:33 +02:00
Robert Johansson
654905a94d bug fix in timeout config 2013-08-30 00:20:35 +09:00
Robert Johansson
fd5c9adffb made it possible to configure the TCP read timeout parameter 2013-08-30 00:05:22 +09:00
Robert Johansson
84ffacadff Merge pull request #57 from lategoodbye/master 
New option for normalized output, new test frames, unit fix
 2013-08-03 19:35:59 -07:00
Stefan Wahren
d9dd055bea Fix mbus_vib_unit_lookup 
remove unreachable code
add missing unit password
fix typo

Signed-off-by: Stefan Wahren <info@lategoodbye.de>
 2013-08-03 16:35:09 +02:00
Stefan Wahren
c8aaa8dc32 Add new test frames from Elster Falcon and Relay Padpuls 
Signed-off-by: Stefan Wahren <info@lategoodbye.de>
 2013-08-03 16:23:20 +02:00
Stefan Wahren
fb84fd11a8 Add additional check if directory is empty or hex file doesn't exists 2013-08-03 15:51:34 +02:00
Stefan Wahren
55c2bf0dee Add normalized values option -n 
Add file pointer check after fread
 2013-07-17 22:21:07 +02:00
Robert Johansson
8f61edc85d remove the CUnit based unit test, since it does not work well (does not show which test that is failing...). instead we can use Stefan's nice generate-xml.sh which show exactly which test frames fails and the diff. 2013-07-05 00:12:38 +09:00
Robert Johansson
87cadafea0 updated XML files for test frames 2013-07-05 00:07:03 +09:00
Robert Johansson
5160a10211 fixed warning 2013-07-04 23:59:41 +09:00
Robert Johansson
b1473adc46 fixed warning 2013-07-04 23:49:42 +09:00
Robert Johansson
5b83cad8fb only show timestamp in XML output if it is set (not all frames that goes into mbus_parse passes through timestamp), to avoid a lot of '<Timestamp>1970-01-01T00:00:00</Timestamp>' 2013-07-04 23:47:06 +09:00
Robert Johansson
1fee3d9a5a bug fix: don't assume that frame->next is zeroed before mbus_parse is called 2013-07-04 23:30:27 +09:00
Robert Johansson
a8f5c07fcf Merge pull request #56 from lategoodbye/master 
Improve wildcard search, fix leaks and segfault
 2013-07-04 07:04:58 -07:00
Stefan Wahren
dcc9e2c2b4 fix indent 2013-07-03 20:52:27 +02:00
Stefan Wahren
7b897494fd Improve wildcard search 
- handle collisions after request for secondary address
- check frame type correctly
- ignore M-Bus devices without secondary address
 2013-07-03 20:46:47 +02:00
Stefan Wahren
70f23567a8 fix potential segmentation fault 2013-07-03 20:36:43 +02:00
Stefan Wahren
551176911f fix memory leaks in error case 2013-07-03 20:34:30 +02:00
Stefan Wahren
8dd1d4e4ae bugfix for +1 error in VIFE parser 
now VIFE and DIFE behave equal
 2013-07-03 20:30:20 +02:00
Robert Johansson
88b2b9fafa bugfix in VIFE parser 2013-07-03 22:50:03 +09:00
Robert Johansson
0a0403988c improve error message in request data programs 2013-07-03 22:31:57 +09:00
Robert Johansson
e1164c87c9 error message if secondary address generation fails 2013-07-03 22:20:44 +09:00
Robert Johansson
31f17ab4c2 use error_str instead of direct console output 2013-07-03 22:18:06 +09:00
Robert Johansson
973cc7ba30 use MBUS_ERROR instead of fprintf(stderr 2013-07-03 22:11:13 +09:00
Robert Johansson
655e3c897d Merge pull request #55 from lategoodbye/master 
Improve multi reply binaries
 2013-07-01 07:09:18 -07:00
Stefan Wahren
8b9d6e735e sync mbus-tcp-request-data-multi-reply with serial 
make init_slaves and parse_abort static
fix return value of parse_abort
remove unused variables
free resources before exit
 2013-07-01 08:16:20 +02:00
Stefan Wahren
2ca73eefa1 add new parameter f to man page 
add range for TCP port
 2013-07-01 08:09:01 +02:00
Robert Johansson
0f0882d4fa Merge pull request #54 from lategoodbye/master 
Add missing file mbus-tcp-application-reset.c
 2013-06-29 07:13:06 -07:00
Robert Johansson
18987c7887 Merge pull request #53 from minusinf/master 
Added frame "-f" to option to mbus-serial-request-data-multi-reply to specify frames needed for request
 2013-06-29 07:12:56 -07:00
Stefan Wahren
2c03cab529 Add missing file mbus-tcp-application-reset from issue #42. 
This will fix also issue #52.
 2013-06-28 18:59:04 +02:00
Pascal Spoerri
a61714d26d Added frame option to mbus-serial-request-data-multi-reply 
Improved parsing
 2013-06-28 14:10:15 +00:00
Robert Johansson
158208c2b1 Merge pull request #51 from lategoodbye/master 
Improve data parsing
 2013-06-22 02:47:17 -07:00
Stefan Wahren
dd56a08811 Improve data parsing 
- add length defines for variable data header and fixed data
- add size check for fixed data
- avoid problems with memory alignment / padding in mbus structures
(improve portability)
- abort parsing if there are too many DIFE or VIFEs
- check for premature end of variable data
- check size of variable length VIF
 2013-06-22 11:50:36 +02:00
Stefan Wahren
3381d1b41d test cases for invalid telegrams 
- too short fixed data length (invalid_length2.hex)
- premature end of record at data (premature_end_of_data1.hex,
premature_end_of_data2.hex)
- premature end of record at DIF (premature_end_of_dif1.hex,
premature_end_of_dif2.hex)
- premature end of record at variable length VIF
(premature_end_of_var_vif1.hex)
- premature end of record at VIF (premature_end_of_vif1.hex)
- too long variable length VIF (too_long_var_vif.hex)
- too many DIFE (too_many_dife.hex)
- too many VIFE (too_many_vife.hex)
- too short variable header (too_short_header.hex)
 2013-06-21 08:45:22 +02:00
Robert Johansson
c4ceb5c057 Merge pull request #50 from lategoodbye/master 
Fixed correction in auxiliary function
 2013-06-16 05:24:15 -07:00