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

499 Commity (2338ff625975d43d53cfa09d2822116eecd29c89)

Autor SHA1 Wiadomość Data
Fredrik Öhrström 2338ff6259 Update test cases. 2020-05-30 09:51:25 +02:00
Fredrik Öhrström dec92e58a5 Added experimental support for older version of rfmtx1. 2020-05-30 09:47:39 +02:00
Fredrik Öhrström 0782557fb4 Fix bug that printed unnecessary warning for flowiq3100 meters. 2020-05-28 07:51:34 +02:00
Fredrik Öhrström dd79885aea
Merge pull request #124 from dwrobel/Switch-to-ubuntu-18.04LTS 
Switch to ubuntu 18.04LTS
 2020-05-27 19:43:13 +02:00
Fredrik Öhrström da8756e660
Merge pull request #123 from HenryNe/patch-1 
amb8465: Find next start 0x44, after out of sync
 2020-05-27 15:39:44 +02:00
Henry N 776287c011
amb8465: Find next start 0x44, after out of sync 
Should fix problems in #116
 2020-05-27 13:12:52 +02:00
Damian Wrobel adf0b1b22c Switch to ubuntu 18.04LTS 
Update compiler options:
 - remove -fmessage-length=0 as it's default,
 - remove -Wno-unused-function - does not introduce any new warnings,
 - add -Werror=format-security.

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-05-27 09:52:31 +02:00
Fredrik Öhrström aaee2a1ec3 Restore warning for format truncation. 2020-05-27 05:58:07 +02:00
Fredrik Öhrström ff24b5d3e9 Avoid format truncation warning in recent g++. 2020-05-27 05:57:10 +02:00
Fredrik Öhrström 6c05608a9e
Merge pull request #122 from HenryNe/patch-1 
Tab and spaces at beginning of line
 2020-05-27 05:54:31 +02:00
Henry N bdedc91681
Tab and spaces at beginning of line 2020-05-26 22:18:37 +02:00
Fredrik Öhrström 76d76d1276 Disable format-truncation warning that is somewhat flaky in gcc. 2020-05-26 09:34:17 +02:00
Fredrik Öhrström 23566a2061
Merge pull request #120 from dwrobel/Remove-executable-bit 
Remove executable bit
 2020-05-26 09:23:05 +02:00
Damian Wrobel 6814ab35cd Remove executable bit 
Fixes the following warnings while building rpm package:

 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meter_izar.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meters.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meters_common_implementation.h is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/units.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/units.h is executable but has no shebang, removing executable bit

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-05-25 22:12:33 +02:00
Fredrik Öhrström 137fb4c102
Merge pull request #118 from HenryNe/patch-1 
main.cc depends on version.h
 2020-05-25 21:02:06 +02:00
