kopia lustrzana https://github.com/weetmuts/wmbusmeters
Fix bug in analyze.
rodzic
586f7eecba
commit
9a8cd21628
|
@ -384,7 +384,7 @@ public:
|
|||
mi.idsc = t.ids.back();
|
||||
|
||||
// This will be the driver that will actually decode and print with.
|
||||
string using_driver = "auto";
|
||||
string using_driver;
|
||||
int using_length = 0;
|
||||
int using_understood = 0;
|
||||
|
||||
|
@ -393,6 +393,8 @@ public:
|
|||
int best_understood = 0;
|
||||
string best_driver = findBestNewStyleDriver(mi, &best_length, &best_understood, t, about, input_frame, simulated, "");
|
||||
|
||||
if (best_driver == "") best_driver = "unknown";
|
||||
|
||||
mi.driver_name = DriverName(best_driver);
|
||||
|
||||
// Default to best driver....
|
||||
|
@ -419,12 +421,12 @@ public:
|
|||
{
|
||||
using_driver = findBestNewStyleDriver(mi, &force_length, &force_understood, t, about, input_frame, simulated,
|
||||
force_driver);
|
||||
mi.driver_name = using_driver;
|
||||
|
||||
using_length = force_length;
|
||||
using_understood = force_understood;
|
||||
}
|
||||
|
||||
mi.driver_name = using_driver;
|
||||
|
||||
auto meter = createMeter(&mi);
|
||||
|
||||
assert(meter != NULL);
|
||||
|
|
|
@ -32,7 +32,7 @@ TESTRESULT="ERROR"
|
|||
|
||||
cat > $TEST/test_expected.txt <<EOF
|
||||
Auto driver : multical21
|
||||
Best driver : 00/00
|
||||
Best driver : unknown 00/00
|
||||
Using driver : multical21 00/00
|
||||
000 : 2a length (42 bytes)
|
||||
001 : 44 dll-c (from meter SND_NR)
|
||||
|
@ -77,7 +77,7 @@ TESTRESULT="ERROR"
|
|||
|
||||
cat > $TEST/test_expected.txt <<EOF
|
||||
Auto driver : multical21
|
||||
Best driver : 00/00
|
||||
Best driver : unknown 00/00
|
||||
Using driver : multical21 00/00
|
||||
000 : 23 length (35 bytes)
|
||||
001 : 44 dll-c (from meter SND_NR)
|
||||
|
@ -239,7 +239,7 @@ TESTRESULT="ERROR"
|
|||
|
||||
cat > $TEST/test_expected.txt <<EOF
|
||||
Auto driver : supercom587
|
||||
Best driver : 00/00
|
||||
Best driver : unknown 00/00
|
||||
Using driver : supercom587 00/00
|
||||
000 : ae length (174 bytes)
|
||||
001 : 44 dll-c (from meter SND_NR)
|
||||
|
|
Ładowanie…
Reference in New Issue