mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add quotes around meter and media keywords for correct JSON.

pull/5/head
weetmuts 2018-10-05 17:29:27 +02:00
rodzic e5b0cbb018
commit 642557d7a9
4 zmienionych plików z 13 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
meter_multical21.cc
Wyświetl plik

@ -453,7 +453,9 @@ void MeterMultical21::printMeterFields(FILE *output, char separator)
void MeterMultical21::printMeterJSON(FILE *output)
{
fprintf(output, "{media:\"%s\",meter:\"multical21\","
fprintf(output, "{"
QS(media,%s)
QS(meter,multical21)
QS(name,%s)
QS(id,%s)
Q(total_m3,%f)

4
meter_multical302.cc
Wyświetl plik

@ -207,7 +207,9 @@ void MeterMultical302::printMeterFields(FILE *output, char separator)
void MeterMultical302::printMeterJSON(FILE *output)
{
fprintf(output, "{media:\"heat\",meter:\"multical302\","
fprintf(output, "{"
QS(media,heat)
QS(meter,multical302)
QS(name,%s)
QS(id,%s)
Q(total_kwh,%f)

4
meter_omnipower.cc
Wyświetl plik

@ -149,7 +149,9 @@ void MeterOmnipower::printMeterFields(FILE *output, char separator)
void MeterOmnipower::printMeterJSON(FILE *output)
{
fprintf(output, "{media:\"electricity\",meter:\"omnipower\","
fprintf(output, "{"
QS(media,electricity)
QS(meter,omnipower)
QS(name,%s)
QS(id,%s)
Q(total_kwh,%f)

8
simulation.txt
Wyświetl plik

@ -2,18 +2,18 @@
# short telegram
telegram=|23442D2C998734761B168D2093E13CBA20|967F79EDA8047B7100F4180000E918|
{media:"cold water",meter:"multical21","name":"MyTapWater","id":"76348799","total_m3":6.388000,"target_m3":6.377000,"current_status":"DRY","time_dry":"22-31 days","time_reversed":"","time_leaking":"","time_bursting":"","timestamp":"1111-11-11T11:11:11Z"}
{"media":"cold water","meter":"multical21","name":"MyTapWater","id":"76348799","total_m3":6.388000,"target_m3":6.377000,"current_status":"DRY","time_dry":"22-31 days","time_reversed":"","time_leaking":"","time_bursting":"","timestamp":"1111-11-11T11:11:11Z"}
# full telegram
telegram=|2A442D2C998734761B168D2049F03FBA20|39A17802FF2071000413F41800004413E9180000615B|
{media:"cold water",meter:"multical21","name":"MyTapWater","id":"76348799","total_m3":6.388000,"target_m3":6.377000,"current_status":"DRY","time_dry":"22-31 days","time_reversed":"","time_leaking":"","time_bursting":"","timestamp":"1111-11-11T11:11:11Z"}
{"media":"cold water","meter":"multical21","name":"MyTapWater","id":"76348799","total_m3":6.388000,"target_m3":6.377000,"current_status":"DRY","time_dry":"22-31 days","time_reversed":"","time_leaking":"","time_bursting":"","timestamp":"1111-11-11T11:11:11Z"}
# Test Multical302 C1 telegrams
# short telegram, this is not a proper telegram! Please provide the output from --logtelegrams for a Multical302 meter!
telegram=|25442D2C785634121b048D2093E13CBA20|0000790000000000000000000000000000|
{media:"heat",meter:"multical302","name":"MyHeater","id":"12345678","total_kwh":0.000000,"total_volume_m3":0.000000,"current_kw":"0.000000","timestamp":"1111-11-11T11:11:11Z"}
{"media":"heat","meter":"multical302","name":"MyHeater","id":"12345678","total_kwh":0.000000,"total_volume_m3":0.000000,"current_kw":"0.000000","timestamp":"1111-11-11T11:11:11Z"}
# full telegram
@ -22,4 +22,4 @@ telegram=|25442D2C785634121b048D2093E13CBA20|0000790000000000000000000000000000|
# Test Omnipower C1 telegrams
telegram=|1E442D2C0771941501027A|B300108504833B08340500|
{media:"electricity",meter:"omnipower","name":"MyElectricity","id":"15947107","total_kwh":341.000000,"current_kw":"0.000000","timestamp":"1111-11-11T11:11:11Z"}
{"media":"electricity","meter":"omnipower","name":"MyElectricity","id":"15947107","total_kwh":341.000000,"current_kw":"0.000000","timestamp":"1111-11-11T11:11:11Z"}