X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdmm%2Fmetex14.c;h=1c751bd5f794d2682cfacdec72f1f171b3d23ef9;hb=e59dd45dcda4d3bc0fbd944872564fd30253f3c6;hp=5c4ed0858c2816c8278ac0bfaad2d74c584422a1;hpb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;p=libsigrok.git diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c index 5c4ed085..1c751bd5 100644 --- a/src/dmm/metex14.c +++ b/src/dmm/metex14.c @@ -195,8 +195,6 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval, { int factor; - (void)exponent; - /* Factors */ factor = 0; if (info->is_pico) @@ -212,6 +210,7 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval, if (info->is_mega) factor += 6; *floatval *= powf(10, factor); + *exponent += factor; /* Measurement modes */ if (info->is_volt) { @@ -332,10 +331,19 @@ static gboolean flags_valid(const struct metex14_info *info) SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial) { const uint8_t wbuf = 'D'; + size_t wrlen; + int ret; sr_spew("Requesting DMM packet."); - return serial_write_blocking(serial, &wbuf, 1, 0); + wrlen = sizeof(wbuf); + ret = serial_write_blocking(serial, &wbuf, wrlen, 0); + if (ret < 0) + return ret; + if ((size_t)ret != wrlen) + return SR_ERR_IO; + + return SR_OK; } #endif