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

430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aarno Aukia
b6cbb1de1e merge rscada/master with arska/feature-ignoretestbinaries 2016-03-25 23:20:34 +01:00
Aarno Aukia
b9b131d064 Order device detection by manufacurer 
merging ELS so that TMP-A is detected again
 2016-02-08 14:06:24 +01:00
Stefan Wahren
ee2c4bada8 Merge pull request #96 from lategoodbye/upstream-merge2 
Upstream merge round #2
 2016-02-06 13:37:12 +01:00
Stefan Wahren
ed87f62a87 Add product strings for devices from ABB, Elster and Relay 
This patch adds product identification for:
* ABB Delta-Meter
* Elster Falcon
* Relay PadPuls M1
* Relay PadPuls M4
* Relay Padin 4
* Relay AnDi 4
* Relay PadPuls M2
 2016-02-06 12:04:13 +00:00
Stefan Wahren
a659ca0494 Add some hexdumps of M-Bus frames 2016-02-06 11:06:03 +00:00
Stefan Wahren
cf4d11b0fc Merge pull request #92 from arska/feature-macosxbuild 
Add Macos X build support (thanks @samkrew)
 2016-02-06 00:54:25 +01:00
Sam Krew
8af6b97647 Add MacOS X build support 2016-02-05 18:51:02 +01:00
Aarno Aukia
eaeb6e5502 retab and remove trailing whitespace 2016-02-05 14:42:16 +01:00
Aarno Aukia
c11ef4b830 add XML output for existing test cases 2016-02-05 14:42:15 +01:00
Aarno Aukia
9fb9f30a58 add new test cases from my lab 2016-02-05 14:42:15 +01:00
Aarno Aukia
7eaadad124 update existing test-case-output with the changes introduced in 781736fe4cbc78d4a14dc486b446dd813fd5aa20 2016-02-05 14:42:15 +01:00
Aarno Aukia
0751e0d88f remove exec bit from test cases 2016-02-05 14:42:12 +01:00
Aarno Aukia
b55422b034 move error test cases to their own folder 2016-02-05 14:41:05 +01:00
Aarno Aukia
89195f627a retab and remove trailing whitespace 2016-02-05 14:36:19 +01:00
Aarno Aukia
2170faa357 gitignore test binaries and testing temp files 2016-02-05 13:41:01 +01:00
Stefan Wahren
8b1c012a91 Add product strings of Janitza UMG 96S 2016-02-02 18:57:57 +00:00
Stefan Wahren
012dc5ba36 Merge pull request #91 from lategoodbye/upstream-merge 
Upstream merge
 2016-01-31 19:19:03 +01:00
Stefan Wahren
db40010b93 Add product strings of Berg DCMi, BLMi and BMB-10S0 2016-01-31 18:09:21 +00:00
Stefan Wahren
04eae740b4 Add product strings of Carlo Gavazzi EM21,EM24,EM33 2016-01-31 18:00:02 +00:00
Stefan Wahren
0927f23ee7 Let mbus_str_xml_encode return a resultcode 2016-01-31 17:55:09 +00:00
Stefan Wahren
3699d25b10 Fix uninitialized strings 2016-01-31 17:44:08 +00:00
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