From dd2df5328067e3bd8f1e4d193644d006a59175a6 Mon Sep 17 00:00:00 2001 From: Andreas Horrer Date: Mon, 1 Jan 2024 20:31:13 +0100 Subject: [PATCH 1/3] Added output for test_t1_meter.sh to see which test failed --- tests/test_t1_meters.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_t1_meters.sh b/tests/test_t1_meters.sh index 90a050c..bab7938 100755 --- a/tests/test_t1_meters.sh +++ b/tests/test_t1_meters.sh @@ -85,6 +85,7 @@ then then meld $TEST/test_expected.txt $TEST/test_responses.txt fi + echo ERROR: $TESTNAME exit 1 fi else @@ -109,6 +110,7 @@ then then meld $TEST/test_expected.txt $TEST/test_responses.txt fi + echo ERROR: $TESTNAME exit 1 fi else From f69f9d6aa7725edccd10394a27bc916a72fcfed1 Mon Sep 17 00:00:00 2001 From: Andreas Horrer Date: Mon, 1 Jan 2024 20:31:45 +0100 Subject: [PATCH 2/3] Changed test data due to problems with date encoding --- src/driver_mkradio3.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver_mkradio3.cc b/src/driver_mkradio3.cc index 78a5618..43dbead 100644 --- a/src/driver_mkradio3.cc +++ b/src/driver_mkradio3.cc @@ -107,5 +107,5 @@ namespace // Comment: There is a problem in the decoding here, the data stored inside the telegram does not seem to properly encode/decode the year.... // We should not report a current_date with a full year, if the year is actually not part of the telegram. // telegram=|2F446850313233347462A2_069F255900B029310000000306060906030609070606050509050505050407040605070500| -// {"media":"warm water","meter":"mkradio3","name":"Duschen","id":"34333231","total_m3":13.8,"target_m3":8.9,"current_date":"2023-04-27T02:00:00Z","prev_date":"2018-12-31T02:00:00Z","timestamp":"1111-11-11T11:11:11Z"} -// |Duschen;34333231;13.8;8.9;2023-04-27T02:00:00Z;2018-12-31T02:00:00Z;1111-11-11 11:11.11 +// {"media":"warm water","meter":"mkradio3","name":"Duschen","id":"34333231","total_m3":13.8,"target_m3":8.9,"current_date":"2024-04-27T02:00:00Z","prev_date":"2018-12-31T02:00:00Z","timestamp":"1111-11-11T11:11:11Z"} +// |Duschen;34333231;13.8;8.9;2024-04-27T02:00:00Z;2018-12-31T02:00:00Z;1111-11-11 11:11.11 From 757b56d2c8fc1bcbdf1bd11f57c5b98b21640187 Mon Sep 17 00:00:00 2001 From: Andreas Horrer Date: Mon, 1 Jan 2024 20:40:41 +0100 Subject: [PATCH 3/3] change data for problem with year encoding in mkradio3 --- simulations/simulation_t1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simulations/simulation_t1.txt b/simulations/simulation_t1.txt index 0301db5..127a6c0 100644 --- a/simulations/simulation_t1.txt +++ b/simulations/simulation_t1.txt @@ -43,8 +43,8 @@ telegram=|5E44B6105843250000027A2A005005_2F2F0C7835221400066D404708AC2A400E03202 # There is a problem in the decoding here, the data stored inside the telegram does not seem to properly encode/decode the year.... # We should not report a current_date with a full year, if the year is actually not part of the telegram. telegram=|2F446850313233347462A2_069F255900B029310000000306060906030609070606050509050505050407040605070500| -{"media":"warm water","meter":"mkradio3","name":"Duschen","id":"34333231","total_m3":13.8,"target_m3":8.9,"current_date":"2023-04-27T02:00:00Z","prev_date":"2018-12-31T02:00:00Z","timestamp":"1111-11-11T11:11:11Z"} -|Duschen;34333231;13.8;8.9;2023-04-27T02:00:00Z;2018-12-31T02:00:00Z;1111-11-11 11:11.11 +{"media":"warm water","meter":"mkradio3","name":"Duschen","id":"34333231","total_m3":13.8,"target_m3":8.9,"current_date":"2024-04-27T02:00:00Z","prev_date":"2018-12-31T02:00:00Z","timestamp":"1111-11-11T11:11:11Z"} +|Duschen;34333231;13.8;8.9;2024-04-27T02:00:00Z;2018-12-31T02:00:00Z;1111-11-11 11:11.11 # Test MKRadio4 T1 telegrams