BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi-dmm: factor out some OL detection limits 

Prepare the "plus/minus infinity" checks for OL conditions to use
model dependent limits. This commit does not change behaviour.
This commit is contained in:
Gerhard Sittig 2020-08-21 11:34:54 +02:00 committed by Gerhard Sittig
parent 7d95afb9be
commit 395c1850b7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hardware/scpi-dmm/protocol.c
View File

@ -170,6 +170,7 @@ SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
int sig_digits, val_exp; int sig_digits, val_exp;
int digits; int digits;
enum sr_unit unit; enum sr_unit unit;
double limit;
scpi = sdi->conn; scpi = sdi->conn;
devc = sdi->priv; devc = sdi->priv;
@ -282,9 +283,10 @@ SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
} }
if (!response) if (!response)
return SR_ERR; return SR_ERR;
if (info->d_value > +9e37) { limit = 9e37;
if (info->d_value > +limit) {
info->d_value = +INFINITY; info->d_value = +INFINITY;
} else if (info->d_value < -9e37) { } else if (info->d_value < -limit) {
info->d_value = -INFINITY; info->d_value = -INFINITY;
} else { } else {
p = response; p = response;
@ -456,9 +458,10 @@ SR_PRIV int scpi_dmm_get_meas_gwinstek(const struct sr_dev_inst *sdi, size_t ch)
} }
if (!response) if (!response)
return SR_ERR; return SR_ERR;
if (info->d_value > +9e37) { limit = 9e37;
if (info->d_value > +limit) {
info->d_value = +INFINITY; info->d_value = +INFINITY;
} else if (info->d_value < -9e37) { } else if (info->d_value < -limit) {
info->d_value = -INFINITY; info->d_value = -INFINITY;
} else { } else {
p = response; p = response;
@ -494,10 +497,9 @@ SR_PRIV int scpi_dmm_get_meas_gwinstek(const struct sr_dev_inst *sdi, size_t ch)
case 7: case 7:
case 16: case 16:
/* In resitance modes 0L reads as 1.20000E8 or 1.99999E8. */ /* In resitance modes 0L reads as 1.20000E8 or 1.99999E8. */
limit = 1.2e8;
if (strcmp(devc->model->model, "GDM8255A") == 0) if (strcmp(devc->model->model, "GDM8255A") == 0)
limit = 1.99999e8; limit = 1.99999e8;
else
limit = 1.2e8;
if (info->d_value >= limit) if (info->d_value >= limit)
info->d_value = +INFINITY; info->d_value = +INFINITY;
break; break;