mwalbeck/rtl_433
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor: Remove mention of _inch ()

Browse source
This commit is contained in:
Christian W. Zuckschwerdt 2023-12-18 11:13:31 +01:00
commit 60bdd62d18
2 changed files with 5 additions and 9 deletions

2
docs/OPERATION.md
View file

@ -556,7 +556,7 @@ With `-C si` units are converted to the SI system:
With `-C customary` units are converted to customary units:
- converts fields of Celsius to Fahrenheit (`_C to _F`)
- converts fields of km/h to Miles/h (`_kph to _mph`, `_km_h to _mi_h`)
- converts fields of mm to Inch (`_mm to _inch`)
- converts fields of mm to Inch (`_mm to _in`)
- converts fields of mm/h to Inch/h (`_mm_h to _in_h`)
- converts fields of hPa to InchHg (`_hPa to _inHg`)
- converts fields of kPa to PSI (`_kPa to _PSI`)

12
src/r_api.c
View file

@ -727,15 +727,11 @@ void data_acquired_handler(r_device *r_dev, data_t *data)
d->format = new_format_label;
}
// Convert double type fields ending in _in to _mm
else if ((d->type == DATA_DOUBLE) &&
(str_endswith(d->key, "_in") || str_endswith(d->key, "_inch"))) {
else if ((d->type == DATA_DOUBLE) && str_endswith(d->key, "_in")) {
d->value.v_dbl = inch2mm(d->value.v_dbl);
// need to free ptr returned from str_replace
char* new_label1 = str_replace(d->key, "_inch", "_in");
char* new_label2 = str_replace(new_label1, "_in", "_mm");
free(new_label1);
char *new_label = str_replace(d->key, "_in", "_mm");
free(d->key);
d->key = new_label2;
d->key = new_label;
char *new_format_label = str_replace(d->format, "in", "mm");
free(d->format);
d->format = new_format_label;
@ -805,7 +801,7 @@ void data_acquired_handler(r_device *r_dev, data_t *data)
free(d->format);
d->format = new_format_label;
}
// Convert double type fields ending in _mm to _inch
// Convert double type fields ending in _mm to _in
else if ((d->type == DATA_DOUBLE) && str_endswith(d->key, "_mm")) {
d->value.v_dbl = mm2inch(d->value.v_dbl);
char *new_label = str_replace(d->key, "_mm", "_in");