Henry N d3bcb0f249
main.cc depends on version.h 2020-05-25 20:31:22 +02:00
Fredrik Öhrström 950778d7bc Detect out of sync data from amb8465. 2020-05-25 19:05:45 +02:00
Henry N fddeab4841
amb8465: rx timeout to resync telegram (#117) 
* rx timeout 2 sec in telegram 

If the reader is out of sync, next meter start bytes will add to the rest of telegram before. Typically are 7 ms between two chunks of received data. If detected a delay of 2 seconds or more between the rx data, then assume it is the first block of new telegram.
This should fix the issue #116.
 2020-05-25 09:28:31 +02:00
Fredrik Öhrström 25d3a5c58c
Merge pull request #115 from BIBOLV/master 
Update README.md
 2020-05-11 21:57:06 +02:00
BIBO 3f9393e06b
Update README.md 2020-05-11 22:45:04 +03:00
Fredrik Öhrström 5273f64d0c
Merge pull request #114 from BIBOLV/master 
Additional docker fixes
 2020-05-11 18:01:07 +02:00
BIBOLV cbb3a0de0a Additional docker fixes 
Additional package changes for alpine base image
 2020-05-11 18:29:10 +03:00
Fredrik Öhrström eab0e9f940 Build fix. 2020-05-11 12:19:50 +02:00
Fredrik Öhrström aab9b11e83 Add ncurses to docker build and image. 2020-05-11 12:14:28 +02:00
Fredrik Öhrström 3b96b8de9d Remove compile warning. 2020-05-11 12:04:45 +02:00
Fredrik Öhrström 033ce0cf82 Merge branch 'master' of http://github.com/weetmuts/wmbusmeters 2020-05-11 12:00:09 +02:00
Fredrik Öhrström 2cc26129b4 Fix build problems. 2020-05-11 11:59:47 +02:00
Fredrik Öhrström d566aeaeb8
Merge pull request #113 from BIBOLV/master 
Docker fix
 2020-05-11 11:00:40 +02:00
BIBOLV 01f0d08916 Docker fix 
Changes in alpine packages
 2020-05-10 22:35:37 +03:00
Fredrik Öhrström 20bc6c6a02 Add --selectfields=... 2020-05-09 23:46:07 +02:00
Fredrik Öhrström 4d9ede4d04 Fix OSX build. 2020-05-09 22:13:38 +02:00
Fredrik Öhrström 2c366bf6a7 Added prototype for wmbusmeters-admin. 2020-05-09 21:56:37 +02:00
Fredrik Öhrström 6fa1fa39ce Merge remote-tracking branch 'origin/master' into AddAdminTool 2020-05-09 11:18:25 +02:00
Fredrik Öhrström 74e84c6881
Merge pull request #111 from HenryNe/HenryNe-patch-cs-print 
amb8465: Print checksum errors from responses
 2020-05-09 09:17:47 +02:00
Fredrik Öhrström 866e163d3b
Merge branch 'master' into HenryNe-patch-cs-print 2020-05-09 08:25:15 +02:00
Fredrik Öhrström 6a6476bedf
Merge pull request #112 from HenryNe/HenryNe-patch-rssi 
amb8465: Fix RSSI in responses
 2020-05-09 08:23:48 +02:00
Henry N 0159f4c449
amb8465: Print rssi after full command frame 
Just to have the same order as before.
 2020-05-08 22:20:10 +02:00
Henry N 585bec9e39
amb8465: Print checksum errors from responses 2020-05-08 22:11:26 +02:00
Henry N 8d283533c3
amb8465: Print rssi in dBm 2020-05-08 22:06:33 +02:00
Henry N c229cb3d0f
amb8465: Update rssi from transparant data 
Update rssi from transparent rx data.
Print rssi only after get an update of rssi (CMD_DATA_IND or transparent RX).
 2020-05-08 22:02:22 +02:00
Henry N 60ddad6e1d
amb8465: Fix: RSSI is only in CMD_DATA_IND 
Byte for rssi is only injected in responses from CMD_DATA_IND.
rssi is -2 bytes before end, because -1 byte is the CheckSum.
Fix calculation for frame_length.
frame_length = 1 byte start (0xFF) + 1 byte CMD (0x8A) + 1 byte len (0x7A) + payload_len + 0/1 byte RSSI + 1 byte Check Sum = 4 + payload_len.
PS: The old code was working, because rssi_expected_ was always true (1).
 2020-05-08 21:56:20 +02:00
Henry N b955c692d5
amb8465: Fix: Update config RSSI_Enable = false 
Bugfix: Update local "rssi expected" to false, If RSSI is not set in config.
 2020-05-08 21:38:09 +02:00
Henry N a8f7517290
amb8465: Print config UART_CMD_OUT_ENABLE 2020-05-08 21:29:02 +02:00
Fredrik Öhrström 36e213e49a Support comments (lines starting with #) in the conf and meter files. 2020-05-06 09:41:29 +02:00
Fredrik Öhrström 3edd661667 Add heuristic to apator162 decoding. 2020-04-30 09:15:01 +02:00
Fredrik Öhrström 5aacdfecf3 Fix test of fields for t1 meters. 2020-04-26 15:08:24 +02:00
Fredrik Öhrström 6e87f9f611
Merge pull request #106 from ZeWaren/improve-izar-meter 
Improve the IZAR meter
 2020-04-26 15:01:52 +02:00
Erwan Martin e9163063b8 Add the alarms to the IZAR meters. 2020-04-25 13:30:23 +02:00
Erwan Martin 376cbdfef6 Fix the IZAR tests. 2020-04-22 23:05:24 +02:00
Erwan Martin ba8a8edeb6 Add the new IZAR fields to the tests. 2020-04-22 23:00:18 +02:00