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

fluke-dmm: code cleanup

This commit is contained in:
Bert Vermeulen 2012-10-29 11:54:20 +01:00
parent 2c04dede20
commit a28dac0a73
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hardware/fluke-dmm/fluke.c
View File

@ -181,14 +181,14 @@ static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
*analog->data = NAN; *analog->data = NAN;
} else } else
analog->mq = -1; analog->mq = -1;
} if (!strcmp(tokens[1], "dBV") || !strcmp(tokens[1], "dBm")) { } else if (!strcmp(tokens[1], "dBV") || !strcmp(tokens[1], "dBm")) {
analog->mq = SR_MQ_VOLTAGE; analog->mq = SR_MQ_VOLTAGE;
if (tokens[1][2] == 'm') if (tokens[1][2] == 'm')
analog->unit = SR_UNIT_DECIBEL_MW; analog->unit = SR_UNIT_DECIBEL_MW;
else else
analog->unit = SR_UNIT_DECIBEL_VOLT; analog->unit = SR_UNIT_DECIBEL_VOLT;
analog->mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS; analog->mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
} if (!strcmp(tokens[1], "CEL") || !strcmp(tokens[1], "FAR")) { } else if (!strcmp(tokens[1], "CEL") || !strcmp(tokens[1], "FAR")) {
if (!strcmp(tokens[2], "NORMAL")) { if (!strcmp(tokens[2], "NORMAL")) {
analog->mq = SR_MQ_TEMPERATURE; analog->mq = SR_MQ_TEMPERATURE;
if (tokens[1][0] == 'C') if (tokens[1][0] == 'C')
@ -196,7 +196,7 @@ static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
else else
analog->unit = SR_UNIT_FAHRENHEIT; analog->unit = SR_UNIT_FAHRENHEIT;
} }
} if (!strcmp(tokens[1], "OHM")) { } else if (!strcmp(tokens[1], "OHM")) {
if (!strcmp(tokens[3], "NONE")) { if (!strcmp(tokens[3], "NONE")) {
analog->mq = SR_MQ_RESISTANCE; analog->mq = SR_MQ_RESISTANCE;
analog->unit = SR_UNIT_OHM; analog->unit = SR_UNIT_OHM;
@ -213,7 +213,7 @@ static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
analog->unit = SR_UNIT_BOOLEAN; analog->unit = SR_UNIT_BOOLEAN;
*analog->data = 1.0; *analog->data = 1.0;
} }
} if (!strcmp(tokens[1], "F") } else if (!strcmp(tokens[1], "F")
&& !strcmp(tokens[2], "NORMAL") && !strcmp(tokens[2], "NORMAL")
&& !strcmp(tokens[3], "NONE")) { && !strcmp(tokens[3], "NONE")) {
analog->mq = SR_MQ_CAPACITANCE; analog->mq = SR_MQ_CAPACITANCE;
@ -234,13 +234,13 @@ static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
} if (!strcmp(tokens[1], "Hz") && !strcmp(tokens[2], "NORMAL")) { } if (!strcmp(tokens[1], "Hz") && !strcmp(tokens[2], "NORMAL")) {
analog->mq = SR_MQ_FREQUENCY; analog->mq = SR_MQ_FREQUENCY;
analog->unit = SR_UNIT_HERTZ; analog->unit = SR_UNIT_HERTZ;
} if (!strcmp(tokens[1], "PCT") && !strcmp(tokens[2], "NORMAL")) { } else if (!strcmp(tokens[1], "PCT") && !strcmp(tokens[2], "NORMAL")) {
analog->mq = SR_MQ_DUTY_CYCLE; analog->mq = SR_MQ_DUTY_CYCLE;
analog->unit = SR_UNIT_PERCENTAGE; analog->unit = SR_UNIT_PERCENTAGE;
} if (!strcmp(tokens[1], "S") && !strcmp(tokens[2], "NORMAL")) { } else if (!strcmp(tokens[1], "S") && !strcmp(tokens[2], "NORMAL")) {
analog->mq = SR_MQ_PULSE_WIDTH; analog->mq = SR_MQ_PULSE_WIDTH;
analog->unit = SR_UNIT_SECOND; analog->unit = SR_UNIT_SECOND;
} if (!strcmp(tokens[1], "SIE") && !strcmp(tokens[2], "NORMAL")) { } else if (!strcmp(tokens[1], "SIE") && !strcmp(tokens[2], "NORMAL")) {
analog->mq = SR_MQ_CONDUCTANCE; analog->mq = SR_MQ_CONDUCTANCE;
analog->unit = SR_UNIT_SIEMENS; analog->unit = SR_UNIT_SIEMENS;
} }