mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
440 Commity
4 Gałęzie
67 Tagi
5,8 MiB
Wykres commitów

440 Commity (877e865f3c8a615e4dee24b384efa1f3bfbf15e5)

Autor SHA1 Wiadomość Data
Erwan Martin 877e865f3c Merge remote-tracking branch 'github/master' into add-freebsd-support 2020-04-21 18:34:20 +02:00
Erwan Martin c6f3f2336e Fix wrong if directive in the Makefile. 2020-04-21 18:25:25 +02:00
Erwan Martin 6f323b30e6 Add support for FreeBSD. 2020-04-21 18:07:46 +02:00
Erwan Martin db4fe082e8 Use /bin/sh instead of /bin/bash to support systems that do not have bash. 2020-04-21 12:40:25 +02:00
Fredrik Öhrström 62dba2c8f6 Re-added wmbusmeters.service 2020-04-03 13:21:21 +02:00
Fredrik Öhrström b4e6e9b7a9
Merge pull request #103 from dwrobel/patch-1 
Add wmbusmeters availability info on Fedora
 2020-04-01 19:17:58 +02:00
Damian Wrobel 2f014b881d
Add wmbusmeters availability info on Fedora 2020-04-01 19:15:55 +02:00
Fredrik Öhrström 19905f100d Add rfmtx1 stub. 2020-04-01 17:21:49 +02:00
Fredrik Öhrström 17cc575b87 Add support for extractin mfct data. 2020-04-01 17:21:11 +02:00
Fredrik Öhrström bb1f03fd2a Improve logging. 2020-03-28 19:29:58 +01:00
Fredrik Öhrström 1d8b070c67 The wmb13u dongle cannot be supported because it hangs. 2020-03-28 18:10:21 +01:00
Fredrik Öhrström 69c962228e
Merge pull request #100 from weetmuts/AddWMB13UDongle 
Add wmb13 u dongle
 2020-03-24 16:10:50 +01:00
Fredrik Öhrström dac058f057 Updated README. 2020-03-24 16:08:42 +01:00
Fredrik Öhrström b6a2776e79 Temporarily disable detection. 2020-03-24 16:07:41 +01:00
Fredrik Öhrström 95e347ef39 Added setlink and getconfig. 2020-03-23 18:58:34 +01:00
Fredrik Öhrström ef4ccd72ce Fix messages. 2020-03-23 07:40:40 +01:00
Fredrik Öhrström 47f3a8caac Remove 3 last bytes from telegram. 2020-03-22 22:38:32 +01:00
Fredrik Öhrström 7635b11f5f Try to detect. 2020-03-22 18:43:09 +01:00
Fredrik Öhrström 83c2e24a83 Added tracking of branch in version string. 2020-03-22 14:36:03 +01:00
Fredrik Öhrström 7b9e9a3b8d Started working on wmb13u dongle. 2020-03-22 14:20:47 +01:00
weetmuts ea27a03b95 Updated README. 2020-03-13 10:55:13 +01:00
weetmuts 90b3f28bbb Fix AES-CTR decryption. 2020-03-13 10:49:22 +01:00
weetmuts 5b3b6f9bda Add manufacturer specific ci_field 0xa1. 2020-03-10 13:32:57 +01:00
weetmuts 1c0fee6f1f Updated README, re-added StopWhenUnneeded=true 2020-03-08 15:47:39 +01:00
Fredrik Öhrström 6430b2521b
Merge pull request #89 from dwrobel/dw-fix-systemd-service 
Fixes for generating systemd service file
 2020-03-08 15:39:31 +01:00
weetmuts 36ea4126fd Added docker comment. 2020-03-07 21:12:09 +01:00
weetmuts 353f8af898 Add README comment about WMB13U-868. 2020-03-07 20:08:46 +01:00
Fredrik Öhrström 9209a61baf
Merge pull request #91 from BIBOLV/master 
docker support rework
 2020-03-07 20:06:16 +01:00
Fredrik Öhrström 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
Lieven Hollevoet 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
BIBOLV 8b3bdffa47 docker support rework 
- Moved docker related files to seperate directory.
- Added CircleCI config file
 2020-03-03 20:40:35 +02:00
Damian Wrobel 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
Fredrik Öhrström 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
Damian Wrobel 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
Fredrik Öhrström 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
Damian Wrobel 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
Fredrik Öhrström 0d92f47b63
Merge pull request #86 from dwrobel/dw-fix-empty-string-crash 
Fix accessing empty string
 2020-03-02 16:55:21 +01:00
Fredrik Öhrström 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
Damian Wrobel 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
Damian Wrobel 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
weetmuts 97c2c61f39 Updated CHANGES. 2020-02-26 11:08:15 +01:00
weetmuts 9ce676675a Fix problem with rtl_sdr hanging when stopping daemon. 2020-02-26 11:02:47 +01:00
Fredrik Öhrström 026a142495
Merge pull request #84 from skazi0/deb-symlink-fix 
Fix wmbusmetersd symlink
 2020-02-26 09:19:39 +01:00
Jacek Tomasiak 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
weetmuts 33952d803f Added divide by 3 to apator08. 2020-02-23 18:41:21 +01:00
weetmuts b608ae3220 Added missing file. 2020-02-23 14:49:51 +01:00
weetmuts f6df66d293 Added experimental support for apator08. 2020-02-23 13:55:37 +01:00
weetmuts 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
weetmuts 6e844dc1c2 Fix cul driver C1 mode. 2020-02-18 20:48:00 +01:00
weetmuts f1da5b48ee Add missing test. 2020-02-18 07:48:24 +01:00