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
Fredrik Skold
a5c401cb42 Move invalid_length*.hex to test/unsupported-frames (#165) 2020-07-19 11:18:28 +02:00
Stefan Wahren
60c3e7b36c Move RVD235 out of unsupported 
Especially after the recent changes, we can consider Siemens RVD235 as
supported.
 2020-07-19 11:18:23 +02:00
Stefan Wahren
13e3908bbd Remove duplicate 
rvd235.hex is the same as siemens_rvd235.hex
 2020-07-19 11:18:19 +02:00
Stefan Wahren
1286df041c Add more test frames 
Aquametro CALEC MB (Heat)
Eastron SDM630 (Electricity)
Sensus PolluCom E (Heat)
Tecson (Oil)
 2020-07-19 11:18:15 +02:00
Stefan Wahren
cdb41daa9d Improve product strings for Aquametro and Sensus 2020-07-19 11:18:11 +02:00
Fredrik Skold
ce396e8838 Implement all of VIF extensions for 0xFB (#166) 2020-07-19 11:18:07 +02:00
Anders Wennmo
46c43946bf Implement all of VIF extensions for 0xFD (#166) 2020-07-19 11:18:03 +02:00
Stefan Wahren
7b00e563af Update normalized XML files 
This updates the affected XML files after the recent fixes to the VIF
description.
 2020-07-19 11:17:59 +02:00
Stefan Wahren
50dadfd8b4 Fix VIF descriptions 2020-07-19 11:17:55 +02:00
Stefan Wahren
06d46dc310 Add normalized XML files of test frames 2020-07-19 11:16:01 +02:00
Stefan Wahren
60bae654e9 Also generate normalized XML 
In order to increase the test coverage also generate the normalized version
of XML output.
 2020-07-19 11:15:15 +02:00
Carlos Gomes Martinho
94528ad6f2 chore: make path to tests optional 2020-07-19 11:14:30 +02:00
Stefan Wahren
2a66e6a53b Improve BCD decoding (#167) 
* Introduce mbus_data_bcd_decode_hex

The convert function mbus_data_bcd_decode (BCD to decimal) suffers from
information loss in case of hexacimal digits. So introduce a new function
mbus_data_bcd_decode_hex (BCD to hexadecimal), which isn't affected and
use this for default XML output. But keep mbus_data_bcd_decode for
normalized output.
 2020-07-19 11:10:13 +02:00
Fabian Pflug
0edc297c47 Added more medium definitions according to DIN EN 13757-7:2018-06 (#162) 2020-07-19 11:10:00 +02:00
Fabian Pflug
8bbb9bb708 Add product strings for Sensoco devices (#161) 2020-07-19 11:08:56 +02:00
Matthias Deimbacher
3d5806ff5d fix: add missing declaration to header (#160) 2020-07-19 11:08:31 +02:00
Carlos Gomes Martinho
88d32add38 docs: add better usage to generate xml script 2020-07-19 11:07:54 +02:00
Carlos Gomes Martinho
057cf776de fix: unit tests 2020-07-19 11:07:23 +02:00
Carlos Gomes Martinho
6edab86078
refactor: clean up some compiler warnings (#152) 2020-03-21 10:50:33 +01:00
lvogt
62ac3678ff Fix prefixes (#148) 2019-07-08 10:38:20 +02:00
Stefan Wahren
2dc3daaf70 Prepare new release 0.9.0 0.9.0 2019-02-22 19:08:04 +01:00
Stefan Wahren
36a85d3737 Add product string of Hydrometer Sharky 775 2019-02-20 22:01:47 +01:00
Stefan Wahren
2f9fa5ccc8 Implement negative BCD number (Type A) 
According to W4B21021.pdf Appendix A a hex code Fh in the MSD
position signals a negative BCD number.
 2019-02-20 22:01:47 +01:00
Ingo Fischer
027f6fb689 prevent multiple calls to disconnect for serial and tcp (#137) 
* prevent multiple calls to disconnect for serial and tcp
 2018-03-28 19:53:17 +02:00
Stefan Wahren
de4a899b9d
Merge pull request #136 from Apollon77/iso-dates 
make generated timestamps conform to ISO definition
 2018-03-28 17:09:56 +02:00
Ingo Fischer
2a2fbc372a make generated timestamps conform to ISO definition 2018-03-28 14:26:06 +02:00
Stefan Wahren
6d3bb00d97
Merge pull request #134 from lategoodbye/set-primary-address 
Add binary to set primary address
 2018-03-26 11:15:40 +02:00
Stefan Wahren
84c43fe7a3 Add new program to set primary address 2018-03-21 21:44:50 +01:00
Stefan Wahren
73d58a9f7d Implement mbus_set_primary_address() 
This function sends a frame to change primary address of a slave.
 2018-03-21 21:40:58 +01:00
Stefan Wahren
ab8919136d Update LICENSE 
See #129
 2017-08-27 12:10:13 +02:00
Stefan Wahren
2680079db4 Move license into separate file 
See: https://github.com/rscada/libmbus/issues/129
 2017-08-16 19:31:49 +02:00
Stefan Wahren
a572c0f742 mbus-serial: Increase serial timeouts 
We need to take USB to serial adapters into account for timeout
calculation.
 2017-04-07 15:59:44 +00:00
Stefan Wahren
3d5b865ebe Merge pull request #111 from lategoodbye/upstream-cp48 
Implement type I CP48 (date and time)
 2016-07-28 16:22:26 +02:00
Stefan Wahren
3a2357324d Update test frames to new date/time decoding 2016-07-23 09:38:57 +00:00
Stefan Wahren
87e3c22f85 Implement Type I CP48 (date and time) 2016-07-23 09:38:41 +00:00
Stefan Wahren
094c9ef453 Fix year handling in mbus_data_tm_decode 
According to ANSI C the member tm_year saves the years since
1900.
 2016-07-23 09:38:14 +00:00
Stefan Wahren
6fd4ca2714 Merge pull request #103 from strongly-typed/fix/xmlregression 
Fix regression with XML output.
 2016-05-09 20:06:39 +02:00
Stefan Wahren
3aba0a062e Merge pull request #102 from strongly-typed/feature/travisci 
Travis builds for OS X, too. And Travis badge.
 2016-05-09 19:57:34 +02:00
strongly-typed
b9bec04027 Tests: Add XML files for hexdumps of error frames. 2016-05-09 01:36:50 +02:00
strongly-typed
9bf9f4bbf0 Tests: Add XML files for hexdumps added in a659ca0. 
It is unclear if these interpretations are correct.
But at least it can spot regressions in future commits.
 2016-05-09 01:36:27 +02:00
strongly-typed
c59f584937 Tests: Update XML files fixes in a8eaced. 2016-05-09 01:28:08 +02:00
strongly-typed
ab59b56a49 Tests: add product strings added with ed87f62 2016-05-09 01:28:08 +02:00
strongly-typed
1fc2323080 Run tests with Travis CI. gitignore test xml.new. 2016-05-09 01:28:02 +02:00
strongly-typed
0e5b5b46a8 Fix regression with XML output. 
Copy-paste error from 9edcc44.

Spotted with `cd test && ./generate-xml.sh test-frames`

    --- test-frames/manual_frame2.xml	2016-05-09 00:19:44.000000000 +0200
    +++ test-frames/manual_frame2.xml.new	2016-05-09 01:09:09.000000000 +0200
    @@ -17,7 +17,7 @@
         <DataRecord id="1">
             <Function>Actual value</Function>
             <Unit>reserved but historic</Unit>
    -        <Value>135</Value>
    +        <Value>1</Value>
         </DataRecord>
    
     </MBusData>
 2016-05-09 01:11:23 +02:00
strongly-typed
8c232f3da3 Travis builds for OS X, too. And Travis badge. 
s/README/README.md/ to add badge to Github main page.
 2016-05-08 22:47:28 +02:00
Stefan Wahren
a8eaceda40 Merge pull request #99 from rscada/bugfixes 
Bugfixes
 2016-04-01 21:26:40 +02:00
Stefan Wahren
9edcc44eeb Fix several format string issues 2016-04-01 19:20:00 +00:00
Stefan Wahren
7fe67c8586 Fix format string in mbus_send_user_data_frame 2016-04-01 18:27:59 +00:00
Stefan Wahren
9906723447 Fix IEEE754 conversion 
It seems that the endianness handling was broken in
ef6c4be655c ("Safer IEEE754 conversion."). So drop it.
 2016-04-01 18:19:32 +00:00
Stefan Wahren
78298bc68e Merge pull request #93 from arska/feature-ignoretestbinaries 
Thanks a lot
 2016-03-26 11:43:42 +01:00