From 2e8f6e54303c1e4dd210968ae9448d188afcdfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Wed, 21 Sep 2022 16:37:27 +0200 Subject: [PATCH] Add test case to qwater. --- src/driver_qheat.cc | 1 + src/driver_qwater.cc | 6 ++++++ wmbusmeters-admin.1 | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 wmbusmeters-admin.1 diff --git a/src/driver_qheat.cc b/src/driver_qheat.cc index f8a101b..b04fdfe 100644 --- a/src/driver_qheat.cc +++ b/src/driver_qheat.cc @@ -30,6 +30,7 @@ namespace di.setMeterType(MeterType::HeatMeter); di.addLinkMode(LinkMode::C1); di.addDetection(MANUFACTURER_QDS, 0x04, 0x23); + // MANUFACTURER_QDS, 0x37, 0x23 waiting for telegram for test-suite. di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr(new Driver(mi, di)); }); }); diff --git a/src/driver_qwater.cc b/src/driver_qwater.cc index 7ef8791..a5da87b 100644 --- a/src/driver_qwater.cc +++ b/src/driver_qwater.cc @@ -44,6 +44,7 @@ static bool ok = registerDriver([](DriverInfo&di) di.addLinkMode(LinkMode::S1); di.addDetection(MANUFACTURER_QDS, 0x37, 0x33); di.addDetection(MANUFACTURER_QDS, 0x06, 0x18); + // MANUFACTURER_QDS, 0x07, 0x18 waiting for telegram for test suite. di.addDetection(MANUFACTURER_QDS, 0x07, 0x35); di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr(new MeterQWater(mi, di)); }); @@ -190,3 +191,8 @@ MeterQWater::MeterQWater(MeterInfo &mi, DriverInfo &di) : // telegram=|47449344483635121806780dff5f350082da0000600107c113ffff48200000bf2c91170000df2120200000008001000000060019001000160018000d001300350017002f046d370cc422c759| // {"media":"warm water","meter":"qwater","name":"MyQWater","id":"12353648","total_m3":1.991,"due_date_m3":1.791,"due_date":"2021-12-31","due_date_17_m3":1.791,"due_date_17":"2021-12-31","error_code":"OK","error_date":"2127-15-31","device_date_time":"2022-02-04 12:55","timestamp":"1111-11-11T11:11:11Z"} // |MyQWater;12353648;1.991000;1.791000;2021-12-31;OK;1111-11-11 11:11.11 + +// Test: AnotherQWater qwater 66666666 NOKEY +// telegram=3C449344682268363537726666666693443507720000200C13670512004C1361100300426CBF2CCC081344501100C2086CDF28326CFFFF046D0813CF29 +// {"media":"water","meter":"qwater","name":"AnotherQWater","id":"66666666","total_m3":120.567,"due_date_m3":31.061,"due_date":"2021-12-31","due_date_17_m3":115.044,"due_date_17":"2022-08-31","error_code":"","error_date":"2127-15-31","device_date_time":"2022-09-15 19:08","timestamp":"1111-11-11T11:11:11Z"} +// |AnotherQWater;66666666;120.567000;31.061000;2021-12-31;;1111-11-11 11:11.11 diff --git a/wmbusmeters-admin.1 b/wmbusmeters-admin.1 new file mode 100644 index 0000000..6a056a5 --- /dev/null +++ b/wmbusmeters-admin.1 @@ -0,0 +1,29 @@ +.TH WMBUSMETERS 1 +.SH NAME +wmbusmeters-admin \- Interactively configure devices and meters for wireless mbus and wired mbus. + +.SH SYNOPSIS +.B wmbusmeters-admin {options} + +.SH DESCRIPTION + +Wmbusmeters-admin is used to configure and test wmbus devices. + +.SH OPTIONS +\fB\--debug\fR for a lot of information + +\fB\--verbose\fR for more information + +\fB\--version\fR print version + +.SH AUTHOR +Written by Fredrik Öhrström. + +.SH COPYRIGHT +Copyright \(co 2017-2022 Fredrik Öhrström. +.br +License GPLv3+: GNU GPL version 3 or later . +.br +This is free software: you are free to change and redistribute it. +.br +There is NO WARRANTY, to the extent permitted by law.