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

356 Commity (ef59dad7cd2b1dc7c754768361175139337a4c8e)

Autor SHA1 Wiadomość Data
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 e4f9eb23db Extract multical603 total kwh properly. 2020-09-26 09:14:26 +02:00
Fredrik Öhrström 08362c7571
Merge pull request #168 from elbaek89/master 
Multical 603 support (work in progress)
 2020-09-26 08:45:47 +02:00
Fredrik Öhrström eb89c7b31d Moved waitForResponse into common implementation. 2020-09-26 00:10:34 +02:00
Fredrik Öhrström 7e07af03e7 Added resetafter, regular reset. 2020-09-25 23:56:50 +02:00
Fredrik Öhrström 7c361ce9ac Removed reopenafter. 2020-09-25 22:34:35 +02:00
Fredrik Öhrström 8568437635 Partially removed reopenafter. 2020-09-25 22:27: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 6ecd278656 Properly resets wmbus dongle on alarm. 2020-09-25 21:16:20 +02:00
Fredrik Öhrström 0e076fce24 Print id for ignored telegrams when verbose logging. 2020-09-25 19:14:34 +02:00
Fredrik Öhrström 27bda218fb Do not select on non-opened file descriptors. 2020-09-25 18:40:14 +02:00
Fredrik Öhrström 5fe7789e3b Remove unused bus variable. 2020-09-25 18:13:43 +02:00
Fredrik Öhrström bf053685c8 Interrupt the select at the proper time when a new file descriptor is added. 2020-09-25 18:08:41 +02:00
Fredrik Öhrström 5ac2bdd37a Now properly reads all data from child-process that has exited. 2020-09-25 17:34:47 +02:00
Fredrik Öhrström 1022a24799 Non-working implies opened first. 2020-09-25 17:02:42 +02:00
Fredrik Öhrström 0d9d856b6a Make a distinction between not yet opened and not working serial devices. 2020-09-25 16:38:40 +02:00
Fredrik Öhrström ecd60045d9 Merge 2020-09-25 15:37:34 +02:00
Emil Madsen db7acae6cd Added Apparent Power to interface and meter 2020-09-24 21:23:06 +02:00
Emil Madsen 65ad8f624c Add support for the Gavazzi EM24 2020-09-24 19:49:45 +02:00
elbaek89 781b0af144
added extractDVuint32 (copy of extractDVuint24) 2020-09-24 13:29:25 +02:00
elbaek89 ee445f37e0
added extractDVuint32 2020-09-24 13:10:34 +02:00
elbaek89 25e945f955
Added multical 603 
Meter detection entries based on the following telegram header obtained by using wmbusmeters -listento=c1 * 

Received telegram from: 80363608
          manufacturer: (KAM) Kamstrup Energi (0x2c2d)
           device type: Heat meter (0x04)
            device ver: 0x35
         device driver: unknown!
 2020-09-23 08:35:28 +02:00
elbaek89 f840f96314
Added multical 603 meter file 
v1 copy of meter_multical403.cc with 403 replaced with 603 everywhere.
 2020-09-23 08:31:18 +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 891e3f4228 Alarm test work again. 2020-09-18 20:05:59 +02:00
Fredrik Öhrström 802e62cbbd Now logging defaults to stderr. 2020-09-13 16:55:22 +02:00
Fredrik Öhrström 71804f1d92 Audo detect swradio to start rtlwmbus. 2020-09-13 15:39:09 +02:00
Fredrik Öhrström e754cda295 Added --listmeters and --listmeters=water 2020-09-13 13:24:46 +02:00
Fredrik Öhrström 09e36b8999 Daemon working again. 2020-09-08 23:05:42 +02:00
Fredrik Öhrström 93272b1b0c Added missing include. 2020-09-08 22:34:24 +02:00
Fredrik Öhrström 409ca51819 Updated --listenvs=<meter_type> and --listfields=<meter_type> 2020-09-08 22:11:32 +02:00
Fredrik Öhrström c12a0e8e19 Most tests pass. 2020-09-08 20:50:51 +02:00
Fredrik Öhrström 570c0c5454 Now simulations work. 2020-09-08 14:55:01 +02:00
Fredrik Öhrström 04175023a8 Now properly activates meters. 2020-09-07 13:15:38 +02:00
Fredrik Öhrström d127f46807 Properly ignores non-wmbus devices. 2020-09-07 10:36:39 +02:00
Fredrik Öhrström 1653aea0b2 Detection loop is working. 2020-09-06 10:41:04 +02:00
Fredrik Öhrström b1fce2769a Merge branch 'master' into NewDetectionCode 2020-09-05 11:08:12 +02:00
Fredrik Öhrström a048982f8b With debug enable, printELL and printTPL even if decryption failed. 2020-09-04 14:03:25 +02:00
Fredrik Öhrström 27a590e135 Merge master. 2020-09-04 13:17:09 +02:00
Fredrik Öhrström c5d445b9b3 Added izar3 stub. 2020-09-04 12:13:06 +02:00
Fredrik Öhrström 481e156cf2 Added version 0x0b to lansenpu. 2020-09-04 11:52:30 +02:00
Fredrik Öhrström c48ad8e368 Added driver detection from telegrams. 2020-09-04 11:31:49 +02:00
Fredrik Öhrström 92c003f4b5 Merge master. 2020-09-02 14:38:47 +02:00
Fredrik Öhrström 8e6d39492d Update README. 2020-09-02 14:36:10 +02:00
Fredrik Öhrström ecce6a2c08 Added test case and updated README. 2020-09-02 13:17:52 +02:00
Arthur van Dorp 3190ef9e7c Add support for AquaMetro / Integra Topas Es Kr water meter 2020-09-01 21:53:05 +02:00