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

343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert
57fceeb09a Merge pull request #69 from schnurksel/fix_storage_unit_tariff_calculation 
bugfix storage/device/tariff caculation
 2014-02-22 12:49:41 +09:00
Dirk Zenker
8197874fe7 bugfix, the functions 
mbus_data_record_storage_number()
  mbus_data_record_tariff()
  mbus_data_record_device()
did return bogus random values, because of uninitialized variables
 2014-02-20 11:26:31 +01:00
Robert
3062c797a9 Merge pull request #66 from mhei/fixes 
gitignore: add mbus-tcp-application-reset
 2014-02-06 23:34:05 +09:00
Robert
9e81912a20 Merge pull request #65 from mhei/manufacturer-id 
Add a function to calculate the manufacturer ID from the 3 byte ASCII
 2014-02-06 23:33:47 +09:00
Michael Heimpold
f262138572 mbus_manufacturer_id: add error checking code 
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2014-01-18 20:43:57 +01:00
Michael Heimpold
0fccc0e337 Add a function to calculate the manufacturer ID from the 3 byte ASCII 
code. The formula can be found at http://www.m-bus.com/files/w4b21021.pdf,
chapter 3.3 at page 6.

This obsoletes the static defines, so remove them.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2014-01-18 13:44:01 +01:00
Michael Heimpold
6abc6cd15d gitignore: add mbus-tcp-application-reset 
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2014-01-18 13:23:33 +01:00
Robert
0102dc6ae5 Merge pull request #64 from lategoodbye/master 
Fix decoding and 2nd address search
 2013-11-12 05:36:49 -08:00
Stefan Wahren
a32e325979 Update XML files because of storage number, tariff and 
device
 2013-11-07 12:06:09 +01:00
Aarno Aukia
f42c56f19c fix 2nd address scanning bug, add some comments 
code merge from arska/libmbus without debug
 2013-11-07 11:14:15 +01:00
Stefan Wahren
0d9f83ba88 Extend XML output with storage number, tariff and device 2013-11-07 00:32:01 +01:00
Stefan Wahren
e1ca652bf0 Extend mbus_record with storage number, tariff and device 2013-11-07 00:31:03 +01:00
Stefan Wahren
58778ba9bc Add functions to decode storage number, tariff and device from DIF 2013-11-07 00:24:11 +01:00
Stefan Wahren
d79cb1c998 Fix BCD decoding bug 2013-11-07 00:13:56 +01:00
Stefan Wahren
e9d39d4708 Extend DIF debug output (storage number LSB) 
Fix DIFE debug output (storage number, tariff, device unit)
Fix typos in comments
Replace magic bit masks with defines
 2013-11-06 11:11:43 +01:00
Stefan Wahren
3aa81cfb23 Add DIF extension bit masks 2013-11-06 10:15:15 +01:00
Stefan Wahren
7f00f72b69 Add missing VIF=7Eh / FEh 2013-11-01 17:17:57 +01:00
Stefan Wahren
6021f3cc65 Fix VIF extension mappings for VIF=0FBh 2013-11-01 17:13:49 +01:00
Stefan Wahren
887d6a2914 Add test frame for GMC EMMOD 206 2013-10-31 23:05:39 +01:00
Stefan Wahren
4b82502c06 Add product name mapping for GMC-I EMMOD206 2013-10-31 23:01:06 +01:00
Stefan Wahren
9d84318631 Add manufacturer ID for GMC 2013-10-31 22:59:59 +01:00
Stefan Wahren
6ffa521473 Update XML after fixing bug with signed integer 2013-10-31 22:27:48 +01:00
Stefan Wahren
6afe7a10dc fix wrong decoding of integer / type B (now handle signedness correctly) 
separate result code und decoded value for integer decoding (new
parameter)
refactor variable names
 2013-10-31 22:25:34 +01:00
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