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

metex14: Add missing modes and set correct digits value.

This commit is contained in:
Frank Stettner 2018-02-14 12:49:04 +01:00 committed by Uwe Hermann
parent 556a926d43
commit 7fb4ff0237
2 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/dmm/metex14.c
View File

@ -146,8 +146,14 @@ static void parse_flags(const char *buf, struct metex14_info *info)
info->is_kilo = info->is_hertz = TRUE; info->is_kilo = info->is_hertz = TRUE;
else if (!g_ascii_strcasecmp(u, "C")) else if (!g_ascii_strcasecmp(u, "C"))
info->is_celsius = TRUE; info->is_celsius = TRUE;
else if (!g_ascii_strcasecmp(u, "F"))
info->is_fahrenheit = TRUE;
else if (!g_ascii_strcasecmp(u, "DB")) else if (!g_ascii_strcasecmp(u, "DB"))
info->is_decibel = TRUE; info->is_decibel = TRUE;
else if (!g_ascii_strcasecmp(u, "dBm"))
info->is_decibel_mw = TRUE;
else if (!g_ascii_strcasecmp(u, "W"))
info->is_watt = TRUE;
else if (!g_ascii_strcasecmp(u, "")) else if (!g_ascii_strcasecmp(u, ""))
info->is_unitless = TRUE; info->is_unitless = TRUE;
@ -156,15 +162,22 @@ static void parse_flags(const char *buf, struct metex14_info *info)
(!strncmp(buf, " ", 2) && info->is_ohm); (!strncmp(buf, " ", 2) && info->is_ohm);
info->is_capacity = !strncmp(buf, "CA", 2) || info->is_capacity = !strncmp(buf, "CA", 2) ||
(!strncmp(buf, " ", 2) && info->is_farad); (!strncmp(buf, " ", 2) && info->is_farad);
info->is_temperature = !strncmp(buf, "TE", 2); info->is_temperature = !strncmp(buf, "TE", 2) ||
info->is_celsius || info->is_fahrenheit;
info->is_diode = !strncmp(buf, "DI", 2) || info->is_diode = !strncmp(buf, "DI", 2) ||
(!strncmp(buf, " ", 2) && info->is_volt && info->is_milli); (!strncmp(buf, " ", 2) && info->is_volt && info->is_milli);
info->is_frequency = !strncmp(buf, "FR", 2) || info->is_frequency = !strncmp(buf, "FR", 2) ||
(!strncmp(buf, " ", 2) && info->is_hertz); (!strncmp(buf, " ", 2) && info->is_hertz);
info->is_gain = !strncmp(buf, "DB", 2); info->is_gain = !strncmp(buf, "DB", 2) && info->is_decibel;
info->is_power = (!strncmp(buf, "dB", 2) && info->is_decibel_mw) ||
((!strncmp(buf, "WT", 2) && info->is_watt));
info->is_hfe = !strncmp(buf, "HF", 2) || info->is_hfe = !strncmp(buf, "HF", 2) ||
(!strncmp(buf, " ", 2) && !info->is_volt && !info->is_ohm && (!strncmp(buf, " ", 2) && !info->is_volt && !info->is_ohm &&
!info->is_logic && !info->is_farad && !info->is_hertz); !info->is_logic && !info->is_farad && !info->is_hertz);
info->is_min = !strncmp(buf, "MN", 2);
info->is_max = !strncmp(buf, "MX", 2);
info->is_avg = !strncmp(buf, "AG", 2);
/* /*
* Note: * Note:
* - Protocol doesn't distinguish "resistance" from "beep" mode. * - Protocol doesn't distinguish "resistance" from "beep" mode.
@ -178,8 +191,12 @@ static void parse_flags(const char *buf, struct metex14_info *info)
static void handle_flags(struct sr_datafeed_analog *analog, float *floatval, static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
int *exponent, const struct metex14_info *info) int *exponent, const struct metex14_info *info)
{ {
int factor = 0; int factor;
(void)exponent;
/* Factors */ /* Factors */
factor = 0;
if (info->is_pico) if (info->is_pico)
factor -= 12; factor -= 12;
if (info->is_nano) if (info->is_nano)
@ -193,7 +210,6 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
if (info->is_mega) if (info->is_mega)
factor += 6; factor += 6;
*floatval *= powf(10, factor); *floatval *= powf(10, factor);
*exponent += factor;
/* Measurement modes */ /* Measurement modes */
if (info->is_volt) { if (info->is_volt) {
@ -216,14 +232,28 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
analog->meaning->mq = SR_MQ_CAPACITANCE; analog->meaning->mq = SR_MQ_CAPACITANCE;
analog->meaning->unit = SR_UNIT_FARAD; analog->meaning->unit = SR_UNIT_FARAD;
} }
if (info->is_celsius) { if (info->is_temperature) {
analog->meaning->mq = SR_MQ_TEMPERATURE; analog->meaning->mq = SR_MQ_TEMPERATURE;
analog->meaning->unit = SR_UNIT_CELSIUS; if (info->is_celsius)
analog->meaning->unit = SR_UNIT_CELSIUS;
else if (info->is_fahrenheit)
analog->meaning->unit = SR_UNIT_FAHRENHEIT;
else
analog->meaning->unit = SR_UNIT_UNITLESS;
} }
if (info->is_diode) { if (info->is_diode) {
analog->meaning->mq = SR_MQ_VOLTAGE; analog->meaning->mq = SR_MQ_VOLTAGE;
analog->meaning->unit = SR_UNIT_VOLT; analog->meaning->unit = SR_UNIT_VOLT;
} }
if (info->is_power) {
analog->meaning->mq = SR_MQ_POWER;
if (info->is_decibel_mw)
analog->meaning->unit = SR_UNIT_DECIBEL_MW;
else if (info->is_watt)
analog->meaning->unit = SR_UNIT_WATT;
else
analog->meaning->unit = SR_UNIT_UNITLESS;
}
if (info->is_gain) { if (info->is_gain) {
analog->meaning->mq = SR_MQ_GAIN; analog->meaning->mq = SR_MQ_GAIN;
analog->meaning->unit = SR_UNIT_DECIBEL_VOLT; analog->meaning->unit = SR_UNIT_DECIBEL_VOLT;
@ -244,6 +274,12 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
analog->meaning->mqflags |= SR_MQFLAG_DC; analog->meaning->mqflags |= SR_MQFLAG_DC;
if (info->is_diode) if (info->is_diode)
analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC; analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
if (info->is_min)
analog->meaning->mqflags |= SR_MQFLAG_MIN;
if (info->is_max)
analog->meaning->mqflags |= SR_MQFLAG_MAX;
if (info->is_avg)
analog->meaning->mqflags |= SR_MQFLAG_AVG;
} }
static gboolean flags_valid(const struct metex14_info *info) static gboolean flags_valid(const struct metex14_info *info)

7
src/libsigrok-internal.h
View File

@ -1276,9 +1276,10 @@ struct metex14_info {
size_t ch_idx; size_t ch_idx;
gboolean is_ac, is_dc, is_resistance, is_capacity, is_temperature; gboolean is_ac, is_dc, is_resistance, is_capacity, is_temperature;
gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad; gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad;
gboolean is_hertz, is_ohm, is_celsius, is_pico, is_nano, is_micro; gboolean is_hertz, is_ohm, is_celsius, is_fahrenheit, is_watt;
gboolean is_milli, is_kilo, is_mega, is_gain, is_decibel, is_hfe; gboolean is_pico, is_nano, is_micro, is_milli, is_kilo, is_mega;
gboolean is_unitless, is_logic; gboolean is_gain, is_decibel, is_power, is_decibel_mw;
gboolean is_hfe, is_unitless, is_logic, is_min, is_max, is_avg;
}; };
#ifdef HAVE_LIBSERIALPORT #ifdef HAVE_LIBSERIALPORT