kopia lustrzana https://github.com/weetmuts/wmbusmeters
Correct spelling errors.
rodzic
b0bca78c78
commit
88a811d434
|
@ -148,7 +148,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"max_flow",
|
"max_flow",
|
||||||
"The maxium flow recorded during previous period.",
|
"The maximum flow recorded during previous period.",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::Flow,
|
Quantity::Flow,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
@ -172,7 +172,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"max_external_temperature",
|
"max_external_temperature",
|
||||||
"The maxium temperature recorded during previous period.",
|
"The maximum temperature recorded during previous period.",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::Temperature,
|
Quantity::Temperature,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
@ -196,7 +196,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"max_flow",
|
"max_flow",
|
||||||
"The maxium flow recorded during previous period.",
|
"The maximum flow recorded during previous period.",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::Flow,
|
Quantity::Flow,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
|
|
@ -52,7 +52,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"max_flow",
|
"max_flow",
|
||||||
"The maxium flow recorded during previous period.",
|
"The maximum flow recorded during previous period.",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::Flow,
|
Quantity::Flow,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
|
|
@ -85,7 +85,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"min_pressure",
|
"min_pressure",
|
||||||
"The minumum pressure measured during ?.",
|
"The minimum pressure measured during ?.",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::Pressure,
|
Quantity::Pressure,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
|
|
@ -117,7 +117,7 @@ namespace
|
||||||
|
|
||||||
addStringFieldWithExtractor(
|
addStringFieldWithExtractor(
|
||||||
"error_date",
|
"error_date",
|
||||||
"The date the error occured at. If no error, reads 2127-15-31 (FFFF).",
|
"The date the error occurred at. If no error, reads 2127-15-31 (FFFF).",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
FieldMatcher::build()
|
FieldMatcher::build()
|
||||||
.set(MeasurementType::AtError)
|
.set(MeasurementType::AtError)
|
||||||
|
|
|
@ -116,7 +116,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"max_flow",
|
"max_flow",
|
||||||
"The maxium flow recorded during previous period.",
|
"The maximum flow recorded during previous period.",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::Flow,
|
Quantity::Flow,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
|
|
@ -120,7 +120,7 @@ namespace
|
||||||
|
|
||||||
addNumericFieldWithExtractor(
|
addNumericFieldWithExtractor(
|
||||||
"error",
|
"error",
|
||||||
"The date the error occured at. If no error, reads 2127-15-31 (FFFF).",
|
"The date the error occurred at. If no error, reads 2127-15-31 (FFFF).",
|
||||||
DEFAULT_PRINT_PROPERTIES,
|
DEFAULT_PRINT_PROPERTIES,
|
||||||
Quantity::PointInTime,
|
Quantity::PointInTime,
|
||||||
VifScaling::Auto,
|
VifScaling::Auto,
|
||||||
|
|
|
@ -766,7 +766,7 @@ FrameStatus WMBusIM871aIM170A::checkIM871AFrame(vector<uchar> &data,
|
||||||
|
|
||||||
int ctrlbits = (data[1] & 0xf0) >> 4;
|
int ctrlbits = (data[1] & 0xf0) >> 4;
|
||||||
if (ctrlbits & 1) {
|
if (ctrlbits & 1) {
|
||||||
debug("(im871a) error in frame, bit 1 shoud not be set in data[1]\n");
|
debug("(im871a) error in frame, bit 1 should not be set in data[1]\n");
|
||||||
return ErrorInFrame; // Bit 1 is reserved, we do not expect it....
|
return ErrorInFrame; // Bit 1 is reserved, we do not expect it....
|
||||||
}
|
}
|
||||||
bool has_timestamp = ((ctrlbits&2)==2);
|
bool has_timestamp = ((ctrlbits&2)==2);
|
||||||
|
|
Ładowanie…
Reference in New Issue