wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wn:rebase-wo-cmake
Branches Tags
wn:master wn:WolfgangsOwnBranch wn:revert-cmake wn:rebase-wo-cmake wn:cmake-fix wn:negative-bcd wn:adjustable-timeout wn:serial-timeout wn:fix-fcb-handling
wn:0.9.0 wn:0.8.0
..
compare: wn:e1f4dbdd52fe8a67e0665a0f3f5368ede1c59d83
Branches Tags
wn:WolfgangsOwnBranch wn:master wn:revert-cmake wn:rebase-wo-cmake wn:cmake-fix wn:negative-bcd wn:adjustable-timeout wn:serial-timeout wn:fix-fcb-handling
wn:0.9.0 wn:0.8.0

47 Commits
rebase-wo- ... e1f4dbdd52

Author SHA1 Message Date
Stefan Wahren
e1f4dbdd52 changelog: Add release 0.9.0 2020-07-19 12:58:27 +02:00
Stefan Wahren
107d44b7e9 build: temporary revert to autotools (#174) 
As long as cmake doesn't generate suitable deb packages, we need to
switch back :(
 2020-07-19 12:58:27 +02:00
Fredrik Skold
f498cf1a37 Add Dockerfile.test to run tests from docker (#165) 2020-07-08 15:47:03 +02:00
Fredrik Skold
3897ac72da Rewrite ccpp.yml to use multi-line command (#165) 
For enhanced readability, split the commands over several lines.
 2020-07-08 15:47:03 +02:00
Fredrik Skold
e89f929f6c Fix bug, test script should accept both 1 and 2 arguments (#165) 
Usefull when placing the output in another directory.
 2020-07-08 15:47:03 +02:00
Fredrik Skold
69019312c9 Enforce tests execute ok (#165) 2020-07-08 15:47:03 +02:00
Fredrik Skold
2d09cfc41d Move invalid_length*.hex to test/unsupported-frames (#165) 2020-07-08 15:47:03 +02:00
Stefan Wahren
446cf41a2a Move RVD235 out of unsupported 
Especially after the recent changes, we can consider Siemens RVD235 as
supported.
 2020-07-08 12:48:26 +02:00
Stefan Wahren
ec4bff91db Remove duplicate 
rvd235.hex is the same as siemens_rvd235.hex
 2020-07-08 12:48:26 +02:00
Stefan Wahren
fe2b4ec024 Add more test frames 
Aquametro CALEC MB (Heat)
Eastron SDM630 (Electricity)
Sensus PolluCom E (Heat)
Tecson (Oil)
 2020-07-08 11:54:38 +02:00
Stefan Wahren
8d781ad240 Improve product strings for Aquametro and Sensus 2020-07-08 11:54:38 +02:00
Fredrik Skold
67ea2d3900 Implement all of VIF extensions for 0xFB (#166) 2020-07-08 11:31:13 +02:00
Anders Wennmo
5b26e62f55 Implement all of VIF extensions for 0xFD (#166) 2020-07-08 11:31:13 +02:00
Stefan Wahren
6c1e2026d6 Update normalized XML files 
This updates the affected XML files after the recent fixes to the VIF
description.
 2020-07-07 10:17:39 +02:00
Stefan Wahren
908334af0b Fix VIF descriptions 2020-07-07 10:17:39 +02:00
Stefan Wahren
e27a95c4db Merge pull request #168 from rscada/generate-norm-xml 
Also generate normalized XML
 2020-07-06 13:07:05 +02:00
Stefan Wahren
9799794213 Add normalized XML files of test frames 2020-07-06 12:55:05 +02:00
Stefan Wahren
bf177d1fe7 Also generate normalized XML 
In order to increase the test coverage also generate the normalized version
of XML output.
 2020-07-06 12:06:39 +02:00
Stefan Wahren
17a73287c2 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-06-28 10:28:40 +02:00
Stefan Wahren
1e25cf1096 Fix Linux build target 
Linux uses lib as prefix, which results into unintended liblibmbus.so
So avoid such a prefix.
 2020-06-27 16:10:17 +02:00
Fabian Pflug
23d8ee4844 Added more medium definitions according to DIN EN 13757-7:2018-06 (#162) 2020-06-05 13:12:44 +02:00
Fabian Pflug
643022388d Add product strings for Sensoco devices (#161) 2020-06-05 13:05:43 +02:00
Matthias Deimbacher
b5e59aa52f fix: add missing declaration to header (#160) 2020-05-15 19:05:36 +02:00
Stefan Wahren
baf03e2a47 Merge pull request #151 from gocarlos/feat--add-cmake-support 
build: add cmake support
 2020-04-24 20:18:09 +02:00
Carlos Gomes Martinho
ba18321e11 chore: run tests also with pull requests 2020-04-24 15:14:15 +02:00
Carlos Gomes Martinho
f569816788 chore: make path to tests optional 2020-04-24 09:55:01 +02:00
Carlos Gomes Martinho
716fe0358c fix: debian package blank line in value of field Description 2020-04-14 11:36:39 +02:00
Carlos Gomes Martinho
ee3a69e5df docs: add better usage to generate xml script 2020-04-14 11:22:40 +02:00
Carlos Gomes Martinho
9f9c7a5dbf fix: unit tests 2020-04-14 11:01:07 +02:00
Carlos Gomes Martinho
f31fbea817 build: add devel package 2020-04-14 10:29:22 +02:00
Carlos Gomes Martinho
f3a62d560b chore: apply suggestions from code review 
Co-Authored-By: Anonymous Maarten <madebr@users.noreply.github.com>
 2020-04-01 22:38:53 +02:00
Carlos Gomes Martinho
989404de83 chore: simplify cmake 2020-04-01 15:53:54 +02:00
Carlos Gomes Martinho
b58aca4432 build: symplify clang tidy 2020-04-01 15:52:21 +02:00
Carlos Gomes Martinho
505c25aa9b chore: apply suggestions from code review 
Co-Authored-By: Anonymous Maarten <madebr@users.noreply.github.com>
 2020-03-31 23:45:53 +02:00
Carlos Gomes Martinho
fffdca0504 build: apply suggestions from code review 
Co-Authored-By: Anonymous Maarten <madebr@users.noreply.github.com>
 2020-03-31 21:42:49 +02:00
Carlos Gomes Martinho
b0f413037a test: update generate-xml script 2020-03-31 21:38:51 +02:00
Carlos Gomes Martinho
724822b3ab build: add pkg config file 2020-03-31 20:31:18 +02:00
Carlos Gomes Martinho
155e245b61 build: add also android 2020-03-31 20:31:18 +02:00
Carlos Gomes Martinho
ff2e50a38a build: do not use gnu style warnings for msvc 2020-03-31 20:31:18 +02:00
Carlos Gomes Martinho
bd2fa5759b build: remove old build system 2020-03-31 20:31:18 +02:00
Carlos Gomes Martinho
6fb724698f build: install doxygen in ci 2020-03-31 20:31:18 +02:00
Carlos Gomes Martinho
5a3d13e7ad build: add documentation 2020-03-31 20:31:14 +02:00
Carlos Gomes Martinho
576da85302 build: add dockerfiles for deb and rpm 2020-03-31 20:30:53 +02:00
Carlos Gomes Martinho
433b3c4219 feat: add github actions 
* feat: add github actions

* Update ccpp.yml

* build: build and install deb in container

* build: clean up
 2020-03-31 20:30:50 +02:00
Carlos Gomes Martinho
e864d27fbf build: add debian package 2020-03-31 20:30:23 +02:00
Carlos Gomes Martinho
89db118821 build: add coverage information 2020-03-31 20:30:23 +02:00
Carlos Gomes Martinho
d96dcfad09 build: add cmake support 
feat: add cmake support

chore: remove old code

revert: remove mbus_data_record_unit

build: do not break existing building system
 2020-03-31 20:30:18 +02:00
2 changed files with 8 additions and 1 deletions
Expand all files Collapse all files

2
.dockerignore Normal file
View File

@@ -0,0 +1,2 @@
/_build
/build

7
.gitignore vendored
View File

@@ -10,7 +10,6 @@ test/Makefile.in
/compile /compile
config.guess config.guess
config.sub config.sub
config.h.in
configure configure
/depcomp /depcomp
/install-sh /install-sh
@@ -72,3 +71,9 @@ test/test-frames/*.xml.new
test/error-frames/*.xml.new test/error-frames/*.xml.new
test/unsupported-frames/*.xml.new test/unsupported-frames/*.xml.new
/build/
_build/
# IDE
/.vscode/
CMakeLists.txt.user