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

64 Commity (678a3a8a0a82f5ac31a3e068d82e1f3e32dc0f0c)

Autor SHA1 Wiadomość Data
Fredrik Öhrström 678a3a8a0a Improve verbose messages when user is not member of dialout. 2021-10-16 20:20:33 +02:00
Fredrik Öhrström b5f89eb61d Add ability to send bytes to a bus. 2021-08-29 20:26:06 +02:00
Fredrik Öhrström 3c79af043a Add extra clearing of serial buffer when detecting amb8465. 2021-08-19 16:04:29 +02:00
Fredrik Öhrström 837b86da85 Fix bug that caused crash when dongle was reset. 2021-08-09 00:10:38 +02:00
Fredrik Öhrström 0d830bad59 Fix bug that caused crash when dongle was reset. 2021-08-08 23:07:34 +02:00
Fredrik Öhrström c490c92fdf Add debug information to amb8465 detection. 2021-08-08 21:36:32 +02:00
Fredrik Öhrström 08b9153167 Skip spurious bytes when testing for amb8465. 2021-06-09 12:51:37 +02:00
Fredrik Öhrström 21d3595a53 A device (mbus/wmbus/tty) can now have an alias. A meter spec can now refer to this alias. 2021-03-14 09:41:35 +01:00
Fredrik Öhrström 30c2926489 When looking for rtl_sdr/rtl_wmbus first look in the same dir as wmbusmeters was found. 2021-03-06 14:16:47 +01:00
Fredrik Öhrström 7c928ec2f3 Add support for checking plain MBUS frames. 2021-02-21 12:58:31 +01:00
Fredrik Öhrström b53adbf5b7 Added parity setting to serials. 2021-02-13 15:58:38 +01:00
Fredrik Öhrström 5e273ddb7e Added donotprobe=<device> and fixed so that it does not probe if a device is specified or rtlwmbus is specified. 2020-11-01 15:18:13 +01:00
Fredrik Öhrström 71dc60678b Improve detection. 2020-10-26 16:32:28 +01:00
Fredrik Öhrström 728bf66752 Add unique device id in addition to normal device id. 2020-10-25 15:28:52 +01:00
Fredrik Öhrström 40def6491b Added wmbus_common_implementation.h 2020-10-25 08:21:26 +01:00
Fredrik Öhrström 5e938202c8 Update rc1180 code. 2020-10-24 16:16:50 +02:00
Fredrik Öhrström c4226a8268 Added device and rssi_dbm to json. 2020-10-14 20:59:14 +02:00
Fredrik Öhrström 0c2eb722d1 Now auto detects any number rtlwmbus devices. 2020-10-07 21:40:33 +02:00
Fredrik Öhrström 8cc2123df0 Improved logic for configuring wmbus devices. Many changes. 2020-10-04 22:52:05 +02:00
Fredrik Öhrström ef59dad7cd Replaced sem_post/sem_wait with pthread_cond_signal_timedwait 2020-09-27 11:35:57 +02:00
Fredrik Öhrström d443fd4ea2 Add partial support for RC1180. 2020-09-26 13:52:24 +02:00
Fredrik Öhrström eb89c7b31d Moved waitForResponse into common implementation. 2020-09-26 00:10:34 +02:00
Fredrik Öhrström de24888b4e Moved listenTo/onDissapear to common implementation. 2020-09-25 21:58:09 +02:00
Fredrik Öhrström 467d15845a Moved command_wait into common implementation for wmbus devices. 2020-09-25 21:47:21 +02:00
Fredrik Öhrström 371a3c3cf1 Stop early if listening mode is set for auto and no meters. 2020-09-25 21:35:17 +02:00
Fredrik Öhrström 09821cf389 Rewrote locking from scratch switch to shared_ptr. 2020-09-21 21:55:21 +02:00
Fredrik Öhrström 71ef2b2784 Improved locking. 2020-09-18 21:22:08 +02:00
Fredrik Öhrström 69df7f022a Detect and start wmbus dongles from within wmbusmeters. 2020-08-30 21:33:48 +02:00
Fredrik Öhrström 78a353de59 Restore event loop start and disable getconfig in amb8465 reset. 2020-08-19 20:45:38 +02:00
Fredrik Öhrström 5038753906 Add alarm functionality. 2020-08-01 21:56:46 +02:00
Fredrik Öhrström 8191f45888 Inital work to add alarms. 2020-07-30 11:18:44 +02:00
Fredrik Öhrström 24a42cbadc Improve logging when testing ttys. 2020-06-29 18:33:55 +02:00
Fredrik Öhrström f3e2968833 Added reset of amb8465 to admin-tool. 2020-06-29 16:35:58 +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
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 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 2cc26129b4 Fix build problems. 2020-05-11 11:59:47 +02:00
Fredrik Öhrström 2c366bf6a7 Added prototype for wmbusmeters-admin. 2020-05-09 21:56:37 +02:00
Fredrik Öhrström 866e163d3b
Merge branch 'master' into HenryNe-patch-cs-print 2020-05-09 08:25:15 +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 7635b11f5f Try to detect. 2020-03-22 18:43:09 +01:00
weetmuts a7c059d5df Added proper CRC trimming for CUL driver. 2020-02-15 21:18:21 +01:00
weetmuts 0f74dba6e9 Added more debug information. 2020-02-06 19:01:48 +01:00