36ea4126fd
Added docker comment.
2020-03-07 21:12:09 +01:00
353f8af898
Add README comment about WMB13U-868.
2020-03-07 20:08:46 +01:00
9209a61baf
Merge pull request #91 from BIBOLV/master
...
docker support rework
2020-03-07 20:06:16 +01:00
b3c40d605b
Merge pull request #92 from hollie/patch-1
...
Explain how to get started with the AMB8465 stick
2020-03-07 20:05:10 +01:00
db14a30eba
Explain how to get started with the AMB8465 stick
...
I did run in some issues to get started with the AMB8465 stick because the stick was not configured in default mode.
I'm adding this info for others to avoid they run into the same issues.
2020-03-07 15:36:23 +01:00
8b3bdffa47
docker support rework
...
- Moved docker related files to seperate directory.
- Added CircleCI config file
2020-03-03 20:40:35 +02:00
6bb151a96f
Fixes for generating systemd service file
...
Fixes the following warnings:
- Unknown key name 'StartLimitIntervalSec' in section 'Service', ignoring,
(moved to unit section)
- PIDFile= references path below legacy directory /var/run/,
(moved from /var/run -> /run)
- kill: cannot find process "2>"
(disable bash variable expansion while generating service file and
simplify reload command by using $MAINPID systemd variable)
Add documentation url (github, and wmbusmeters(1))
Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-03-03 14:02:10 +01:00
6f32c281d1
Merge pull request #88 from dwrobel/dw-fix-wmbusmeters.d-chmod
...
Make wmbusmeters.d directory accessible for the owner
2020-03-03 11:19:57 +01:00
21463d51e6
Make wmbusmeters.d directory accessible for the owner
...
Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-03-03 10:23:12 +01:00
d9c58ccd25
Merge pull request #87 from dwrobel/dw-make-packaging-easier
...
Make easier to packaging wmbumeters for linux
2020-03-02 18:12:13 +01:00
7d74511dcb
Make easier to packaging wmbumeters for linux
...
Makefile:
- Allow to disable stripping of executables as this prevents from
properly creating debug information sub packages,
- Don't invoke any git commands when building from released
tarball. Moreover, when creating an rpm package with additional
patches then the created git repository is the one in which rpm
applies patches and not the original one.
- Allow to pass CXXFLAGS and LDFLAGS as distributions requires all
packages to be compiled with the same set of flags.
- Support to override DESTDIR when installing files.
- Allow to pass additional arguments (EXTRA_INSTALL_OPTION)
for install.sh script from Makefile.
Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-03-02 17:33:34 +01:00
0d92f47b63
Merge pull request #86 from dwrobel/dw-fix-empty-string-crash
...
Fix accessing empty string
2020-03-02 16:55:21 +01:00
0be613688f
Merge pull request #85 from dwrobel/dw-fix-gcc-10-compilation-error
...
Fix compilation error on gcc 10.x
2020-03-02 16:54:43 +01:00
1d2f9c4c72
Fix compilation error on gcc 10.x
...
Fixes the following compilation error:
In file included from src/config.h:21,
from src/cmdline.h:21,
from src/cmdline.cc:18:
src/units.h:42:11: error: extended character ° is not valid in an identifier
42 | X(C,c,°C,Temperature,"celsius") \
| ^
src/units.h:43:11: error: extended character ° is not valid in an identifier
43 | X(F,f,°F,Temperature,"fahrenheit") \
| ^
make: *** [Makefile:93: build/cmdline.o] Error 1
Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-03-02 16:22:11 +01:00
a2de4d4b9b
Fix accessing empty string
...
Fixes the following crash:
(gdb) bt
#0 0x00005555555738d0 in abort@plt ()
#1 0x0000555555589888 in std::__replacement_assert (__file=<optimized out>, __line=<optimized out>, __function=<optimized out>, __condition=<optimized out>) at /usr/include/c++/9/x86_64-redhat-linux/bits/c++config.h:2533
#2 0x00005555555d1e37 in std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::front (this=0x7ffff7a226d0) at /usr/include/c++/9/bits/basic_string.h:1123
#3 0x00005555555ce8c5 in doesIdMatchExpression (id=..., match=...) at src/util.cc:513
#4 0x00005555555cea92 in doesIdMatchExpressions (id=..., mes=...) at src/util.cc:560
#5 0x000055555558aa56 in MeterCommonImplementation::isTelegramForMe (this=0x555555661c28, t=0x7ffff7a227b0) at src/meters.cc:188
#6 0x000055555558c0e0 in MeterCommonImplementation::handleTelegram (this=0x555555661c28, input_frame=...) at src/meters.cc:289
#7 0x000055555558c87a in MeterCommonImplementation::<lambda(std::vector<unsigned char, std::allocator<unsigned char> >)>::operator() (__closure=<optimized out>, input_frame=...) at /usr/include/c++/9/bits/stl_algobase.h:465
#8 std::_Function_handler<bool(std::vector<unsigned char, std::allocator<unsigned char> >), MeterCommonImplementation::MeterCommonImplementation(WMBus*, MeterInfo&, MeterType, int)::<lambda(std::vector<unsigned char, std::allocator<unsigned char> >)> >::_M_invoke(const std::_Any_data &, std::vector<unsigned char, std::allocator<unsigned char> > &&) (__functor=..., __args#0=...) at /usr/include/c++/9/bits/std_function.h:285
#9 0x00005555555da01f in std::function<bool (std::vector<unsigned char, std::allocator<unsigned char> >)>::operator()(std::vector<unsigned char, std::allocator<unsigned char> >) const (__args#0=..., this=0x7ffff7a22c70) at /usr/include/c++/9/bits/std_function.h:685
#10 WMBusCommonImplementation::handleTelegram (this=this@entry=0x555555661b40, frame=...) at src/wmbus.cc:3328
#11 0x00005555555fbf7b in WMBusRTLWMBUS::processSerialData (this=0x555555661ad0) at /usr/include/c++/9/bits/stl_algobase.h:465
#12 0x00005555555cb001 in std::function<void ()>::operator()() const (this=<optimized out>) at /usr/include/c++/9/bits/std_function.h:685
#13 SerialCommunicationManagerImp::eventLoop (this=0x5555556617c0) at src/serial.cc:795
#14 0x00007ffff7f554e2 in ?? ()
#15 0x0000000000000000 in ?? ()
Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-03-02 16:21:33 +01:00
97c2c61f39
Updated CHANGES.
2020-02-26 11:08:15 +01:00
9ce676675a
Fix problem with rtl_sdr hanging when stopping daemon.
2020-02-26 11:02:47 +01:00
026a142495
Merge pull request #84 from skazi0/deb-symlink-fix
...
Fix wmbusmetersd symlink
2020-02-26 09:19:39 +01:00
d555f0649f
Fix wmbusmetersd symlink
...
When building the package, install script creates incorrect symlink
pointing to the build directory instead of target root.
2020-02-24 22:31:45 +01:00
33952d803f
Added divide by 3 to apator08.
2020-02-23 18:41:21 +01:00
b608ae3220
Added missing file.
2020-02-23 14:49:51 +01:00
f6df66d293
Added experimental support for apator08.
2020-02-23 13:55:37 +01:00
f99dbadf88
Added --usestderr option. Added version 0x7c to iperl. install.sh now adds user to wmbusmeters group.
2020-02-22 21:16:24 +01:00
6e844dc1c2
Fix cul driver C1 mode.
2020-02-18 20:48:00 +01:00
f1da5b48ee
Add missing test.
2020-02-18 07:48:24 +01:00
f6aae6c65d
Merge branch 'master' of http://github.com/weetmuts/wmbusmeters
2020-02-18 07:41:53 +01:00
edd523a64b
Added more guessing for the apator162.
2020-02-18 07:41:31 +01:00
351a1478a8
Merge pull request #78 from skazi0/install-args-fix
...
Fix args in install.sh script call
2020-02-18 07:09:16 +01:00
baa88b8270
Added 0x84 to apator162 guessing.
2020-02-17 19:10:35 +01:00
b3a1d30f22
Only invoke binary test if using the default command line.
2020-02-17 18:14:04 +01:00
17067e44ec
Improved error message and README.
2020-02-17 18:09:27 +01:00
d7fbf3a3a8
Added info message when /usr/bin/rtl_sdr or /usr/bin/rtl_wmbus is missing.
2020-02-17 12:16:45 +01:00
4c21b79801
Fix args in install.sh script call
...
[OPTIONS] should be placed at the end of command line. First and
second args are fixed to binary and root paths.
2020-02-17 09:52:20 +01:00
126a503870
Fix bug when trimming frame A telegram which is a multiple of 18 bytes.
2020-02-16 20:58:59 +01:00
b42c3f3af4
Improved cul driver.
2020-02-16 20:23:47 +01:00
418b2fd298
Adjusted tests for fhkvdataiii.
2020-02-16 19:18:46 +01:00
5f7324562a
Merge pull request #77 from cinemarene/master
...
Ignore manufacturer specific header sizes changes
2020-02-16 19:16:32 +01:00
a7c059d5df
Added proper CRC trimming for CUL driver.
2020-02-15 21:18:21 +01:00
34a5297093
Ignore manufacturer specific header sizes changes
2020-02-12 23:28:09 +01:00
b374d9fc19
Revert "Ignore manufacturer specific header sizes changes"
...
This reverts commit cc9d19c6ae
2020-02-12 23:22:44 +01:00
cc9d19c6ae
Ignore manufacturer specific header sizes changes
2020-02-12 23:16:54 +01:00
a153a1ba42
Merge pull request #1 from weetmuts/master
...
Update from Master
2020-02-12 10:14:23 +01:00
2f2f4a1e58
Small fixes.
2020-02-12 07:52:29 +01:00
0a3a54b006
Merge pull request #76 from cinemarene/master
...
Add new Meter + Update EBZ Meter
2020-02-12 06:58:58 +01:00
895f0ee577
Add SUM of p1-p3
2020-02-11 22:37:20 +01:00
9525758863
Add Techem FHKV data II/III
2020-02-11 22:35:57 +01:00
af98f363cd
Reverse esysm strings.
2020-02-07 12:34:44 +01:00
140121d21c
Update CHANGES.
2020-02-07 07:40:48 +01:00
103f0da4cf
Fix bug in esyswm.
2020-02-07 07:39:01 +01:00
8666dd95a1
New version.
2020-02-06 19:36:01 +01:00
weetmuts