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

359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Wahren
f6dcf6e8d1 Fixed naming in declaration 
Signed-off-by: Stefan Wahren <info@lategoodbye.de>
 2016-01-31 17:41:08 +00:00
Stefan Wahren
5674b30a6c Make use of package version from autotools 
Signed-off-by: Stefan Wahren <info@lategoodbye.de>
 2016-01-31 17:40:58 +00:00
Robert
bce4c6959b Merge pull request #87 from vrtsystems/ieee754-conversion 
IEEE754 conversion
 2015-12-30 10:17:24 +09:00
Stuart Longland
ef6c4be655
Safer IEEE754 conversion. 
The conversion given assumed two things:

1. the pointer was either 32-bit aligned or that unaligned word access
   was safe.  (Not the case on ARM)

We avoid this by using memcpy to copy to a buffer that *is*
32-bit-word-aligned.

2. the word was in native-endian format.

The original code appeared to assume the given word would be in
big-endian format (aka "network" byte order), so we convert it to the
host's native format before casting.

We re-instate the original implementation, controlled by a compiler
switch to allow easy rollback if problems are encountered.
 2015-12-03 08:08:22 +10:00
jakubovsky
583a397e8e
Needless math.h include 2015-12-03 07:52:23 +10:00
jakubovsky
7e1be93dbd
Needless IEEE754 conversion, float pointer cast instead 2015-12-03 07:51:26 +10:00
Stefan Wahren
716d712314 Merge pull request #74 from schnurksel/hex_dump 
Hex dump
 2015-04-11 12:36:03 +02:00
Stefan Wahren
90bb12f9b0 Merge pull request #72 from schnurksel/beautify_tabs_spaces 
Beautify tabs and spaces
 2015-04-11 12:35:45 +02:00
Stefan Wahren
1bc9f72c27 Merge pull request #71 from schnurksel/add_meter_strings 
Add meter strings
 2015-04-11 11:57:16 +02:00
Stefan Wahren
576cefe80a Merge pull request #70 from schnurksel/add_codepage_to_xml_output 
add codepage to XML output
 2015-04-11 11:55:41 +02:00
Robert
53d66c3dd5 Merge pull request #79 from mhei/master 
Add hint file for Travis CI
 2015-03-07 17:52:06 +09:00
Michael Heimpold
2dea1b99f3 Add hint file for Travis CI 
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2015-01-25 11:28:28 +01:00
Dirk Zenker
00d0fc0aaf add hex dump for regression tests as requested by lategoodbye 2014-03-13 13:33:28 +01:00
Dirk Zenker
5f0b5d5dd1 Beautify: replace tabs with spaces and remove trailing spaces 2014-02-24 15:20:42 +01:00
Dirk Zenker
f47caf151e add manufacturer id / product string of some meters: 
Aquametro CALEC MB
Aquametro CALEC ST
Elster SensoStar 2
Elster F96 Plus
Elster F4
EMU Professional 3/75 M-Bus
Deltamess F2
Sensus PolluTherm
Sensus PolluStat E
NZR IC-M2
Saia-Burgess ALE3
Saia-Burgess AWD3
 2014-02-24 11:22:40 +01:00
Dirk Zenker
781736fe4c add codepage to XML output 2014-02-24 11:02:26 +01:00
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