X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fvc870.c;h=2663260bc48ca9464d0fe23928446156d33214e3;hb=3591481e871eec154a764e1c78004095144de5b5;hp=8b7f191f85c4fd8b7faffefca31cdefd2d5b9ee3;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c index 8b7f191f..2663260b 100644 --- a/src/dmm/vc870.c +++ b/src/dmm/vc870.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include @@ -45,14 +46,20 @@ static const float factors[][8] = { {1e-4, 0, 0, 0, 0, 0, 0, 0}, /* Diode */ {1e-3, 1e-2, 1e-1, 1, 1e1, 1e2, 1e3, 1e4}, /* Frequency */ {1e-2, 0, 0, 0, 0, 0, 0, 0}, /* Loop current */ + /* + * Note: Measurements showed that AC and DC differ + * in the factors used, although docs say they should + * be the same. + */ {1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* DCµA */ - {1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* ACµA */ + {1e-7, 1e-6, 0, 0, 0, 0, 0, 0}, /* ACµA */ {1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* DCmA */ - {1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* ACmA */ + {1e-5, 1e-4, 0, 0, 0, 0, 0, 0}, /* ACmA */ {1e-3, 0, 0, 0, 0, 0, 0, 0}, /* DCA */ + /* TODO: Verify factor for ACA */ {1e-3, 0, 0, 0, 0, 0, 0, 0}, /* ACA */ {1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Act+apparent power */ - {1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Power factor / freq */ + {1e-3, 0, 0, 0, 0, 0, 0, 0}, /* Power factor / freq */ {1e-1, 0, 0, 0, 0, 0, 0, 0}, /* V eff + A eff */ }; @@ -60,7 +67,6 @@ static int parse_value(const uint8_t *buf, struct vc870_info *info, float *result) { int i, intval; - float floatval; /* Bytes 3-7: Main display value (5 decimal digits) */ if (info->is_open || info->is_ol1) { @@ -70,8 +76,9 @@ static int parse_value(const uint8_t *buf, struct vc870_info *info, } else if (!isdigit(buf[3]) || !isdigit(buf[4]) || !isdigit(buf[5]) || !isdigit(buf[6]) || !isdigit(buf[7])) { sr_dbg("Invalid digits: %02x %02x %02x %02x %02X " - "(%c %c %c %c %c).", buf[3], buf[4], buf[5], buf[6], - buf[7]); + "(%c %c %c %c %c).", + buf[3], buf[4], buf[5], buf[6], buf[7], + buf[3], buf[4], buf[5], buf[6], buf[7]); return SR_ERR; } @@ -84,13 +91,11 @@ static int parse_value(const uint8_t *buf, struct vc870_info *info, intval *= info->is_sign1 ? -1 : 1; // intval *= info->is_sign2 ? -1 : 1; /* TODO: Fahrenheit / aux display. */ - floatval = (float)intval; - /* Note: The decimal point position will be parsed later. */ - sr_spew("The display value is %f.", floatval); + sr_spew("The display value without comma is %05d.", intval); - *result = floatval; + *result = (float)intval; return SR_OK; } @@ -145,7 +150,7 @@ static int parse_range(uint8_t b, float *floatval, mode = 16; /* Act+apparent power */ else if (info->is_power_factor_freq) mode = 17; /* Power factor / freq */ - else if (info->is_v_a_eff_value) + else if (info->is_v_a_rms_value) mode = 18; /* V eff + A eff */ else { sr_dbg("Invalid mode, range byte was: 0x%02x.", b); @@ -220,7 +225,7 @@ static void parse_flags(const uint8_t *buf, struct vc870_info *info) info->is_power_factor_freq = TRUE; else if (buf[1] == 0x32) /* Voltage effective value + current effective value */ - info->is_v_a_eff_value = TRUE; + info->is_v_a_rms_value = TRUE; break; default: sr_dbg("Invalid function bytes: %02x %02x.", buf[0], buf[1]); @@ -275,10 +280,9 @@ static void parse_flags(const uint8_t *buf, struct vc870_info *info) /* Byte 22: Always '\n' (newline, 0x0a, 10) */ info->is_auto = !info->is_manu; - info->is_rms = TRUE; } -static void handle_flags(struct sr_datafeed_analog *analog, +static void handle_flags(struct sr_datafeed_analog_old *analog, float *floatval, const struct vc870_info *info) { /* @@ -332,13 +336,6 @@ static void handle_flags(struct sr_datafeed_analog *analog, analog->mq = SR_MQ_POWER; analog->unit = SR_UNIT_WATT; } - if (info->is_power_factor_freq) { - /* TODO: Handle power factor. */ - // analog->mq = SR_MQ_POWER_FACTOR; - // analog->unit = SR_UNIT_UNITLESS; - analog->mq = SR_MQ_FREQUENCY; - analog->unit = SR_UNIT_HERTZ; - } if (info->is_power_apparent_power) { analog->mq = SR_MQ_POWER; analog->unit = SR_UNIT_WATT; @@ -346,6 +343,21 @@ static void handle_flags(struct sr_datafeed_analog *analog, // analog->mq = SR_MQ_APPARENT_POWER; // analog->unit = SR_UNIT_VOLT_AMPERE; } + if (info->is_power_factor_freq) { + analog->mq = SR_MQ_POWER_FACTOR; + analog->unit = SR_UNIT_UNITLESS; + /* TODO: Handle frequency. */ + // analog->mq = SR_MQ_FREQUENCY; + // analog->unit = SR_UNIT_HERTZ; + } + if (info->is_v_a_rms_value) { + analog->mqflags |= SR_MQFLAG_RMS; + analog->mq = SR_MQ_VOLTAGE; + analog->unit = SR_UNIT_VOLT; + /* TODO: Handle effective current value */ + // analog->mq = SR_MQ_CURRENT; + // analog->unit = SR_UNIT_AMPERE; + } /* Measurement related flags */ if (info->is_ac) @@ -400,13 +412,11 @@ SR_PRIV gboolean sr_vc870_packet_valid(const uint8_t *buf) } SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog *analog, void *info) + struct sr_datafeed_analog_old *analog, void *info) { int ret; struct vc870_info *info_local; - info_local = (struct vc870_info *)info; - info_local = (struct vc870_info *)info; memset(info_local, 0, sizeof(struct vc870_info));